优化

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'
   })
 }

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()
+      let status = activeBtn === 'today' ? '0' : '1,2'
-      if(activeBtn === 'today'){
+      getAlarmDetailList({status,deviceId,alarmLevel,siteId,pageSize,pageNum,alarmStartTime:formatDate(alarmStartTime),alarmEndTime:formatDate(alarmEndTime)}).then(response => {
-        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 => {
         this.tableData=response?.rows || [];
         this.totalSize = response?.total || 0
       }).finally(() => {this.loading=false})

src/views/ems/dzjk/zxlt/index.vue

@@ -112,11 +112,14 @@
                   >
                     {{ communicationStatusOptions[item.communicationStatus] }}
                   </div>
-                  <div class="row-items-img">
+                  <div class="row-items-img row-items-img-bms">
-                    <img
+                    <div style="position:relative;">
-                      class="img-bms"
+                      <img
-                      :src="require('@/assets/images/ems/bms.png')"
+                        class="img-bms"
-                    />
+                        :src="require('@/assets/images/ems/bms.png')"
+                      />
+                      <div class="num">{{item.batteryNum || 0}}</div>
+                    </div>
                     <div class="name">{{ item.deviceName }}</div>
                   </div>
                 </div>
@@ -179,11 +182,14 @@
                       ]
                     }}
                   </div>
-                  <div class="row-items-img">
+                  <div class="row-items-img row-items-img-bms">
-                    <img
+                    <div style="position: relative">
-                      class="img-pcs"
+                      <img
-                      :src="require('@/assets/images/ems/bms.png')"
+                        class="img-bms"
-                    />
+                        :src="require('@/assets/images/ems/bms.png')"
+                      />
+                      <div class="num">{{item.batteryNum || 0}}</div>
+                    </div>
                     <div class="name">{{ item.children[0].deviceName }}</div>
                   </div>
                 </div>
@@ -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;
               }