From 19c95d55ba911318a5bb86d1901e1f4a06d8655b Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sun, 10 Sep 2023 18:06:23 +0800
Subject: [PATCH] now log

---
 src/components/LoginForm.vue   | 34 +++++++++++++++-------------------
 src/components/Progress.vue    |  9 +++++++--
 src/mock/command.js            |  3 +--
 src/store/modules/device.js    |  4 ++++
 src/store/modules/websocket.js |  4 ++--
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index eb4a4a7..c6cd431 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -96,26 +96,22 @@ const handleLogin = () => {
   tip.value = ''
   webSocketStore?.sendCommandMsg(loginJSON(username.value, password.value))
   // 前端自己校验
-  let flag = false
-  userStore.allUserList?.map(item => {
-    if (item.uid == username.value && password.value == item.passwd) {
-      // 登陆成功
-      flag = true
-      userStore.updatePermission(item.permission_level)
-      userStore.updateLoginUser(item.uid)
-      if (props.modal) {
-        props.changeTab(5)
-        props.hideLoginModal()
-        // 判断是否在消毒中，如果在消毒中，将TAB切换到设置
-      } else {
-        window.location.href = 'http://127.0.0.1/'
+  setTimeout(() => {
+    userStore.allUserList?.map(item => {
+      if (item.uid == username.value && password.value == item.passwd) {
+        // 登陆成功
+        userStore.updatePermission(item.permission_level)
+        userStore.updateLoginUser(item.uid)
+        if (props.modal) {
+          props.changeTab(5)
+          props.hideLoginModal()
+          // 判断是否在消毒中，如果在消毒中，将TAB切换到设置
+        } else {
+          window.location.href = 'http://127.0.0.1/'
+        }
       }
-      console.log(props.modal)
-    }
+    })
   })
-  if (!flag) {
-    // tip.value = '账号或密码错误'
-  }
 }
 </script>
 
@@ -150,7 +146,7 @@ const handleLogin = () => {
     border: none;
     outline: none;
     width: 253px;
-    height: 17px;
+    height: 20px;
     position: absolute;
     left: 120px;
     top: 142px;
diff --git a/src/components/Progress.vue b/src/components/Progress.vue
index 3e9fee5..0334955 100644
--- a/src/components/Progress.vue
+++ b/src/components/Progress.vue
@@ -85,9 +85,14 @@
           </g>
         </g>
       </svg>
-      <div class="left_log_wrap">
+      <div
+        class="left_log_wrap"
+        v-if="[1, 2, 3, 4].includes(operatorStore.disinfectStatus)"
+      >
         <p class="text">当前剩余</p>
-        <p class="val">{{ deviceStore.nowlog?.toFixed(2) || 0 }}log</p>
+        <p class="val">
+          {{ deviceStore.targetlog - (deviceStore.nowlog?.toFixed(2) || 0) }}log
+        </p>
       </div>
       <div
         class="btn"
diff --git a/src/mock/command.js b/src/mock/command.js
index 6501f34..eb7b9e4 100644
--- a/src/mock/command.js
+++ b/src/mock/command.js
@@ -286,8 +286,7 @@ export const updateSettingInRunInfectionJSON = (column, val) => {
   return {
     command: 'changeDisinfectionParameter',
     messageId: 'changeDisinfectionParameter',
-    column,
-    val,
+    [column]: val,
   }
 }
 
diff --git a/src/store/modules/device.js b/src/store/modules/device.js
index 5e5e16f..fe38683 100644
--- a/src/store/modules/device.js
+++ b/src/store/modules/device.js
@@ -29,10 +29,14 @@ export const useDeviceStore = defineStore({
       binSaturation: 0,
       // 剩余log
       nowlog: 0,
+      targetlog: 0,
     }
   },
   // actions
   actions: {
+    updateTargetLog(targetlog) {
+      this.targetlog = targetlog
+    },
     updateNowLog(nowlog) {
       this.nowlog = nowlog
     },
diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js
index ee33a14..308608f 100644
--- a/src/store/modules/websocket.js
+++ b/src/store/modules/websocket.js
@@ -86,8 +86,8 @@ export const useWebSocketStore = defineStore({
               sprinklerPumpRPM,
               sprinklerPumpGPM,
             } = sensor_data
-            const { nowlog } = disinfectionState || {}
-
+            const { nowlog, targetlog } = disinfectionState || {}
+            deviceStore.updateTargetLog(targetlog)
             deviceStore.updateNowLog(nowlog)
             if ([1, 2, 3, 4].includes(disinfectionWorkState)) {
               operatorStore.updateShowStartReady(false)