From 845458b1781f06309dbaf277d9c5d6ba8bd7037a Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Fri, 24 May 2024 23:44:56 +0800
Subject: [PATCH] s

---
 src/components/Progress.vue    | 137 +++++++++++++++--------------------------
 src/store/modules/websocket.js |   2 +
 2 files changed, 50 insertions(+), 89 deletions(-)

diff --git a/src/components/Progress.vue b/src/components/Progress.vue
index 527df68..9f3e188 100644
--- a/src/components/Progress.vue
+++ b/src/components/Progress.vue
@@ -1,18 +1,20 @@
 <template>
   <div class="progress_container">
     <div class="header_wrap">
-      <div class="left_time">
-        <p class="time">
-          {{
-            operatorStore.estimatedRemainingTimeS == 0
-              ? '已结束'
-              : operatorStore.disinfectStatus == 1
-              ? `${time_To_hhmmss(operatorStore.estimatedRemainingTimeS)}`
-              : operatorStore.estimatedRemainingTimeS < 0
-              ? '评估中'
-              : `${time_To_hhmmss(operatorStore.estimatedRemainingTimeS)}`
-          }}
-        </p>
+      <div style="width:400px;">
+        <div class="left_time" v-if="-1 != operatorStore.estimatedRemainingTimeS">
+          <p class="time">
+            {{
+              operatorStore.estimatedRemainingTimeS == 0
+                ? '已结束'
+                : operatorStore.disinfectStatus == 1
+                ? `${time_To_hhmmss(operatorStore.estimatedRemainingTimeS)}`
+                : operatorStore.estimatedRemainingTimeS < 0
+                ? '评估中'
+                : `${time_To_hhmmss(operatorStore.estimatedRemainingTimeS)}`
+            }}
+          </p>
+        </div>
       </div>
 
       <div>
@@ -24,82 +26,6 @@
         <span v-if="operatorStore.disinfectStatus == 8" style="color: #2485FF;font-size: 2.3rem;font-weight: 600;">排空管路</span>
       </div>
 
-
-      <!-- <svg
-        v-if="[2, 3].includes(operatorStore.disinfectStatus)"
-        xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        fill="none"
-        version="1.1"
-        width="181"
-        height="52"
-        viewBox="0 0 181 52"
-      >
-        <g>
-          <g>
-            <g>
-              <path
-                d="M82.64,13.3438C81.84,15.7875,80.28,18.9925,79.12,21.0362L83.28,22.5987C84.52000000000001,20.6756,86,17.8306,87.28,15.0263L82.64,13.3438ZM62.72,15.4269C64.28,17.7506,65.84,20.8756,66.36,22.8794L70.72,20.8356C70.08,18.7925,68.4,15.8275,66.8,13.6244L62.72,15.4269ZM52,16.1481C54.480000000000004,17.4706,57.56,19.5537,59,21.0762L61.96,17.35C60.4,15.8675,57.24,13.9444,54.8,12.7825L52,16.1481ZM50.12,26.76C52.68,28.08,55.88,30.2,57.32,31.72L60.24,27.96C58.6,26.48,55.36,24.56,52.84,23.36L50.12,26.76ZM51.24,46.76L55.480000000000004,49.84C57.6,45.8,59.84,41.12,61.68,36.84L58.16,33.92C55.96,38.64,53.2,43.68,51.24,46.76ZM68.68,35.08L80.88,35.08L80.88,38.08L68.68,38.08L68.68,35.08ZM68.68,31.04L68.68,28.08L80.88,28.08L80.88,31.04L68.68,31.04ZM72.48,12.4225L72.48,23.64L64,23.64L64,49.9606L68.68,49.9606L68.68,42.12L80.88,42.12L80.88,44.76C80.88,45.28,80.68,45.48,80.03999999999999,45.52C79.44,45.52,77.32,45.52,75.48,45.4C76.12,46.64,76.76,48.64,76.92,49.92C79.96000000000001,49.92,82.08,49.88,83.6,49.12C85.12,48.4,85.56,47.12,85.56,44.84L85.56,23.64L77.32,23.64L77.32,12.4225L72.48,12.4225ZM121.2,33.76L121.08,35.92L114.16,35.92L115.16,35.36C115,34.88,114.64,34.32,114.16,33.76L121.2,33.76ZM100.72,30.32C100.6,32.08,100.44,34,100.24000000000001,35.92L94.28,35.92L94.28,39.44L99.88,39.44C99.6,41.56,99.36,43.52,99.08,45.12L119.96,45.12C119.8,45.6,119.64,45.88,119.48,46.08C119.12,46.52,118.76,46.6,118.08,46.6C117.36,46.64,115.8,46.6,114.08,46.44C114.6,47.36,115.08,48.84,115.12,49.8C117.2,49.8812,119.2,49.9219,120.44,49.72C121.72,49.6,122.8,49.28,123.68,48.2C124.12,47.64,124.52,46.68,124.84,45.12L129.44,45.12L129.44,41.68L125.36,41.68L125.56,39.44L131.72,39.44L131.72,35.92L125.84,35.92L126.04,32.16C126.08,31.6,126.12,30.32,126.12,30.32L100.72,30.32ZM110.08,34.24C110.56,34.72,111,35.32,111.4,35.92L104.96000000000001,35.92L105.16,33.76L111,33.76L110.08,34.24ZM120.84,39.44L120.6,41.68L113.68,41.68L114.96,41C114.76,40.52,114.4,39.96,113.96,39.44L120.84,39.44ZM109.75999999999999,39.88C110.28,40.4,110.8,41.04,111.16,41.68L104.32,41.68L104.6,39.44L110.6,39.44L109.75999999999999,39.88ZM110.52000000000001,12.4262L110.52000000000001,15.36L97.2,15.36L97.2,18.72L110.52000000000001,18.72L110.52000000000001,20.36L99.88,20.36L99.88,23.68L110.52000000000001,23.68L110.52000000000001,25.4L95.36,25.4L95.36,28.88L130.64,28.88L130.64,25.4L115.44,25.4L115.44,23.68L126.64,23.68L126.64,20.36L115.44,20.36L115.44,18.72L129.36,18.72L129.36,15.36L115.44,15.36L115.44,12.4262L110.52000000000001,12.4262ZM154.36,12.4231L154.36,19.4L140.51999999999998,19.4L140.51999999999998,39.6838L145.32,39.6838L145.32,37.48L154.36,37.48L154.36,50.0187L159.44,50.0187L159.44,37.48L168.51999999999998,37.48L168.51999999999998,39.4831L173.56,39.4831L173.56,19.4L159.44,19.4L159.44,12.4231L154.36,12.4231ZM145.32,32.76L145.32,24.12L154.36,24.12L154.36,32.76L145.32,32.76ZM168.51999999999998,32.76L159.44,32.76L159.44,24.12L168.51999999999998,24.12L168.51999999999998,32.76Z"
-                fill="#17F179"
-                fill-opacity="1"
-              />
-            </g>
-            <g transform="matrix(0,1,-1,0,52,-22)">
-              <path
-                d="M61.3114,50.5847L56.491,45.7322C62.778400000000005,44.923500000000004,67.8084,39.8689,67.8084,33.8033C67.8084,27.9399,63.1976,22.88525,57.1198,21.87432L52.7186,17.62841L54.6048,17.62841C64.24549999999999,17.62841,72,24.9071,72,33.8033C72,39.8689,68.2276,45.3279,62.988,47.9563L62.988,52L61.3114,50.5847ZM56.7006,49.776C56.0719,49.776,55.2335,49.9781,54.3952,49.9781C44.75449,49.9781,37,42.6995,37,33.8033C37,27.7377,40.77246,22.27869,46.01198,19.650280000000002L46.01198,15L48.7365,17.62842L52.9281,21.67213C46.43114,22.27869,41.4012,27.5355,41.4012,33.8033C41.4012,39.8689,46.22156,44.923500000000004,52.509,45.7322L56.7006,49.776Z"
-                fill="#17F179"
-                fill-opacity="1"
-              />
-            </g>
-          </g>
-        </g>
-      </svg> -->
-      <!-- <svg
-        v-if="operatorStore.disinfectStatus == 1"
-        xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        fill="none"
-        version="1.1"
-        width="132"
-        height="52"
-        viewBox="0 0 132 52"
-      >
-        <g>
-          <g>
-            <g>
-              <g>
-                <path
-                  d="M26.04,27.36L26.04,34.68C26.04,38.44,24.84,43.48,16,46.44C17.12,47.28,18.4,48.84,19,49.8C28.92,46.04,30.52,39.96,30.52,34.72L30.52,27.36L26.04,27.36ZM28.96,43.8C31.2,45.76,34.32,48.48,35.76,50.2037L39.08,46.96C37.48,45.32,34.24,42.72,32.04,40.92L28.96,43.8ZM2.68,23.2C4.56,24.4,7,25.92,9.04,27.32L1.04,27.32L1.04,31.56L7,31.56L7,44.8C7,45.24,6.84,45.36,6.28,45.4C5.72,45.4,3.84,45.4,2.16,45.36C2.76,46.64,3.4,48.6,3.6,49.96C6.28,49.96,8.28,49.84,9.76,49.12C11.28,48.4,11.64,47.12,11.64,44.88L11.64,31.56L14.04,31.56C13.6,33.44,13.08,35.28,12.64,36.6L16.2,37.36C17.12,34.96,18.2,31.2,19.08,27.84L16.12,27.2L15.48,27.32L13.64,27.32L14.68,25.92C13.92,25.36,12.88,24.72,11.76,24C14,21.76,16.36,18.68,18.04,15.92L15.16,13.9187L14.32,14.16L2,14.16L2,18.32L11.32,18.32C10.4,19.64,9.36,20.96,8.36,21.96L5.2,20.12L2.68,23.2ZM19.52,21.08L19.52,40.4L23.96,40.4L23.96,25.36L32.6,25.36L32.6,40.24L37.28,40.24L37.28,21.08L30.16,21.08L31.12,18.2L38.84,18.2L38.84,14L18.24,14L18.24,18.2L26,18.2L25.52,21.08L19.52,21.08ZM57.08,42.0844C57.52,44.5687,57.84,47.8544,57.84,49.8175L62.56,49.1369C62.52,47.1731,62.04,44.0075,61.52,41.5637L57.08,42.0844ZM65.24,42.0044C66.12,44.4888,67.04,47.6944,67.28,49.6575L72.08,48.7356C71.76,46.7325,70.72,43.6069,69.72,41.2431L65.24,42.0044ZM73.4,41.9244C75.2,44.5287,77.32,48.055,78.16,50.2188L82.72,48.175C81.72,45.9712,79.48,42.565,77.64,40.1612L73.4,41.9244ZM50.24,40.4412C48.96,43.2463,46.92,46.4519,45.32,48.335L49.92,50.2188C51.56,47.9744,53.56,44.5687,54.84,41.6437L50.24,40.4412ZM65.64,12.3838L65.56,18L60.88,18L60.88,22.04L65.4,22.04C65.28,23.88,65.08,25.56,64.8,27.08L62.44,25.76L60.4,28.72L59.96,24.6L56,25.52L56,22.2L60.16,22.2L60.16,17.8L56,17.8L56,12.5444L51.6,12.5444L51.6,17.8L46.28,17.8L46.28,22.2L51.6,22.2L51.6,26.52L45.36,27.84L46.32,32.48L51.6,31.16L51.6,34.88C51.6,35.36,51.44,35.52,50.88,35.52C50.36,35.52,48.68,35.52,47.08,35.44C47.64,36.68,48.24,38.52,48.36,39.76C51.04,39.76,52.92,39.64,54.28,38.96C55.64,38.24,56,37.08,56,34.92L56,30.04L60.24,28.96L60.16,29.08L63.52,31.12C62.44,33.4,60.84,35.28,58.36,36.76C59.4,37.56,60.76,39.24,61.32,40.3212C64.16,38.56,66.08,36.36,67.36,33.64C68.88,34.68,70.24,35.64,71.16,36.48L73.56,32.64C72.4,31.72,70.68,30.6,68.8,29.44C69.36,27.24,69.68,24.76,69.84,22.04L73.56,22.04C73.36,32.84,73.4,39.6,78.52,39.6C81.52,39.6,82.76,38.16,83.2,33.24C82.12,32.92,80.52,32.2,79.64,31.44C79.52,34.28,79.28,35.48,78.72,35.48C77.48,35.48,77.64,29.12,78.08,18L70.04,18L70.16,12.3838L65.64,12.3838ZM105.36,12.4231L105.36,19.4L91.52,19.4L91.52,39.6838L96.32,39.6838L96.32,37.48L105.36,37.48L105.36,50.0187L110.44,50.0187L110.44,37.48L119.52,37.48L119.52,39.4831L124.56,39.4831L124.56,19.4L110.44,19.4L110.44,12.4231L105.36,12.4231ZM96.32,32.76L96.32,24.12L105.36,24.12L105.36,32.76L96.32,32.76ZM119.52,32.76L110.44,32.76L110.44,24.12L119.52,24.12L119.52,32.76Z"
-                  fill="#F74104"
-                  fill-opacity="1"
-                />
-              </g>
-            </g>
-          </g>
-        </g>
-      </svg> -->
-      <!-- <svg
-        v-if="operatorStore.disinfectStatus == 4"
-        xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-        fill="none"
-        version="1.1"
-        width="132"
-        height="52"
-        viewBox="0 0 132 52"
-      >
-        <g>
-          <g>
-            <g>
-              <path
-                d="M30.16,19.56C29.16,20.88,27.96,22.04,26.56,23.12C25.16,22.08,24,20.96,23.08,19.68L23.16,19.56L30.16,19.56ZM22.84,12.5056C21.2,15.5187,18.32,19,14.16,21.56C15.12,22.28,16.56,23.88,17.2,24.88C18.28,24.12,19.32,23.32,20.24,22.48C21.04,23.52,21.92,24.48,22.92,25.36C20.16,26.76,17,27.84,13.72,28.48C14.56,29.4,15.6,31.2,16.04,32.32C19.88,31.36,23.48,30,26.64,28.12C29.48,29.84,32.76,31.08,36.48,31.84C37.12,30.64,38.32,28.84,39.32,27.92C36.04,27.44,33.04,26.56,30.48,25.4C33.04,23.16,35.16,20.4,36.56,17.08L33.6,15.6394L32.84,15.84L26.08,15.84C26.6,15.0369,27.08,14.2331,27.56,13.43L22.84,12.5056ZM16.76,32.4L16.76,36.52L25.12,36.52L25.12,40.44L20.76,40.44L21.44,37.88L17.12,37.36C16.6,39.72,15.76,42.6,15.04,44.56L16.96,44.56L25.12,44.6006L25.12,50.0169L29.72,50.0169L29.72,44.6L37.96,44.6L37.96,40.44L29.72,40.44L29.72,36.52L37,36.52L37,32.4L29.72,32.4L29.72,30.12L25.12,30.12L25.12,32.4L16.76,32.4ZM2.6,14.04L2.6,49.8962L6.8,49.8962L6.8,18.32L10.12,18.32C9.36,20.96,8.4,24.2,7.48,26.6C10.12,29.44,10.8,32.04,10.8,33.96C10.84,35.16,10.6,36,10.04,36.36C9.72,36.6,9.28,36.72,8.8,36.72C8.28,36.72,7.64,36.72,6.84,36.64C7.52,37.8,7.88,39.6,7.92,40.76C8.92,40.8006,9.92,40.8006,10.72,40.68C11.68,40.52,12.44,40.28,13.12,39.8C14.44,38.84,15.04,37.04,15.04,34.48C15.04,32.08,14.48,29.28,11.68,26.08C12.96,23.04,14.44,19.04,15.6,15.64L12.44,13.8387L11.76,14.04L2.6,14.04ZM54.04,26.28L54.04,29.72L51.88,29.72L51.88,26.28L54.04,26.28ZM57.2,26.28L59.48,26.28L59.48,29.72L57.2,29.72L57.2,26.28ZM51.36,22.76C51.88,21.8,52.32,20.84,52.76,19.8L56.72,19.8C56.4,20.84,56,21.88,55.6,22.76L51.36,22.76ZM50.72,12.425C49.6,17.2,47.52,21.88,44.76,24.84C45.6,25.36,47.08,26.6,47.92,27.4L47.92,33.36C47.92,37.84,47.68,43.8,44.96,47.9625C45.92,48.405,47.68,49.4906,48.4,50.1744C50.12,47.6006,51,44.16,51.44,40.72L54.04,40.72L54.04,47.52L57.2,47.52L57.2,46.12C57.64,47.2,58,48.6,58.08,49.52C59.88,49.52,61.12,49.44,62.16,48.72C63.16,48.04,63.4,46.84,63.4,45.12L63.4,36.8C64.36,37.24,66,38.08,66.76,38.6C67.36,37.72,67.88,36.68,68.4,35.48L72.16,35.48L72.16,39.12L64.56,39.12L64.56,43.24L72.16,43.24L72.16,50.0175L76.72,50.0175L76.72,43.24L82.68,43.24L82.68,39.12L76.72,39.12L76.72,35.48L81.84,35.48L81.84,31.44L76.72,31.44L76.72,28.28L72.16,28.28L72.16,31.44L69.76,31.44C69.96,30.6,70.16,29.76,70.32,28.92L66.8,28.2C70.8,25.96,72.28,22.6,72.96,18.44L77.4,18.44C77.24,21.76,77.04,23.12,76.68,23.56C76.4,23.92,76.08,23.96,75.6,23.96C75.08,23.96,74,23.92,72.72,23.8C73.32,24.84,73.72,26.48,73.8,27.68C75.44,27.72,76.96,27.72,77.88,27.56C78.88,27.44,79.64,27.08,80.32,26.28C81.2,25.2,81.52,22.44,81.72,16.04C81.76,15.52,81.8,14.48,81.8,14.48L64.16,14.48L64.16,18.44L68.64,18.44C68.08,21.4,66.88,23.8,63.4,25.36L63.4,22.76L59.76,22.76C60.6,21.12,61.44,19.32,62,17.76L59.16,15.9994L58.52,16.16L54.12,16.16C54.44,15.2369,54.72,14.2725,54.96,13.3488L50.72,12.425ZM54.04,33.16L54.04,37.2L51.76,37.2C51.84,35.88,51.88,34.56,51.88,33.4L51.88,33.16L54.04,33.16ZM57.2,33.16L59.48,33.16L59.48,37.2L57.2,37.2L57.2,33.16ZM57.2,40.72L59.48,40.72L59.48,45.04C59.48,45.44,59.4,45.56,59.04,45.56L57.2,45.52L57.2,40.72ZM63.4,36.6L63.4,25.8C64.28,26.6006,65.16,27.8819,65.6,28.8025L66.4,28.4025C65.84,31.44,64.8,34.48,63.4,36.6ZM105.36,12.4231L105.36,19.4L91.52,19.4L91.52,39.6838L96.32,39.6838L96.32,37.48L105.36,37.48L105.36,50.0187L110.44,50.0187L110.44,37.48L119.52,37.48L119.52,39.4831L124.56,39.4831L124.56,19.4L110.44,19.4L110.44,12.4231L105.36,12.4231ZM96.32,32.76L96.32,24.12L105.36,24.12L105.36,32.76L96.32,32.76ZM119.52,32.76L110.44,32.76L110.44,24.12L119.52,24.12L119.52,32.76Z"
-                fill="#2485FF"
-                fill-opacity="1"
-              />
-            </g>
-          </g>
-        </g>
-      </svg> -->
       <div
         class="left_log_wrap"
         v-if="[1, 2, 3, 4].includes(operatorStore.disinfectStatus)"
@@ -119,7 +45,6 @@
       </div>
       <div
         class="btn"
-        v-if="[1, 2, 3, 4].includes(operatorStore.disinfectStatus)"
         @click="stopDisinfect"
       >
         结束消毒
@@ -776,6 +701,40 @@ const continueDisinfect = () => {
   //   webSocketStore.sendCommandMsg(continueDisinfectionJSON)
   // }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index 1ad3366..6eb16de 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -381,6 +381,8 @@ export const useWebSocketStore = defineStore({
               temp_2,
               temp_3,
               saturation_1,
+              saturation_2,
+              saturation_3,
               airCompressor,
               disinfectant_volume,
               heatingStrip,