From 4a1c6c25707c58c00c06aea4d23d7a0de41426ab Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Fri, 24 May 2024 15:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=AF=92=E5=BC=80=E5=A7=8B=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E7=94=A8=E6=B6=88=E6=AF=92=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=9C=80=E8=A6=81=E5=BC=B9=E6=A1=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E4=B8=8D=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=B6=88=E6=AF=92?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Operator.vue | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/components/Operator.vue b/src/components/Operator.vue
index 1744b0e..8ba426c 100644
--- a/src/components/Operator.vue
+++ b/src/components/Operator.vue
@@ -487,6 +487,7 @@ import { useOperatorStore, useWebSocketStore, useSettingStore } from '@/store'
 import { startDisinfectionJSON, getStateJSON } from '@/mock/command'
 import { showSuccessToast, showFailToast } from 'vant'
 import { time_To_hhmmss } from '@/utils'
+import MyModal from '../utils/MyModal'
 
 const operatorStore = useOperatorStore()
 const webSocketStore = useWebSocketStore()
@@ -570,20 +571,29 @@ const startDisinfect = () => {
   realStart()
 }
 
-const realStart = () => {
-  localStorage.setItem('logVal', logVal.value)
-  if (
-    operatorStore.disinfectStatus == 0 ||
-    operatorStore.disinfectStatus == 5
-  ) {
-    localStorage.removeItem('bin')
-    localStorage.removeItem('envir1')
-    localStorage.removeItem('envir2')
-    webSocketStore.sendCommandMsg(
-      startDisinfectionJSON(parseInt(logVal.value), parseInt(roomSize.value)),
-    )
-    props.changeShowOperator(false)
-  }
+// 开始消毒
+async function realStart() {
+    operatorStore.updateShowStartReady(true)
+    localStorage.setItem('logVal', logVal.value)
+    if ( operatorStore.disinfectStatus == 0 || operatorStore.disinfectStatus == 5 ) {
+        localStorage.removeItem('bin')
+        localStorage.removeItem('envir1')
+        localStorage.removeItem('envir2')
+
+        try {
+            await webSocketStore.call('startDisinfection', {
+                loglevel : parseInt(logVal.value),
+                roomVolume : parseInt(roomSize.value),
+            });
+        } catch ( e ) {
+            operatorStore.updateShowStartReady(false)
+            await MyModal.error(`无法开始消毒 : ${e.message || e}`);
+            return ;
+        }
+
+        operatorStore.updateShowStartReady(false)
+        props.changeShowOperator(false)
+    }
 }
 
 const showLogPicker = () => {