zc

src/views/newEvacuationBigData.vue

@@ -1505,7 +1505,7 @@
       },
       /*********************************** 火焰报警-相关接口 *********************************/
       //获取实验室灭火设备数据
-      getFireStatus(){
+      getFireStatus(type){
         getFireStatus({subjectId:this.subId}).then(response => {
           if(response.data.isexist){
             this.$set(this,'fireType',response.data.isexist);
@@ -1515,7 +1515,9 @@
               this.$set(this.fireData,'smokeType',response.data.smoke);
               this.$set(this.fireData,'flameType',response.data.fire);
               this.$set(this,'fireCode',response.data.fireDevice.deviceCode);
-              this.offFireMQTT('on');
+              if(type != 'mqtt'){
+                this.offFireMQTT('on');
+              }
               if(response.data.temperature && response.data.smoke){
                 if(!this.fireStartType){
                   this.$set(this,'fireStartType',true);
@@ -1529,11 +1531,15 @@
               this.$set(this.fireData,'smokeType',false);
               this.$set(this.fireData,'flameType',false);
               this.$set(this,'fireCode',null);
-              this.offFireMQTT('on');
+              if(type != 'mqtt'){
+                this.offFireMQTT('on');
+              }
             }
           }else{
             this.$set(this,'fireType',false);
-            this.offFireMQTT('on');
+            if(type != 'mqtt'){
+              this.offFireMQTT('on');
+            }
           }
         })
       },
@@ -1989,12 +1995,13 @@
               if(data){
                 console.log('data',data);
                 if(topic == (self.fireTopic + self.fireCode)){
-                  //传感器状态
-                  console.log('传感器状态');
-                  self.getFireStatus();
+                  //火灾传感器状态
+                  console.log('火灾传感器状态');
+                  self.getFireStatus('mqtt');
                 }else if(topic == (self.fireOnlineTopic + self.fireCode)){
                   //设备在线状态
                   console.log('设备在线状态');
+                  self.getFireStatus('mqtt');
                 }else if(topic == (self.firePerformTopic + self.fireCode)){
                   //灭火执行操作
                   if(data.fireStatus == 1){