From a0a56726097ad2e88ab1a7058d8a70cfe944b9e4 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Sun, 10 Sep 2023 23:48:52 +0800
Subject: [PATCH] finish

---
 .env                                       | 8 ++++----
 src/components/Formula.vue                 | 4 ++++
 src/components/Progress.vue                | 6 +++---
 src/components/Setting/components/User.vue | 4 ++--
 src/components/dialogs/PermissionModal.vue | 4 ++--
 src/pages/Home.vue                         | 6 +++++-
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index c4ae906..fe3f0dd 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,5 @@
-# VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
-# VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
+VITE_BASE_WS1_URL=ws://192.168.8.10:19001/
+VITE_BASE_WS2_URL=ws://192.168.8.10:19002/
 
-VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
-VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
+# VITE_BASE_WS1_URL=ws://127.0.0.1:19001/
+# VITE_BASE_WS2_URL=ws://127.0.0.1:19002/
\ No newline at end of file
diff --git a/src/components/Formula.vue b/src/components/Formula.vue
index d10526a..f0ee9ec 100644
--- a/src/components/Formula.vue
+++ b/src/components/Formula.vue
@@ -170,6 +170,10 @@ const runConfig = item => {
   formulaStore.updateCurrentFormula(item)
   webSocketStore.sendCommandMsg(startFormulaJSON(item.id))
   props.changeTab(1)
+  // 清空localstorage
+  localStorage.removeItem('bin')
+  localStorage.removeItem('envir1')
+  localStorage.removeItem('envir2')
   props.changeShowOperator(false)
 }
 
diff --git a/src/components/Progress.vue b/src/components/Progress.vue
index 908bf69..7991d0c 100644
--- a/src/components/Progress.vue
+++ b/src/components/Progress.vue
@@ -96,9 +96,9 @@
         <p class="text">当前剩余</p>
         <p class="val">
           {{
-            Math.abs(
-              (deviceStore.targetlog - (deviceStore.nowlog || 0)).toFixed(2),
-            )
+            (deviceStore.targetlog - (deviceStore.nowlog || 0)).toFixed(2) < 0
+              ? 0
+              : (deviceStore.targetlog - (deviceStore.nowlog || 0)).toFixed(2)
           }}log
         </p>
       </div>
diff --git a/src/components/Setting/components/User.vue b/src/components/Setting/components/User.vue
index a5acf8c..f052542 100644
--- a/src/components/Setting/components/User.vue
+++ b/src/components/Setting/components/User.vue
@@ -96,9 +96,9 @@
             {{
               `${item.uid}(${
                 item.permission_level == 1
-                  ? '维护员'
-                  : item.permission_level == 2
                   ? '管理员'
+                  : item.permission_level == 2
+                  ? '维护员'
                   : '用户'
               })`
             }}
diff --git a/src/components/dialogs/PermissionModal.vue b/src/components/dialogs/PermissionModal.vue
index b15369e..2671636 100644
--- a/src/components/dialogs/PermissionModal.vue
+++ b/src/components/dialogs/PermissionModal.vue
@@ -50,8 +50,8 @@ const props = defineProps({
 })
 
 const columns = ref([
-  { text: '维护员', value: '1' },
-  { text: '管理员', value: '2' },
+  { text: '管理员', value: '1' },
+  { text: '维护员', value: '2' },
   { text: '用户', value: '3' },
 ])
 
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index e6860ad..756da1d 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -269,7 +269,11 @@
           <p class="ml time_txt">{{ moment(nowTime).format('HH:mm:ss') }}</p>
         </div>
       </div>
-      <div class="log_out_btn style-btn" @click="handleLogout">
+      <div
+        v-if="[0, 5].includes(operatorStore.disinfectStatus)"
+        class="log_out_btn style-btn"
+        @click="handleLogout"
+      >
         <svg
           xmlns="http://www.w3.org/2000/svg"
           xmlns:xlink="http://www.w3.org/1999/xlink"