优化

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