From e58f4bc9f5049aba6ebdbac96873f474729b90ae Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Tue, 5 Sep 2023 13:28:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Test.vue | 51 +++++++++++++++++--------------------------------
 src/mock/command.js     | 18 +++++++++++++++++
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/components/Test.vue b/src/components/Test.vue
index cd2eec9..d89fc67 100644
--- a/src/components/Test.vue
+++ b/src/components/Test.vue
@@ -14,18 +14,6 @@
         />
         <p>g/min</p>
       </div>
-      <div class="num">
-        <van-field
-          type="number"
-          v-model="addLiquidPower"
-          :clickable="true"
-          readonly
-          :formatter="formatter"
-          @click.stop="hideAllKeyboards(2)"
-          class="add_liquid_input"
-        />
-        <p>P</p>
-      </div>
       <div class="btn_wrap">
         <div
           :class="
@@ -70,18 +58,6 @@
         />
         <p>g/min</p>
       </div>
-      <div class="num">
-        <van-field
-          type="number"
-          :formatter="formatter"
-          v-model="addLiquidPower2"
-          :clickable="true"
-          readonly
-          @click.stop="hideAllKeyboards(4)"
-          class="add_liquid_input"
-        />
-        <p>P</p>
-      </div>
       <div class="btn_wrap">
         <div
           :class="
@@ -265,6 +241,8 @@ import {
   liquidpumpctrlJSON,
   getStateJSON,
   addLiquidCtrlJSON,
+  test_replenishingFluidsPumpCtrJSON,
+  sprayLiquidPump_open_for_testJSON,
 } from '@/mock/command'
 import { showSuccessToast, showFailToast } from 'vant'
 const testStore = useTestStore()
@@ -294,8 +272,8 @@ const formatter6 = value => {
     item => item.name == 'drainage_pump_speed',
   )
   if (arr && arr.length > 0) {
-    if (parseInt(value) > arr[0].val_upper_limit) {
-      return arr[0].val_upper_limit + ''
+    if (parseInt(value) > 40) {
+      return '40'
     }
     if (parseInt(value) < arr[0].val_lower_limit) {
       return arr[0].val_lower_limit + ''
@@ -309,8 +287,8 @@ const formatter7 = value => {
     item => item.name == 'injection_pump_speed',
   )
   if (arr && arr.length > 0) {
-    if (parseInt(value) > arr[0].val_upper_limit) {
-      return arr[0].val_upper_limit + ''
+    if (parseInt(value) > 40) {
+      return '40'
     }
     if (parseInt(value) < arr[0].val_lower_limit) {
       return arr[0].val_lower_limit + ''
@@ -377,30 +355,35 @@ const handleInput = (value, index) => {
 const setAddLiquidConfig = flag => {
   if (flag == 1) {
     websocketStore.sendCommandMsg(
-      addLiquidCtrlJSON(1, addLiquidVal.value, addLiquidPower.value),
+      // 正传
+      test_replenishingFluidsPumpCtrJSON(1, addLiquidVal.value),
     )
     showSuccessToast('设置成功')
   } else if (flag == 2) {
     websocketStore.sendCommandMsg(
-      addLiquidCtrlJSON(2, addLiquidVal2.value, addLiquidPower2.value),
+      sprayLiquidPump_open_for_testJSON(1, addLiquidVal2.value),
     )
     showSuccessToast('设置成功')
   } else if (flag == 3) {
-    websocketStore.sendCommandMsg(addLiquidCtrlJSON(1, 0, addLiquidPower.value))
+    // 关闭
+    websocketStore.sendCommandMsg(
+      test_replenishingFluidsPumpCtrJSON(0, addLiquidVal.value),
+    )
     showSuccessToast('关闭加液蠕动泵成功')
   } else if (flag == 5) {
+    // 反转
     websocketStore.sendCommandMsg(
-      addLiquidCtrlJSON(1, '-' + addLiquidVal.value, addLiquidPower.value),
+      test_replenishingFluidsPumpCtrJSON(-1, addLiquidVal.value),
     )
     showSuccessToast('设置成功')
   } else if (flag == 6) {
     websocketStore.sendCommandMsg(
-      addLiquidCtrlJSON(2, '-' + addLiquidVal2.value, addLiquidPower2.value),
+      sprayLiquidPump_open_for_testJSON(-1, addLiquidVal2.value),
     )
     showSuccessToast('设置成功')
   } else {
     websocketStore.sendCommandMsg(
-      addLiquidCtrlJSON(2, 0, addLiquidPower2.value),
+      sprayLiquidPump_open_for_testJSON(0, addLiquidVal2.value),
     )
     showSuccessToast('关闭注射蠕动泵成功')
   }
diff --git a/src/mock/command.js b/src/mock/command.js
index ce966f1..88ba05d 100644
--- a/src/mock/command.js
+++ b/src/mock/command.js
@@ -139,3 +139,21 @@ export const addLiquidCtrlJSON = (num, speed, power) => {
     cancmd: `pumpctrl_c1004 ${num} 300 ${speed} 1 ${power}`,
   }
 }
+
+export const test_replenishingFluidsPumpCtrJSON = (ctrl, speed) => {
+  return {
+    command: 'test_replenishingFluidsPumpCtr',
+    messageId: 'test_replenishingFluidsPumpCtr',
+    ctrl,
+    speed,
+  }
+}
+
+export const sprayLiquidPump_open_for_testJSON = (ctrl, speed) => {
+  return {
+    command: 'sprayLiquidPump_open_for_test',
+    messageId: 'sprayLiquidPump_open_for_test',
+    ctrl,
+    speed,
+  }
+}