忽视上报功能

pages/device/detail.vue

@@ -832,16 +832,22 @@ export default {
   },
   watch: {
     pressTurn(newVal,oldValue) {
+      let self= this;
       if(newVal == 1){
-        this.startProgressTimer(1);
+        setTimeout(function(){
+          self.startProgressTimer(1);
+        },200);
       }else{
         clearInterval(this.lineTimer)
         this.turnPercent = 0;
       }
     },
     resetTurn(newVal){
+      let self= this;
       if(newVal == 1){
-        this.startProgressTimer(2);
+       setTimeout(function(){
+         self.startProgressTimer(2);
+       },200);
       }else{
         clearInterval(this.lineTimer)
         this.turnPercent = 0;
@@ -871,12 +877,11 @@ export default {
         return;
       }
       let arr = [];
-      if(this.resetTurn == 1){
-        this.notifyError("请先关闭复位功能")
-        return;
-      }
       let currentPresturn = this.pressTurn;
       let pressObj = {};
+      if(this.resetTurn == 1){
+        this.resetTurn = 0;
+      }
       if(currentPresturn == 1){//代表要关闭
         pressObj.id = "PressTurn";
         pressObj.shadow = 0;
@@ -888,6 +893,7 @@ export default {
         pressObj.shadow = 1;
         arr.push(pressObj);
         this.pressTurn = 1;
+        this.resetTurn = 0;
       }
 
       this.mqttPublish(2,this.deviceInfo,arr)
@@ -923,27 +929,29 @@ export default {
       }
     },
     setResetTurn(){
+      debugger;
       if(!this.decoctControlOnOffStatus){
         this.notifyError("请先开机后再进行操作")
         return;
       }
       if(this.pressTurn == 1){
-        this.notifyError("请先关闭挤压功能")
-        return;
+        this.pressTurn = 0;
       }
       let arr = [];
       if(this.resetTurn == 1){
         let pressObj = {};
-        pressObj.id = "PressTurn";
+        pressObj.id = "ResetTurn";
         pressObj.shadow = 0;
         this.resetTurn = 0;
         this.turnPercent = 0;
         arr.push(pressObj);
       }else{
         let pressObj = {};
-        pressObj.id = "PressTurn";
-        pressObj.shadow = 0;
+        pressObj.id = "ResetTurn";
+        pressObj.shadow = 1;
         this.resetTurn = 1;
+        this.pressTurn = 0;
+        let self= this;
         arr.push(pressObj);
       }
 
@@ -2207,7 +2215,7 @@ export default {
       this.childId = item.id;
       this.getDeviceStatus()
     },
-    parseEnumList(){
+    parseEnumList(flag){
       let enumList = this.deviceInfo.enumList;
       for (let enumListElement of enumList) {
         let id = enumListElement.id;
@@ -2260,28 +2268,33 @@ export default {
         this.formatValue(id,enumListElement,"PackageSwitch","baozhuangTurn");
 
         //pressTurn resetTurn
-        if(id == 'PressTurn'){
-          let shadow = enumListElement.shadow;
-          if(!shadow){
-            shadow = 0;
-          }
-          if(shadow == 1){
-            this.pressTurn = 1;
-          }
-
+        if(!flag){
+          if(id == 'PressTurn'){
+            let shadow = enumListElement.shadow;
+            if(!shadow){
+              shadow = 0;
+            }
+            if(shadow == 1){
+              this.pressTurn = 1;
+              this.resetTurn = 0;
+            }
 
-        }
 
-        if(id == 'ResetTurn'){
-          let shadow = enumListElement.shadow;
-          if(!shadow){
-            shadow = 0;
           }
-          if(shadow == 1){
-            this.resetTurn = 1;
+
+          if(id == 'ResetTurn'){
+            let shadow = enumListElement.shadow;
+            if(!shadow){
+              shadow = 0;
+            }
+            if(shadow == 1){
+              this.resetTurn = 1;
+              this.pressTurn = 0;
+            }
           }
         }
 
+
         if(id == 'WorkMode'){
           let shadow = enumListElement.shadow;
           if(!shadow){
@@ -2580,7 +2593,7 @@ export default {
                 }
               }
             }
-            this.parseEnumList();
+            this.parseEnumList(true);
             this.checkJianyao();
             if(this.planIngPopDlg){
               this.calcuStep();