src/store/index.js

@@ -61,7 +61,7 @@ export default new Vuex.Store({
       { label: '土壤氮含量', value: 41, countType: 0,unit:'mg/kg' },
       { label: '土壤磷含量', value: 42, countType: 0,unit:'mg/kg' },
       { label: '土壤钾含量', value: 43, countType: 0,unit:'mg/kg' },
-      { label: '管道压力', value: 44, countType: 0,unit:'Kpa' },
+      { label: '臭氧', value: 44, countType: 0,unit:'ppm' },
       { label: '一氧化碳', value: 45, countType: 0,unit:'ppm' },
       { label: '氨气', value: 46, countType: 0,unit:'ppm' },
       { label: '硫化氢', value: 47, countType: 0,unit:'ppm' },

src/views/page/realTime.vue

@@ -75,13 +75,12 @@ export default {
         setTimeout(() => {
             that.dataInit();
             that.timer&&clearInterval(that.timer)
-            that.timer= setInterval(() => {
+           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 == 1&&left1Act==3 ? 'active' : ''">进水泵</div>
-                        <div :class="left1Act == 2&&left1Act==3 ? 'active' : ''">配肥泵</div>
+                        <div :class="left1Act == 0 ? 'active' : ''">进水泵</div>
+                        <div :class="left1Act == 1 ? 'active' : ''">配肥泵</div>
                     </div>
                 </div>
 
@@ -247,8 +247,8 @@ export default {
                 ADdata: 0,
             },],
             right2Index: [],
-            rightList2: ['外控信号1#',
-                '外控信号2#',
+            rightList2: ['外控信号2#',
+                '外控信号1#',
                 '外控信号3#',
                 '外控信号4#',
                 '高液位信号',
@@ -280,7 +280,6 @@ export default {
     },
     //清除监听
     beforeDestroy(){
-        const that = this;
          that.pageTimer&&clearInterval(that.pageTimer)
     },
     mounted() {
@@ -479,7 +478,6 @@ export default {
             var number = this.padString(this.inputData['29'].toString(2), 14)
             var index = 6
             var typeNumber = -1
-
             for (var i = 0; i < index; i++) {
                 if (Number(number[i])) {
                     typeNumber = i
@@ -490,31 +488,21 @@ export default {
             var statusIndex = 8
             for (var j = 0; j < statusIndex; j++) {
                 if (Number(number[number.length-1 - j])) {
-                    if(j=0){
-                        this.right2Index.push(1)
-                    }else if(j=1){
-                        this.right2Index.push(0)
-                    }else{
                     this.right2Index.push(j)
                 }
             }
-            }
         },
         //进水泵和出水泵状态
         getData30() {
-        //     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
-            // }
+            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
+            }
         },
         dataInit() {
             var deviceDetail = this.deviceDetail