From 4f246e49cf2b7afd718affe83b85b44a32298a5c Mon Sep 17 00:00:00 2001
From: maochaoying <925670706@qq.com>
Date: Fri, 25 Aug 2023 11:36:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=AE=E7=9B=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                         |  8 +++---
 index.html                                   |  2 +-
 src/components/Setting/components/Device.vue | 40 ++++++++++++++++++++++------
 src/pages/Home.vue                           |  3 ++-
 4 files changed, 39 insertions(+), 14 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/index.html b/index.html
index 95784dc..6230fd9 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
     />
     <title>消毒机</title>
   </head>
diff --git a/src/components/Setting/components/Device.vue b/src/components/Setting/components/Device.vue
index 7feb188..68b221e 100644
--- a/src/components/Setting/components/Device.vue
+++ b/src/components/Setting/components/Device.vue
@@ -13,7 +13,6 @@
           @click.stop="hideClickKey(1)"
         />
       </p>
-      <div class="btn style-btn" @click="setAddliquidVal">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">喷液蠕动泵(/g)</p>
@@ -28,7 +27,6 @@
           @click.stop="hideClickKey(2)"
         />
       </p>
-      <div class="btn style-btn" @click="setSprayLiquidVal">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">消毒停止过氧化氢溶度(/ppm)</p>
@@ -43,7 +41,6 @@
           @click.stop="hideClickKey(3)"
         />
       </p>
-      <div class="btn style-btn" @click="setStopedGsVal">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">消毒继续过氧化氢溶度(/ppm)</p>
@@ -58,7 +55,6 @@
           @click.stop="hideClickKey(4)"
         />
       </p>
-      <div class="btn style-btn" @click="setcontinuedGsVal">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">消毒停止过氧化氢相对饱和度(%RS)</p>
@@ -73,7 +69,6 @@
           @click.stop="hideClickKey(5)"
         />
       </p>
-      <div class="btn style-btn" @click="setstopedSaturVal">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">消毒继续过氧化氢相对饱和度(%RS)</p>
@@ -88,7 +83,6 @@
           @click.stop="hideClickKey(6)"
         />
       </p>
-      <div class="btn style-btn" @click="setContinuedSaturVal">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">允许消毒最大湿度(%RH)</p>
@@ -103,7 +97,6 @@
           @click.stop="hideClickKey(7)"
         />
       </p>
-      <div class="btn style-btn" @click="setMaxHumidityVal">设置</div>
     </div>
     <div class="row_wrap">
       <p class="title">预热时间(s)</p>
@@ -117,52 +110,83 @@
           @click.stop="hideClickKey(8)"
         />
       </p>
-      <div class="btn style-btn" @click="setHeat_timeVal">设置</div>
     </div>
     <van-number-keyboard
       v-model="addLiquidConfigVal"
+      :title="addLiquidConfigVal"
       :show="addLiquidConfigValShow"
       :maxlength="4"
+      theme="custom"
+      close-button-text="配置"
+      @close="setAddliquidVal"
       @blur="addLiquidConfigValShow = false"
     />
     <van-number-keyboard
       v-model="sprayLiquidConfigVal"
+      :title="sprayLiquidConfigVal"
       :show="sprayLiquidConfigValShow"
       :maxlength="4"
+      theme="custom"
+      @close="setSprayLiquidVal"
+      close-button-text="配置"
       @blur="sprayLiquidConfigValShow = false"
     />
     <van-number-keyboard
       v-model="stoped_gs"
+      :title="stoped_gs"
       :show="stoped_gsShow"
       :maxlength="4"
+      theme="custom"
+      @close="setStopedGsVal"
+      close-button-text="配置"
       @blur="stoped_gsShow = false"
     />
     <van-number-keyboard
       v-model="continued_gs"
+      :title="continued_gs"
+      @close="setcontinuedGsVal"
       :show="continued_gsShow"
       :maxlength="4"
+      theme="custom"
+      close-button-text="配置"
       @blur="continued_gsShow = false"
     />
     <van-number-keyboard
       v-model="stoped_satur"
+      :title="stoped_satur"
+      @close="setstopedSaturVal"
       :show="stoped_saturShow"
       :maxlength="3"
+      theme="custom"
+      close-button-text="配置"
       @blur="stoped_saturShow = false"
     />
     <van-number-keyboard
       v-model="continued_satur"
+      :title="continued_satur"
+      @close="setContinuedSaturVal"
       :show="continued_saturShow"
       :maxlength="3"
+      theme="custom"
+      close-button-text="配置"
       @blur="continued_saturShow = false"
     />
     <van-number-keyboard
       v-model="max_humidity"
+      :title="max_humidity"
+      @close="setMaxHumidityVal"
       :show="max_humidityShow"
       :maxlength="3"
+      theme="custom"
+      close-button-text="配置"
       @blur="max_humidityShow = false"
     />
     <van-number-keyboard
+      theme="custom"
+      close-button-text="配置"
+      @close="setHeat_timeVal"
       v-model="pre_heat_time_s"
+      :title="pre_heat_time_s"
       :show="pre_heat_time_sShow"
       @blur="pre_heat_time_sShow = false"
     />
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index 4889146..c518565 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -152,7 +152,8 @@
     <LiquidHandle v-if="activeTab == 2" :tabType="1" />
     <LiquidHandle v-if="activeTab == 3" :tabType="2" />
     <Test v-if="activeTab == 4" />
-    <Setting v-if="activeTab == 5" />
+    <Setting />
+    <!-- <Setting v-if="activeTab == 5" /> -->
     <div class="other_info">
       <p>IP {{ settingStore.deviceIp }}</p>
       <p class="time">{{ nowTime }}</p>