1

src/views/page/realTime.vue

@@ -75,12 +75,13 @@ export default {
         setTimeout(() => {
             that.dataInit();
             that.timer&&clearInterval(that.timer)
-           setInterval(() => {
+            that.timer= setInterval(() => {
             that.dataInit();
            }, 60000);
         }, 0);
     },
     beforeDestroy() {
+        const that = this;
         // 销毁播放器
         if (this.player) {
             this.player.dispose();

src/views/page/status.vue

@@ -35,8 +35,8 @@
                         </div>
                     </div>
                     <div class="left-btn">
-                        <div :class="left1Act == 0 ? 'active' : ''">进水泵</div>
-                        <div :class="left1Act == 1 ? 'active' : ''">配肥泵</div>
+                        <div :class="left1Act == 1&&left1Act==3 ? 'active' : ''">进水泵</div>
+                        <div :class="left1Act == 2&&left1Act==3 ? 'active' : ''">配肥泵</div>
                     </div>
                 </div>
 
@@ -247,8 +247,8 @@ export default {
                 ADdata: 0,
             },],
             right2Index: [],
-            rightList2: ['外控信号2#',
-                '外控信号1#',
+            rightList2: ['外控信号1#',
+                '外控信号2#',
                 '外控信号3#',
                 '外控信号4#',
                 '高液位信号',
@@ -280,6 +280,7 @@ export default {
     },
     //清除监听
     beforeDestroy(){
+        const that = this;
          that.pageTimer&&clearInterval(that.pageTimer)
     },
     mounted() {
@@ -494,15 +495,19 @@ export default {
         },
         //进水泵和出水泵状态
         getData30() {
-            var number = this.padString(this.inputData['30'].toString(2), 2)
-            if (Number(number[0])) {
-                this.left1Act = 1
-            }
-            else if (Number(number[1])) {
-                this.left1Act = 0
-            } else {
-                this.left1Act = -1
-            }
+        //     var number = this.padString(this.inputData['30'].toString(2), 2)
+        //     if (Number(number[0])) {
+        //         this.left1Act = 1
+        //     }
+        //    if (Number(number[1])) {
+        //         this.left1Act = 0
+        //     }
+        //     if (Number(number[0])&&Number(number[1])) {
+        //         this.left1Act = 3
+        //     }
+            // else {
+            //     this.left1Act = -1
+            // }
         },
         dataInit() {
             var deviceDetail = this.deviceDetail