From 7a7951325b74c0465dd175660de76e2a3c4b19dc Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Tue, 5 Sep 2023 10:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=86=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Operator.vue               | 42 +++++++++++++++++++++++++++++++
 src/components/PreSetting.vue             | 12 +++++++++
 src/components/dialogs/DisinfectModal.vue |  1 +
 src/store/modules/operator.js             | 10 ++++++++
 src/store/modules/user.js                 |  2 +-
 src/store/modules/websocket.js            |  5 ++++
 6 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/components/Operator.vue b/src/components/Operator.vue
index 0a5c387..72ff8e5 100644
--- a/src/components/Operator.vue
+++ b/src/components/Operator.vue
@@ -436,6 +436,22 @@
       v-if="disinfectWarnVisible"
       :hideDisinfectModal="hideDisinfectModal"
     />
+    <van-overlay :show="operatorStore.showStartReady" z-index="3">
+      <div class="wrapper" @click.stop>
+        <div class="block">
+          <van-loading />
+          <p class="shutdown_text">准备消毒中</p>
+        </div>
+      </div>
+    </van-overlay>
+    <van-overlay :show="operatorStore.showStopReady" z-index="3">
+      <div class="wrapper" @click.stop>
+        <div class="block">
+          <van-loading />
+          <p class="shutdown_text">结束消毒中</p>
+        </div>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
@@ -520,6 +536,7 @@ const startDisinfect = () => {
   // 改变开始消毒状态 如果已经开始则不可点击
   // 选择预设 而后开始消毒
   // preVisible.value = true
+  operatorStore.updateShowStartReady(true)
   realStart()
 }
 
@@ -769,4 +786,29 @@ onUnmounted(() => {
     }
   }
 }
+.wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
+.block {
+  width: 120px;
+  height: 120px;
+  display: flex;
+  flex-direction: column;
+  padding: 16px;
+  align-items: center;
+  justify-content: center;
+  .shutdown_text {
+    margin-top: 24px;
+    font-family: Source Han Sans CN;
+    font-size: 18px;
+    font-weight: normal;
+    line-height: normal;
+    letter-spacing: 0.06em;
+    color: #fff;
+    white-space: nowrap;
+  }
+}
 </style>
diff --git a/src/components/PreSetting.vue b/src/components/PreSetting.vue
index 1682cf9..68c9070 100644
--- a/src/components/PreSetting.vue
+++ b/src/components/PreSetting.vue
@@ -91,6 +91,12 @@
         />
       </p>
     </div>
+    <div class="row_wrap">
+      <p class="title">Log等级</p>
+      <div class="num">
+        <p class="log">6</p>
+      </div>
+    </div>
     <!-- <div class="row_wrap" v-if="operatorStore.disinfectStatus != 1">
       <p class="title">允许消毒最大湿度(%RH)</p>
       <p class="num">
@@ -727,6 +733,12 @@ const setSprayLiquidVal = () => {
       color: #000000;
       display: flex;
       align-items: center;
+      .log {
+        width: 182px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
     }
     .btn {
       width: 87px;
diff --git a/src/components/dialogs/DisinfectModal.vue b/src/components/dialogs/DisinfectModal.vue
index 855e3c0..0959fdd 100644
--- a/src/components/dialogs/DisinfectModal.vue
+++ b/src/components/dialogs/DisinfectModal.vue
@@ -47,6 +47,7 @@ const handleCancel = () => {
 
 const handleStart = () => {
   if ([1, 2].includes(operatorStore.disinfectStatus)) {
+    operatorStore.updateStopReady(true)
     webSocketStore.sendCommandMsg(stopDisinfectionJSON)
     props.hideDisinfectModal()
   }
diff --git a/src/store/modules/operator.js b/src/store/modules/operator.js
index 371fd18..9bdec5c 100644
--- a/src/store/modules/operator.js
+++ b/src/store/modules/operator.js
@@ -13,10 +13,20 @@ export const useOperatorStore = defineStore({
       // 是否预热
       preHeat: false,
       preHeatRaminTimeS: 0,
+      // 准备消毒loading
+      showStartReady: false,
+      // 结束消毒loading
+      showStopReady: false,
     }
   },
   // actions
   actions: {
+    updateStopReady(showStopReady) {
+      this.showStopReady = showStopReady
+    },
+    updateShowStartReady(showStartReady) {
+      this.showStartReady = showStartReady
+    },
     updatePreHeatRaminTimeS(preHeatRaminTimeS) {
       this.preHeatRaminTimeS = preHeatRaminTimeS
     },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d8c3244..0e2f444 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,7 +7,7 @@ export const useUserStore = defineStore({
       allUserList: [],
       operUser: '',
       loginUser: '',
-      loginUserPermission: 3,
+      loginUserPermission: 2,
     }
   },
   // actions
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index fe2ac0e..3a3d9ef 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -76,6 +76,11 @@ export const useWebSocketStore = defineStore({
               waterImmersionSensor1,
               waterImmersionSensor2,
             } = sensor_data
+            if (disinfectionWorkState != 0) {
+              operatorStore.updateShowStartReady(false)
+            } else {
+              operatorStore.updateStopReady(false)
+            }
             operatorStore.updateDrainingWorkState(drainingWorkState)
             operatorStore.updateReplenishingFluidsWorkState(
               replenishingFluidsWorkState,