dedsudiyu 2 years ago
parent
commit
13c8fb997f
1 changed files with 8 additions and 2 deletions
  1. 8 2
      src/views/newEvacuationBigData.vue

+ 8 - 2
src/views/newEvacuationBigData.vue

@@ -993,6 +993,7 @@
         this.subjectInfo();
         this.subjectInfo();
         //获取实验室火焰报警数据
         //获取实验室火焰报警数据
         this.$set(this,'fireStartType',false);
         this.$set(this,'fireStartType',false);
+        this.$set(this,'fireTextStartType',false);
         if(this.fireStartTimeData){
         if(this.fireStartTimeData){
           window.clearInterval(this.fireStartTimeData);
           window.clearInterval(this.fireStartTimeData);
           this.$set(this,'fireStartTimeData',null);
           this.$set(this,'fireStartTimeData',null);
@@ -1546,6 +1547,7 @@
       getFireStatus(type){
       getFireStatus(type){
         getFireStatus({subjectId:this.subId}).then(response => {
         getFireStatus({subjectId:this.subId}).then(response => {
           if(response.data.isexist){
           if(response.data.isexist){
+            console.log('miehuo',response.data);
             this.$set(this,'fireType',response.data.isexist);
             this.$set(this,'fireType',response.data.isexist);
             if(response.data.online){
             if(response.data.online){
               this.$set(this,'fireListType',response.data.online);
               this.$set(this,'fireListType',response.data.online);
@@ -2038,6 +2040,10 @@
               let data = JSON.parse(message)
               let data = JSON.parse(message)
               if(data){
               if(data){
                 console.log('data',data);
                 console.log('data',data);
+                console.log('topic',topic);
+                console.log('self.fireTopic + self.fireCode',self.fireTopic + self.fireCode);
+                console.log('self.fireOnlineTopic + self.fireCode',self.fireOnlineTopic + self.fireCode);
+                console.log('self.firePerformTopic + self.fireCode',self.firePerformTopic + self.fireCode);
                 if(topic == (self.fireTopic + self.fireCode)){
                 if(topic == (self.fireTopic + self.fireCode)){
                   //火灾传感器状态
                   //火灾传感器状态
                   console.log('火灾传感器状态');
                   console.log('火灾传感器状态');
@@ -2054,9 +2060,9 @@
                       // self.$set(self,'fireStartType',true);
                       // self.$set(self,'fireStartType',true);
                       // self.$set(self,'fireStartText','灭火中');
                       // self.$set(self,'fireStartText','灭火中');
                       // self.fireStartTimeFunction(data.direTime);
                       // self.fireStartTimeFunction(data.direTime);
-                    }else if(data.fireStatus == 0){
-                      self.msgError('一键灭火启动失败')
                     }
                     }
+                  }else if(data.fireStatus == 0){
+                    self.msgError('一键灭火启动失败')
                   }
                   }
                 }
                 }
               }
               }