From 6f1e2acc812b2f40359aabdb5d04648acfcdcef5 Mon Sep 17 00:00:00 2001 From: zhouwx <1175765986@qq.com> Date: 星期四, 24 四月 2025 08:40:11 +0800 Subject: [PATCH] 修改 --- src/views/firework/alarm/index.vue | 64 ++++++++++++++++++++++++++++---- 1 files changed, 56 insertions(+), 8 deletions(-) diff --git a/src/views/firework/alarm/index.vue b/src/views/firework/alarm/index.vue index 3e6b437..980f82b 100644 --- a/src/views/firework/alarm/index.vue +++ b/src/views/firework/alarm/index.vue @@ -13,8 +13,24 @@ style="width: 300px" ></el-date-picker> </el-form-item> + <el-form-item label="报警类型:" > + <el-select + clearable + v-model="data.queryParams.filter.alarmType" + placeholder="请选择" + style="width: 100%" + > + <el-option + v-for="item in data.typeList" + :key="item.id" + :label="item.name" + :value="item.id" + /> + </el-select> + </el-form-item> <el-form-item label="状态:" > <el-select + clearable v-model="data.queryParams.filter.alarmStatus" placeholder="请选择" style="width: 100%" @@ -56,7 +72,7 @@ <span>{{scope.row.alarmStatus == 1 ? '已消警' : '未消警'}}</span> </template> </el-table-column> - <el-table-column label="报警图片" prop="alarmFile" align="center" > + <el-table-column label="报警图片" prop="alarmFile" align="center" width="120" > <template #default="scope"> <div class="demo-image__preview" v-if="scope.row.alarmFile"> <el-image @@ -116,6 +132,7 @@ alarmEndTime: '', alarmStatus: null, companyCode: '', + alarmType: null } }, total: 0, @@ -130,7 +147,37 @@ name: '未消警' }, ], - dateRange:[] + dateRange:[], + typeList: [ + { + id: 1, + name: '超员作业' + }, + { + id: 2, + name: '堵塞通道' + }, + { + id: 3, + name: '超高超量' + }, + { + id: 4, + name: '非法入侵' + }, + { + id: 5, + name: '摄像头遮挡偏移' + }, + { + id: 6, + name: '温度' + }, + { + id: 7, + name: '湿度' + }, + ] }); const { queryParams, total, dataList } = toRefs(data); @@ -156,12 +203,12 @@ const res = await getAlarm(data.queryParams) if(res.code == 200){ data.dataList = res.result.records - // .map(item => { - // return { - // ...item, - // alarmFile: '' - // } - // }) + .map(item => { + return { + ...item, + alarmFile:item.alarmFile ? import.meta.env.VITE_APP_BASE_API+ '/upload/'+ item.alarmFile: '' + } + }) data.total = res.result.total }else{ ElMessage.warning(res.message) @@ -181,6 +228,7 @@ alarmEndTime: '', alarmStatus: null, companyCode: '', + alarmType: null } } data.dateRange = [] -- Gitblit v1.9.2