From f88a36a07d39a5b94de03dc01cf04a80bb9eaa13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=90=8C?= <525441437@qq.com>
Date: Mon, 20 Nov 2023 10:14:41 +0800
Subject: [PATCH] 1

---
 src/views/page/status.vue | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/views/page/status.vue b/src/views/page/status.vue
index 173f154..e60893e 100644
--- a/src/views/page/status.vue
+++ b/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 == 1 || left1Act == 3 ? 'active' : ''">进水泵</div>
+                        <div :class="left1Act == 2 || left1Act == 3 ? 'active' : ''">配肥泵</div>
                     </div>
                 </div>
 
@@ -328,7 +328,6 @@ export default {
             typeList.forEach((el, index) => {
 
                 if (el.value == this.inputData1[typeCode]) {
-                    console.log(this.inputData1[typeCode], 111, el.countType);
                     countType = el.countType
                 }
             })
@@ -502,23 +501,22 @@ export default {
                     }
                 }
             }
-            console.log(this.right2Index, 123);
         },
         //进水泵和出水泵状态
         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
+                }
+               if (Number(number[1])) {
+                    this.left1Act = 0
+                }
+                if (Number(number[0])&&Number(number[1])) {
+                    this.left1Act = 3
+                }
+            else {
+                this.left1Act = -1
+            }
         },
         dataInit() {
             const that = this