Browse Source

解决处置告警后返回列表没有刷新的问题,告警类型中新增 被盗告警

zhulu 1 year ago
parent
commit
7101f921dd

+ 1 - 1
src/views/menu/iot/alarmCenter/dealAlarm.vue

@@ -14,7 +14,7 @@
       <van-cell title="告警开始时间" :value="renderTime(info.time)"></van-cell>
       <van-cell title="告警结束时间" :value="renderTime(info.endTime)"></van-cell>
       <van-cell title="持续时长" :value="durationText" />
-      <van-cell title="告警值" :value="valueText" />
+      <van-cell title="告警值" :value="info.alarmValue" />
       <van-cell title="告警内容" :value="info.content" />
     
       <!-- <van-cell title="处置时间" :value="renderTime(info.doTime)" /> -->

+ 1 - 1
src/views/menu/iot/alarmCenter/detail.vue

@@ -14,7 +14,7 @@
       <van-cell title="告警开始时间" :value="renderTime(info.time)"></van-cell>
       <van-cell title="告警结束时间" :value="renderTime(info.endTime)"></van-cell>
       <van-cell title="持续时长" :value="durationText" />
-      <van-cell title="告警值" :value="valueText" />
+      <van-cell title="告警值" :value="info.alarmValue" />
       <van-cell title="告警内容" :value="info.content" />
       <van-cell title="处置时间" :value="renderTime(info.doTime)" />
       <van-cell title="处置人" :value="info.doByUser" />

+ 27 - 0
src/views/menu/iot/alarmCenter/index.vue

@@ -116,6 +116,10 @@ export default {
           text: '燃气告警'
         },
         {
+          value: '41881',
+          text: '盗情告警'
+        },
+        {
           value: '4188',
           text: '门磁告警'
         },
@@ -172,6 +176,14 @@ export default {
       ]
     }
   },
+  beforeRouteEnter(to,from,next){
+    next(vm=>{
+      console.log("beforeRouteEnter",to.params.event,to)
+      if(to.params.event === 'refresh'){        
+        vm.reSet()     
+      }
+    })
+  },
   watch: {},
   created() {},
   mounted() {
@@ -182,6 +194,21 @@ export default {
   },
   methods: {
     list,
+    reSet(){
+      this.showAlarmType= false;
+        this.defaultAlarmType= '全部'
+        this.showState = false;
+        this.defaultAlarmType= '全部'
+      this.search= {        
+          orgId: this.orgId,
+          checkSub: true,
+          alarmType: null,
+          deviceName:null,
+          state: null,
+          pageNum: 1,
+          pageSize: 10
+        };
+    },
     onAlarmTypeConfirm(opt) {
       this.defaultAlarmType = opt.text
       this.search.alarmType = opt.value