heyang

src/layout/components/AppMain.vue

@@ -51,6 +51,7 @@ export default {
       buildId:null,
       floorId:null,
       subId:null,
+      groupId:null,
     }
   },
   created() {
@@ -134,7 +135,7 @@ export default {
     },
     //结束预案
     closeRiskPlan(){
-      closeRiskPlan({id:this.closeId}).then(response => {
+      closeRiskPlan({id:this.groupId}).then(response => {
         this.msgSuccess("操作成功");
         this.getListStatus();
       });
@@ -226,6 +227,7 @@ export default {
           this.$set(this,'buildId',response.data[0].buildId);
           this.$set(this,'floorId',response.data[0].floorId);
           this.$set(this,'subId',response.data[0].subId);
+          this.$set(this,'groupId',response.data[0].groupId);
           if(response.data[0].riskAttribute == 1){
             this.$set(this,'closePlan',true);
           }

src/views/newEvacuationBigData.vue

@@ -885,7 +885,7 @@
         if(!self.putOutTheFireType){
           let obj = {
             subjectId:self.subId,
-            relayCode:self.fireCode,
+            deviceCode:self.fireCode,
           }
           outfirepc(obj).then(response => {
             if(response.data.waitTime){
@@ -1492,7 +1492,7 @@
               this.$set(this.fireData,'temperatureType',response.data.temperature);
               this.$set(this.fireData,'smokeType',response.data.smoke);
               this.$set(this.fireData,'flameType',response.data.fire);
-              this.$set(this,'fireCode',response.data.fireDevice.relayCode);
+              this.$set(this,'fireCode',response.data.fireDevice.deviceCode);
               this.offFireMQTT('on');
               if(response.data.temperature && response.data.smoke){
                 if(!this.fireStartType){