From f0abd6228be29d119a8db85d49d93965d2f99a52 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Fri, 24 May 2024 23:03:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E6=B6=B2=E6=8E=92=E7=A9=BA=E7=AE=A1?=
 =?UTF-8?q?=E5=86=85=E6=B6=B2=E4=BD=93=E6=97=B6=E9=9C=80=E8=A6=81=E8=83=BD?=
 =?UTF-8?q?=E5=A4=9F=E6=9A=82=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LiquidHandle.vue | 98 +++++++++++++++++------------------------
 1 file changed, 40 insertions(+), 58 deletions(-)

diff --git a/src/components/LiquidHandle.vue b/src/components/LiquidHandle.vue
index 46180ad..0f2a70c 100644
--- a/src/components/LiquidHandle.vue
+++ b/src/components/LiquidHandle.vue
@@ -2,33 +2,11 @@
   <div class="liquid_contaienr">
     <div class="left_container">
       <p class="status">
-        <svg
-          v-if="operatorStore.replenishingFluidsWorkState == 1 && tabType == 1"
-          xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          fill="none"
-          version="1.1"
-          width="155"
-          height="38"
-          viewBox="0 0 155 38"
-        >
-          <g>
-            <g>
-              <path
-                d="M50.888,17.076L50.888,29.348L47.352,29.348L47.352,31.246L70.7,31.246L70.7,29.348L60.69,29.348L60.69,21.158L68.828,21.158L68.828,19.26L60.69,19.26L60.69,12.318L69.842,12.318L69.842,10.394L48.34,10.394L48.34,12.318L58.635999999999996,12.318L58.635999999999996,29.348L52.89,29.348L52.89,17.076L50.888,17.076ZM83.726,8.48584C83.362,9.81509,82.894,11.1968,82.348,12.526L75.19800000000001,12.526L75.19800000000001,14.398L81.49000000000001,14.398C79.826,17.726,77.538,20.82,74.548,22.9C74.86,23.342,75.354,24.174,75.562,24.694C76.654,23.914,77.668,23.03,78.578,22.068L78.578,32.312L80.52799999999999,32.312L80.52799999999999,19.754C81.75,18.09,82.816,16.27,83.7,14.398L97.97399999999999,14.398L97.97399999999999,12.526L84.506,12.526C84.97399999999999,11.3532,85.39,10.1543,85.75399999999999,8.98106L83.726,8.48584ZM89.108,15.75L89.108,20.768L83.25800000000001,20.768L83.25800000000001,22.588L89.108,22.588L89.108,29.972L82.218,29.972L82.218,31.792L97.94800000000001,31.792L97.94800000000001,29.972L91.05799999999999,29.972L91.05799999999999,22.588L96.96000000000001,22.588L96.96000000000001,20.768L91.05799999999999,20.768L91.05799999999999,15.75L89.108,15.75ZM115.992,11.72L115.992,32.0337L117.864,32.0337L117.864,30.102L122.908,30.102L122.908,31.8249L124.858,31.8249L124.858,11.72L115.992,11.72ZM117.864,28.23L117.864,13.618L122.908,13.618L122.908,28.23L117.864,28.23ZM106.19,8.82425L106.164,13.436L102.49799999999999,13.436L102.49799999999999,15.334L106.112,15.334C105.93,21.886,105.124,27.658,101.848,31.09C102.342,31.402,103.044,32,103.356,32.4461C106.866,28.62,107.77600000000001,22.38,108.00999999999999,15.334L111.962,15.334C111.754,25.344,111.52,28.906,110.974,29.66C110.74,29.998,110.48,30.102,110.09,30.076C109.622,30.076,108.50399999999999,30.076,107.282,29.972C107.62,30.518,107.80199999999999,31.35,107.854,31.922C109.024,32,110.22,32.0264,110.948,31.922C111.702,31.818,112.196,31.584,112.664,30.908C113.47,29.79,113.652,25.994,113.86,14.424C113.86,14.138,113.86,13.436,113.86,13.436L108.062,13.436L108.114,8.82425L106.19,8.82425ZM145.372,19.9636C146.28199999999998,20.8224,147.322,22.0452,147.764,22.8781L148.82999999999998,21.9412C148.388,21.1348,147.348,19.9636,146.412,19.1828L145.372,19.9636ZM131.046,10.3912C132.346,11.434,133.958,12.9684,134.686,13.9832L136.038,12.734C135.232,11.746,133.64600000000002,10.2607,132.32,9.26909L131.046,10.3912ZM129.772,17.3913C131.124,18.3277,132.788,19.7325,133.594,20.6693L134.84199999999998,19.3685C134.01,18.4317,132.346,17.1308,130.994,16.2204L129.772,17.3913ZM130.31799999999998,30.6074L132.00799999999998,31.6742C133.074,29.3326,134.296,26.1845,135.20600000000002,23.5569L133.672,22.4905C132.684,25.3261,131.30599999999998,28.6302,130.31799999999998,30.6074ZM143.26600000000002,8.93028C143.656,9.66072,144.046,10.5476,144.358,11.356L136.376,11.356L136.376,13.228L153.562,13.228L153.562,11.356L146.412,11.356C146.1,10.4432,145.554,9.2955,145.034,8.40825L143.26600000000002,8.93028ZM145.112,18.35L150.624,18.35C149.922,21.2128,148.726,23.6329,147.21800000000002,25.6105C145.94400000000002,23.9449,144.93,22.0192,144.228,19.9636C144.54000000000002,19.4172,144.826,18.8968,145.112,18.35ZM145.112,13.618C144.228,16.634,142.382,20.302,140.06799999999998,22.6181C140.43200000000002,22.8781,141.03,23.4765,141.34199999999998,23.8409C141.966,23.1905,142.59,22.4357,143.162,21.6292C143.942,23.5809,144.93,25.3761,146.1,26.9637C144.436,28.7593,142.486,30.0862,140.406,30.971C140.796,31.3094,141.29000000000002,31.9858,141.55,32.4282C143.656,31.4654,145.57999999999998,30.1382,147.244,28.3689C148.752,30.0602,150.494,31.4134,152.47,32.3762C152.78199999999998,31.9078,153.35399999999998,31.1794,153.76999999999998,30.841C151.74200000000002,29.9822,149.94799999999998,28.6809,148.414,27.0417C150.416,24.4917,151.924,21.2388,152.73000000000002,17.102L151.534,16.66L151.22199999999998,16.764L145.86599999999999,16.764C146.28199999999998,15.854,146.62,14.944,146.93200000000002,14.06L145.112,13.618ZM139.834,13.566C138.924,16.4,137.05200000000002,19.8856,134.946,22.1237C135.336,22.4097,135.95999999999998,22.9821,136.24599999999998,23.3465C136.89600000000002,22.6441,137.546,21.8112,138.144,20.9264L138.144,32.4022L139.886,32.4022L139.886,18.038C140.588,16.712,141.186,15.36,141.68,14.086L139.834,13.566Z"
-                fill="#FA1C1C"
-                fill-opacity="1"
-              />
-            </g>
-            <g>
-              <path
-                d="M15.017,4Q18.1087,4,20.8437,5.17347Q23.5787,6.34694,25.6172,8.38776Q27.6557,10.42857,28.8279,13.16667Q30,15.9048,30,19Q30,22.1293,28.8279,24.8503Q27.6557,27.5714,25.6172,29.6122Q23.5787,31.6531,20.8437,32.826499999999996Q18.1087,34,15.017,34Q11.8913,34,9.15628,32.826499999999996Q6.42129,31.6531,4.38279,29.6122Q2.34428,27.5714,1.17214,24.8503Q-3.79701e-7,22.1293,0,19Q0,15.9048,1.17214,13.16667Q2.34428,10.42857,4.38279,8.38775Q6.42129,6.34694,9.15628,5.17347Q11.8913,3.999999113026,15.017,4ZM23.5787,21.0748Q24.4621,21.0748,25.0736,20.4456Q25.6852,19.8163,25.6852,18.932000000000002Q25.6852,18.0476,25.0736,17.4354Q24.4621,16.8231,23.5787,16.8231L17.1914,16.8231L17.1914,10.42857Q17.1914,9.54422,16.5629,8.91497Q15.9343,8.28571,15.051,8.28571Q14.1676,8.28571,13.5561,8.91497Q12.9445,9.54422,12.9445,10.42857L12.9445,16.8231L6.55719,16.8231Q5.67384,16.8231,5.06229,17.4354Q4.45074,18.0476,4.45074,18.932000000000002Q4.45074,19.8163,5.06229,20.4456Q5.67384,21.0748,6.55719,21.0748L12.9445,21.0748L12.9445,27.4354Q12.9445,28.3197,13.5561,28.949Q14.1676,29.5782,15.051,29.5782Q15.9343,29.5782,16.5629,28.949Q17.1914,28.3197,17.1914,27.4354L17.1914,21.0748L23.5787,21.0748Z"
-                fill="#FA1C1C"
-                fill-opacity="1"
-              />
-            </g>
-          </g>
-        </svg>
+        <template v-if="tabType == 1">
+          <span v-if="operatorStore.replenishingFluidsWorkState == 1" style="color: rgb(250, 28, 28);font-size: 1.5rem;vertical-align: super;">正在加液</span>
+          <span v-if="operatorStore.replenishingFluidsWorkState == 2" style="color: rgb(250, 28, 28);font-size: 1.5rem;vertical-align: super;">正在排空管道</span>
+        </template>
+        
         <svg
           v-if="operatorStore.drainingWorkState == 1 && tabType == 2"
           xmlns="http://www.w3.org/2000/svg"
@@ -86,32 +64,28 @@
           {{ disinfectantCapacity <= 0 ? 0 : disinfectantCapacity }}
         </p>
       </div>
-      <img
-        class="btn mb"
-        v-if="!operatorStore.replenishingFluidsWorkState && tabType == 1"
-        :src="StartLiquid"
-        alt=""
-        @click="startAdd"
-      />
-      <img
-        class="btn mb"
-        v-if="operatorStore.replenishingFluidsWorkState && tabType == 1"
-        :src="StopLiquidPause"
-        alt=""
-      />
-      <img
-        class="btn"
-        v-if="operatorStore.replenishingFluidsWorkState && tabType == 1"
-        :src="StopLiquid"
-        alt=""
-        @click="stopAdd"
-      />
-      <img
-        class="btn"
-        v-if="!operatorStore.replenishingFluidsWorkState && tabType == 1"
-        :src="StartLiquidPause"
-        alt=""
-      />
+      
+      <!-- 加液 -->
+      <template v-if="tabType == 1">
+        <!-- 开始加液 -->
+        <img v-if="!operatorStore.replenishingFluidsWorkState" class="btn mb" :src="StartLiquid" @click="startAdd" />
+        <img v-if="operatorStore.replenishingFluidsWorkState" class="btn mb" :src="StopLiquidPause" />
+        <img v-if="operatorStore.replenishingFluidsWorkState" class="btn" :src="StopLiquid" @click="actionAddStop" />
+        <img v-if="!operatorStore.replenishingFluidsWorkState" class="btn" :src="StartLiquidPause" />
+      </template>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <img
         class="btn mb"
         v-if="!operatorStore.drainingWorkState && tabType == 2"
@@ -138,6 +112,14 @@
         @click="stopPop"
         alt=""
       />
+
+
+
+
+
+
+
+
     </div>
     <LiquidModal
       v-if="tabType == 2 && tipModalVisible"
@@ -197,6 +179,10 @@ onUnmounted(() => {
     operatorStore.liquidAddtionVolume = parseInt(addLiquidVal.value);
 });
 
+// 停止加液
+async function actionAddStop() {
+  await webSocketStore.call('stopReplenishingFluids');
+}
 
 
 
@@ -226,11 +212,7 @@ const startAdd = () => {
   }
 }
 
-const stopAdd = () => {
-  if (operatorStore.replenishingFluidsWorkState == 1) {
-    webSocketStore.sendCommandMsg(stopReplenishingFluidsJSON)
-  }
-}
+
 
 const stopPop = () => {
   if (operatorStore.drainingWorkState == 1) {