From f5fc1d64ec83069e5a8ee9d369ebf7e4b2a8af5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8F=9C?= <43331987+JiaLiBai@users.noreply.github.com> Date: Mon, 25 Aug 2025 14:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ems/dzjk.js | 4 +-- src/views/ems/dzjk/gzgj/index.vue | 41 +++--------------------------- src/views/ems/dzjk/zxlt/index.vue | 42 +++++++++++++++++++++++-------- 3 files changed, 37 insertions(+), 50 deletions(-) diff --git a/src/api/ems/dzjk.js b/src/api/ems/dzjk.js index eb2d979..5faf472 100644 --- a/src/api/ems/dzjk.js +++ b/src/api/ems/dzjk.js @@ -93,9 +93,9 @@ export function getAmmeterDataList(siteId) { } // 故障告警 -export function getAlarmDetailList({siteId, deviceId, alarmLevel, alarmStartTime, alarmEndTime,pageSize,pageNum}) { +export function getAlarmDetailList({status,siteId, deviceId, alarmLevel, alarmStartTime, alarmEndTime,pageSize,pageNum}) { return request({ - url: `/ems/siteAlarm/getAlarmDetailList?siteId=${siteId}&deviceId=${deviceId}&alarmLevel=${alarmLevel}&alarmStartTime=${alarmStartTime}&alarmEndTime=${alarmEndTime}&pageSize=${pageSize}&pageNum=${pageNum}`, + url: `/ems/siteAlarm/getAlarmDetailList?siteId=${siteId}&status=${status}&deviceId=${deviceId}&alarmLevel=${alarmLevel}&alarmStartTime=${alarmStartTime}&alarmEndTime=${alarmEndTime}&pageSize=${pageSize}&pageNum=${pageNum}`, method: 'get' }) } diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue index 3108136..d600f42 100644 --- a/src/views/ems/dzjk/gzgj/index.vue +++ b/src/views/ems/dzjk/gzgj/index.vue @@ -124,7 +124,7 @@ export default { return { loading:false, btnList:[ - {name:'今日告警',id:'today'}, + {name:'未处理告警',id:'today'}, {name:'历史告警',id:'history'}, ], deviceOptions:[],//设备列表 @@ -173,17 +173,6 @@ export default { onSearch(){ this.pageNum =1//每次搜索从1开始搜索 const [alarmStartTime='',alarmEndTime='']=(this.dateRange || []) - // 选中了时间范围 - if(alarmStartTime && alarmStartTime){ - // 如果选择的时间范围是今天 - if(this.isSameDay(alarmStartTime,alarmEndTime) && this.isSameDay(alarmStartTime,new Date())){ - this.activeBtn = 'today' - }else { - this.activeBtn = 'history' - } - }else{ - //没有选择时间范围 还是按照选中的今日告警、历史告警查询 - } this.getData() }, // 重置 @@ -198,17 +187,6 @@ export default { if(id !== this.activeBtn){ console.log('点击了不同的菜单，更新数据') this.activeBtn=id; - const [alarmStartTime,alarmEndTime]=(this.dateRange || []) - // 切换到今日告警，如果已经选择了时间范围清空 - if(alarmStartTime && alarmEndTime){ - // 如果切换到了今日告警，时间范围不相等或者相等但是不是今天 清空时间选择范围 - if(id === 'today' && !this.isSameDay(alarmStartTime,alarmEndTime) || (this.isSameDay(alarmStartTime,alarmEndTime) && !this.isSameDay(alarmStartTime,new Date()))){ - this.dateRange = [] - }else if(id === 'history' && this.isSameDay(alarmStartTime,alarmEndTime) && this.isSameDay(alarmStartTime,new Date())){ - // 切换成历史告警，但是选择时间范围是当天，清空时间范围 - this.dateRange = [] - } - } this.getData() } }, @@ -218,21 +196,8 @@ export default { const {deviceId,alarmLevel} = this.search const {siteId,pageNum,pageSize,activeBtn} =this const [alarmStartTime='',alarmEndTime='']=(this.dateRange || []) - let start='',end = '',now =new Date() - if(activeBtn === 'today'){ - start = end = now - }else{ - if(alarmStartTime && alarmEndTime){ - start = alarmStartTime - end = alarmEndTime - }else{ - start='' - end = '' - // now - // end.setDate(end.getDate() - 1); - } - } - getAlarmDetailList({deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(start),alarmEndTime:formatDate(end)}).then(response => { + let status = activeBtn === 'today' ? '0' : '1,2' + getAlarmDetailList({status,deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(alarmStartTime),alarmEndTime:formatDate(alarmEndTime)}).then(response => { this.tableData=response?.rows || []; this.totalSize = response?.total || 0 }).finally(() => {this.loading=false}) diff --git a/src/views/ems/dzjk/zxlt/index.vue b/src/views/ems/dzjk/zxlt/index.vue index 98a3999..d8a2dfd 100644 --- a/src/views/ems/dzjk/zxlt/index.vue +++ b/src/views/ems/dzjk/zxlt/index.vue @@ -112,11 +112,14 @@ > {{ communicationStatusOptions[item.communicationStatus] }} -
- +
+
+ +
{{item.batteryNum || 0}}
+
{{ item.deviceName }}
@@ -179,11 +182,14 @@ ] }} -
- +
+
+ +
{{item.batteryNum || 0}}
+
{{ item.children[0].deviceName }}
@@ -505,10 +511,26 @@ $lineColor: #86bcc7; .row-items-img { position: relative; padding-top: 12px; + &.row-items-img-bms{ + padding-top: 14px; + .num{ + position: absolute; + top: -2px; + right: -2px; + font-size: 10px; + line-height: 10px; + padding: 2px 4px; + text-align: center; + border-radius: 10px; + background-color: #03c69d; + color: #fff; + } + } img { width: 80px; height: auto; display: block; + position: relative; &.img-lq { width: 50px; }