From fc0805085d90a9592252956b7251a2e03f8f9af9 Mon Sep 17 00:00:00 2001 From: maochaoying <925670706@qq.com> Date: Thu, 24 Aug 2023 14:24:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/LiquidHandle.vue | 16 ++++++++++++---- src/components/LoginForm.vue | 2 +- src/components/Operator.vue | 4 +++- src/components/Setting/components/Admin.vue | 2 +- src/components/Setting/components/Date.vue | 4 ++-- src/components/Setting/components/Device.vue | 16 ++++++++-------- src/components/Setting/components/User.vue | 15 +++++++++------ src/components/Setting/index.vue | 8 ++++---- src/components/dialogs/DatePicker.vue | 4 ++-- src/components/dialogs/LiquidModal.vue | 4 ++-- src/components/dialogs/LogPicker.vue | 2 +- src/components/dialogs/TimePicker.vue | 4 ++-- src/components/dialogs/UserModal.vue | 4 ++-- src/components/dialogs/WarnModal.vue | 4 ++-- src/pages/Home.vue | 22 ++++++++++++++++------ src/style.scss | 23 +++++++++++++++++++++++ 16 files changed, 90 insertions(+), 44 deletions(-) diff --git a/src/components/LiquidHandle.vue b/src/components/LiquidHandle.vue index a6bc859..22ded7d 100644 --- a/src/components/LiquidHandle.vue +++ b/src/components/LiquidHandle.vue @@ -16,7 +16,7 @@
停止排液
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue index 04b2695..6fb6288 100644 --- a/src/components/LoginForm.vue +++ b/src/components/LoginForm.vue @@ -17,7 +17,7 @@ id="txtPassword" placeholder="请输入设备密码" /> - +
diff --git a/src/components/Operator.vue b/src/components/Operator.vue index b9aa356..7c4d15f 100644 --- a/src/components/Operator.vue +++ b/src/components/Operator.vue @@ -49,7 +49,7 @@ :class=" [1, 2].includes(operatorStore.disinfectStatus) ? 'start cant' - : 'start' + : 'start style-btn' " @click="startDisinfect" > @@ -312,6 +312,8 @@ onUnmounted(() => { font-weight: normal; letter-spacing: 0.1em; color: #ffffff; + position: relative; + overflow: hidden; } .cant { background: #f4f4f4; diff --git a/src/components/Setting/components/Admin.vue b/src/components/Setting/components/Admin.vue index 481d860..1a6a0e8 100644 --- a/src/components/Setting/components/Admin.vue +++ b/src/components/Setting/components/Admin.vue @@ -62,7 +62,7 @@

{{ updateTip }}

-
修改
+
修改

当前日期

{{ settingStore.currentDate.join('-') }}

-
设置
+
设置

当前时间

{{ settingStore.currentTime.join(':') }}

-
设置
+
设置
diff --git a/src/components/Setting/components/Device.vue b/src/components/Setting/components/Device.vue index 65fabe3..7584a40 100644 --- a/src/components/Setting/components/Device.vue +++ b/src/components/Setting/components/Device.vue @@ -13,7 +13,7 @@ @touchstart.stop="hideClickKey(1)" />

-
设置
+
设置

喷液蠕动泵(/g)

@@ -28,7 +28,7 @@ @touchstart.stop="hideClickKey(2)" />

-
设置
+
设置

消毒停止过氧化氢溶度(/ppm)

@@ -43,7 +43,7 @@ @touchstart.stop="hideClickKey(3)" />

-
设置
+
设置

消毒继续过氧化氢溶度(/ppm)

@@ -58,7 +58,7 @@ @touchstart.stop="hideClickKey(4)" />

-
设置
+
设置

消毒停止过氧化氢相对饱和度(%RS)

@@ -73,7 +73,7 @@ @touchstart.stop="hideClickKey(5)" />

-
设置
+
设置

消毒继续过氧化氢相对饱和度(%RS)

@@ -88,7 +88,7 @@ @touchstart.stop="hideClickKey(6)" />

-
设置
+
设置

允许消毒最大湿度(%RH)

@@ -103,7 +103,7 @@ @touchstart.stop="hideClickKey(7)" />

-
设置
+
设置

预热时间(s)

@@ -117,7 +117,7 @@ @touchstart.stop="hideClickKey(8)" />

-
设置
+
设置
*用户名限制信息

-
返回
-
添加
+
返回
+
添加
@@ -84,23 +84,26 @@ >

{{ item.uid }}

-
+
删除用户
设为管理员
-
+
修改密码
-
新增用户
+
新增用户

设备参数配置

-
配置
+
配置

修改管理员密码

-
修改
+
修改

用户管理

-
管理
+
管理

日期/时间设置

-
配置
+
配置
diff --git a/src/components/dialogs/DatePicker.vue b/src/components/dialogs/DatePicker.vue index 25cc0f7..ee812a8 100644 --- a/src/components/dialogs/DatePicker.vue +++ b/src/components/dialogs/DatePicker.vue @@ -40,8 +40,8 @@ />
-
取消
-
确定
+
取消
+
确定
diff --git a/src/components/dialogs/LiquidModal.vue b/src/components/dialogs/LiquidModal.vue index 1d0c904..5e907ef 100644 --- a/src/components/dialogs/LiquidModal.vue +++ b/src/components/dialogs/LiquidModal.vue @@ -25,8 +25,8 @@ 并确认容器是否大于排出液体容积

-
确定
-
取消
+
确定
+
取消
diff --git a/src/components/dialogs/LogPicker.vue b/src/components/dialogs/LogPicker.vue index 0564fce..806c65b 100644 --- a/src/components/dialogs/LogPicker.vue +++ b/src/components/dialogs/LogPicker.vue @@ -11,7 +11,7 @@ v-model="selectedValues" /> -
确定
+
确定
diff --git a/src/components/dialogs/TimePicker.vue b/src/components/dialogs/TimePicker.vue index 5093e57..7357121 100644 --- a/src/components/dialogs/TimePicker.vue +++ b/src/components/dialogs/TimePicker.vue @@ -39,8 +39,8 @@ />
-
取消
-
确定
+
取消
+
确定
diff --git a/src/components/dialogs/UserModal.vue b/src/components/dialogs/UserModal.vue index 044830f..6dc358b 100644 --- a/src/components/dialogs/UserModal.vue +++ b/src/components/dialogs/UserModal.vue @@ -22,8 +22,8 @@ 请确认是否将 {{ userWarnInfo }}

-
确定
-
取消
+
确定
+
取消
diff --git a/src/components/dialogs/WarnModal.vue b/src/components/dialogs/WarnModal.vue index ab1244e..12c69d4 100644 --- a/src/components/dialogs/WarnModal.vue +++ b/src/components/dialogs/WarnModal.vue @@ -23,8 +23,8 @@

203

-
确定
-
忽略
+
确定
+
忽略
diff --git a/src/pages/Home.vue b/src/pages/Home.vue index 583c01c..4889146 100644 --- a/src/pages/Home.vue +++ b/src/pages/Home.vue @@ -2,7 +2,9 @@
消毒

@@ -49,7 +53,9 @@

加液

@@ -73,7 +79,9 @@

排液

测试

IP {{ settingStore.deviceIp }}

{{ nowTime }}

-
+