From e9dd5e6f8d46c688d2c7e311059bafafcfa03e5f Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sun, 10 Sep 2023 18:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                        |  8 ++++----
 src/components/Progress.vue |  2 +-
 src/components/Test.vue     | 50 +++++++++++++++++++--------------------------
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/.env b/.env
index fe3f0dd..c4ae906 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
-VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
-VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
+# VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
+# VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
 
-# VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
-# VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
+VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
+VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
diff --git a/src/components/Progress.vue b/src/components/Progress.vue
index 0334955..4be7942 100644
--- a/src/components/Progress.vue
+++ b/src/components/Progress.vue
@@ -788,7 +788,7 @@ const continueDisinfect = () => {
         color: #ffffff;
         position: absolute;
         left: 165px;
-        top: 9px;
+        top: 12px;
         width: 178px;
         height: 41px;
         text-align: center;
diff --git a/src/components/Test.vue b/src/components/Test.vue
index b9ba1e0..c19376e 100644
--- a/src/components/Test.vue
+++ b/src/components/Test.vue
@@ -394,31 +394,25 @@ const handleInput = (value, index) => {
 
 const setAddLiquidConfig = flag => {
   if (flag == 1) {
-    if (settingStore.chargingPumpRPM == 0) {
-      websocketStore.sendCommandMsg(
-        // 正传
-        test_replenishingFluidsPumpCtrJSON(1, addLiquidVal.value),
-      )
-      showSuccessToast('设置成功')
-      return
-    }
+    websocketStore.sendCommandMsg(
+      // 正传
+      test_replenishingFluidsPumpCtrJSON(1, addLiquidVal.value),
+    )
+    showSuccessToast('设置成功')
+    return
   } else if (flag == 2) {
-    if (settingStore.sprinklerPumpRPM == 0) {
-      websocketStore.sendCommandMsg(
-        sprayLiquidPump_open_for_testJSON(1, addLiquidVal2.value),
-      )
-      showSuccessToast('设置成功')
-      return
-    }
+    websocketStore.sendCommandMsg(
+      sprayLiquidPump_open_for_testJSON(1, addLiquidVal2.value),
+    )
+    showSuccessToast('设置成功')
+    return
   } else if (flag == 3) {
     // 关闭
-    if (settingStore.chargingPumpRPM != 0) {
-      websocketStore.sendCommandMsg(
-        test_replenishingFluidsPumpCtrJSON(0, addLiquidVal.value),
-      )
-      showSuccessToast('关闭加液蠕动泵成功')
-      return
-    }
+    websocketStore.sendCommandMsg(
+      test_replenishingFluidsPumpCtrJSON(0, addLiquidVal.value),
+    )
+    showSuccessToast('关闭加液蠕动泵成功')
+    return
   } else if (flag == 5) {
     // 反转
     websocketStore.sendCommandMsg(
@@ -431,13 +425,11 @@ const setAddLiquidConfig = flag => {
     )
     showSuccessToast('设置成功')
   } else {
-    if (settingStore.sprinklerPumpRPM != 0) {
-      websocketStore.sendCommandMsg(
-        sprayLiquidPump_open_for_testJSON(0, addLiquidVal2.value),
-      )
-      showSuccessToast('关闭注射蠕动泵成功')
-      return
-    }
+    websocketStore.sendCommandMsg(
+      sprayLiquidPump_open_for_testJSON(0, addLiquidVal2.value),
+    )
+    showSuccessToast('关闭注射蠕动泵成功')
+    return
   }
 }