From 489ba60990eeb2b11ff2522678630d8bc3764e71 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期三, 16 四月 2025 16:45:32 +0800 Subject: [PATCH] 修改 --- src/views/firework/humiture/components/dataDialog.vue | 73 +++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/src/views/firework/humiture/components/dataDialog.vue b/src/views/firework/humiture/components/dataDialog.vue index 4ed7971..ac78756 100644 --- a/src/views/firework/humiture/components/dataDialog.vue +++ b/src/views/firework/humiture/components/dataDialog.vue @@ -3,11 +3,49 @@ <el-dialog v-model="dialogVisible" title="历史记录" - width="50%" + width="800px" :before-close="handleClose" :close-on-press-escape="false" :close-on-click-modal="false" > + <el-form style="display: flex;align-items: center"> + <el-form-item> + <el-date-picker + v-model="state.dateRange" + value-format="YYYY-MM-DD" + type="daterange" + range-separator="-" + start-placeholder="开始日期" + end-placeholder="结束日期" + style="width: 300px" + ></el-date-picker> + </el-form-item> + <el-form-item label="状态:" style="margin-left: 20px" > + <el-select + v-model="state.queryParams.filter.deviceWarning" + placeholder="请选择" + style="width: 80%" + > + <el-option + v-for="item in state.statusList" + :key="item.id" + :label="item.name" + :value="item.id" + /> + </el-select> + </el-form-item> + <el-form-item > + <el-button + type="primary" + @click="getList" + >查询</el-button> + <el-button + type="primary" + plain + @click="reset" + >重置</el-button> + </el-form-item> + </el-form> <el-table v-loading="loading" :data="state.tableList" :border="true"> <el-table-column label="序号" type="index" align="center" width="80" /> <el-table-column label="探测器" prop="deviceName" align="center" /> @@ -55,9 +93,24 @@ pageIndex: 1, pageSize: 10, filter: { - deviceId: null + deviceId: null, + deviceWarning: '', + createDateStart: '', + createDateEnd: '' } }, + statusList: [ + { + id: 0, + name: '正常' + }, + { + id: 1, + name: '报警' + }, + + ], + dateRange:[] }) const { queryParams, total } = toRefs(state); @@ -69,6 +122,8 @@ } const getList = async () => { loading.value = true + state.queryParams.filter.createDateStart = state.dateRange[0] + state.queryParams.filter.createDateEnd = state.dateRange[1] if(state.type == '湿度'){ const res = await getHumidity(state.queryParams) if(res.code == 200){ @@ -90,6 +145,20 @@ } } +function reset() { + state.queryParams = { + pageIndex: 1, + pageSize: 10, + filter: { + deviceId: state.queryParams.filter.deviceId, + deviceWarning: '', + createDateStart: '', + createDateEnd: '' + } + } + state.dateRange = [] + getList() +} const handleClose = () => { dialogVisible.value = false; emit("getList") -- Gitblit v1.9.2