From 5ad2e2ea4b9f7857ce4b394b120a3459cfe6ef80 Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Mon, 11 Sep 2023 00:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                |  8 +++---
 src/components/UpdatePreSetting.vue | 50 ++++++++++++++++++++++---------------
 src/pages/Home.vue                  |  6 ++---
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/.env b/.env
index fe3f0dd..c4ae906 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/UpdatePreSetting.vue b/src/components/UpdatePreSetting.vue
index d8624b0..ea8f599 100644
--- a/src/components/UpdatePreSetting.vue
+++ b/src/components/UpdatePreSetting.vue
@@ -1,19 +1,6 @@
 <template>
   <div class="update_device_container">
     <div class="row_wrap">
-      <p class="title">注射蠕动泵速率(g/min)</p>
-      <p class="num">
-        <van-field
-          type="number"
-          v-model="sprayLiquidConfigVal"
-          :clickable="true"
-          :formatter="formatter7"
-          readonly
-          @click.stop="hideClickKey(2)"
-        />
-      </p>
-    </div>
-    <div class="row_wrap">
       <p class="title">消毒停止过氧化氢浓度(ppm)</p>
       <p class="num">
         <van-field
@@ -91,6 +78,19 @@
         />
       </p>
     </div>
+    <div class="row_wrap">
+      <p class="title">注射蠕动泵速率(g/min)</p>
+      <p class="num">
+        <van-field
+          type="number"
+          v-model="sprayLiquidConfigVal"
+          :clickable="true"
+          :formatter="formatter7"
+          readonly
+          @click.stop="hideClickKey(2)"
+        />
+      </p>
+    </div>
     <div class="row_wrap" @click="showLogPicker">
       <p class="title">Log等级</p>
       <div class="num">
@@ -221,7 +221,11 @@
       <div class="btn ml" @click="hiddleSettingModal">返回</div>
     </div>
     <div class="key_wrap" v-show="showkeyboard" id="keyboard_formula">
-      <SimpleKeyboard @onChange="onChange" :input="formula_id" />
+      <SimpleKeyboard
+        @onKeyPress="onKeyPress"
+        @onChange="onChange"
+        :input="formula_id"
+      />
     </div>
   </div>
 </template>
@@ -277,13 +281,19 @@ const logVisible = ref(false)
 const logVal = ref(props.formulaInfo.loglevel)
 const formula_id = ref(props.formulaInfo.formula_id)
 
-watch(formula_id, (newValue, oldValue) => {
-  if (newValue != '') {
-    // webSocketStore.sendCommandMsg(
-    //   updateFormulaJSON('formula_id', newValue, props.formulaInfo.id),
-    // )
+// watch(formula_id, (newValue, oldValue) => {
+//   if (newValue != '') {
+//     // webSocketStore.sendCommandMsg(
+//     //   updateFormulaJSON('formula_id', newValue, props.formulaInfo.id),
+//     // )
+//   }
+// })
+
+const onKeyPress = button => {
+  if (button == '{bksp}') {
+    formula_id.value = formula_id.value.substr(0, formula_id.value.length - 1)
   }
-})
+}
 
 const save = () => {
   if (formula_id.value == '') {
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 756da1d..23c37ba 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -84,7 +84,7 @@
         "
         @click="changeTab(7)"
         v-if="
-          userStore.loginUserPermission != 3 &&
+          userStore.loginUserPermission <= 1 &&
           [0, 5].includes(operatorStore.disinfectStatus)
         "
       >
@@ -142,7 +142,7 @@
           activeTab == 5 ? 'tab_btn style-btn active_btn' : 'style-btn tab_btn'
         "
         v-if="
-          userStore.loginUserPermission != 3 ||
+          userStore.loginUserPermission <= 1 ||
           [1, 2, 3, 4].includes(operatorStore.disinfectStatus)
         "
         @click="changeTab(5)"
@@ -169,7 +169,7 @@
       </div>
       <div
         v-if="
-          userStore.loginUserPermission != 3 &&
+          userStore.loginUserPermission <= 1 &&
           [0, 5].includes(operatorStore.disinfectStatus)
         "
         :class="