heyang

App.vue

@@ -41,6 +41,7 @@
             mqttDeviceData:{},
 			warnData:{},
 			lineData:{},
+			mqttOutfireData:{},
         },
         methods: {
 			//删除报警监听
@@ -63,6 +64,10 @@
             deleteLineData(){
                 delete this.watchObj.lineData;
             },
+			//删除一键灭火
+			deleteOutfireData(){
+			    delete this.watchObj.mqttOutfireData;
+			},
             //监听对应的mqtt数据
             watch:function(method,istr){
                 this.watchObj = this.globalData;
@@ -141,7 +146,7 @@
 							    }
 							});
 						}else if(self.mqttIdList[i].type == 'lab/fireDevice/Warn/'){
-							self.client.subscribe(self.mqttIdList[i].type, (err) => {
+							self.client.subscribe(self.mqttIdList[i].type+'#', (err) => {
 							    if (!err) {
 							        console.log("一键灭火订阅成功",self.mqttIdList[i].type)
 							    }
@@ -168,11 +173,14 @@
                 // 收到消息
                 this.client.on('message', (topic, message) => {
                     let data = JSON.parse(message)
-					// console.log('消息message',data);
+					 //console.log('消息message',data);
 					if(data){
 						if(topic == 'lab/exit/line'){
 							// console.log("应急",data);
 							this.globalData.lineData = data.data;
+						}else if(topic.search("lab/fireDevice/Warn/") != -1){
+							// console.log("一键灭火",data);
+							this.globalData.mqttOutfireData = data.data;
 						}else if(topic == 'lab/bigview'){
 							// console.log("报警",data);
 							if(data.data == 'SUB_RISKPLAN_GROUP'){