From e85561916e68d9989c83aeccbb5fd5d31035a454 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Tue, 22 Apr 2025 16:19:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleKeyboard.vue       |   3 +-
 src/pages/Index/Settings/Device.vue     | 162 +++++++++++++++++++++++++++-----
 src/pages/Login/index.vue               |   3 +-
 src/services/Index/settings/settings.ts |  31 +++++-
 4 files changed, 170 insertions(+), 29 deletions(-)

diff --git a/src/components/SimpleKeyboard.vue b/src/components/SimpleKeyboard.vue
index 9400a2d..038d23a 100644
--- a/src/components/SimpleKeyboard.vue
+++ b/src/components/SimpleKeyboard.vue
@@ -33,7 +33,8 @@ export default {
     }
     if(this.layout){
       keyParams.display = {
-        '{bksp}': "回退" // 设置删除键的显示字符
+        '{bksp}': "删除", // 设置删除键的显示字符
+        '{enter}': "回车" // 设置删除键的显示字符
       }
     }
     this.keyboard = new Keyboard(this.keyboardClass, keyParams)
diff --git a/src/pages/Index/Settings/Device.vue b/src/pages/Index/Settings/Device.vue
index 2fbdb91..6f507d1 100644
--- a/src/pages/Index/Settings/Device.vue
+++ b/src/pages/Index/Settings/Device.vue
@@ -24,20 +24,55 @@
         </button>
       </div>
     </div>
-    <div class="setting-item">
-      <span class="label">孵育温度</span>
-      <div class="options">
-        <button
-          v-for="t in temperatures"
-          :key="t"
-          :class="{ active: settings.temperature === t }"
-          @click="updateSetting('temperature', t)"
-        >
-          {{ t }}
-        </button>
+    <div class="setting-item-box">
+      <div class="setting-item setting-item-no-border">
+        <span class="label">整体温度控制</span>
+        <div class="options">
+          <input
+            style="width: 150px"
+            v-model="settings.allTemperature"
+            type="number"
+            @focus="showKeyboard('number', 1)"
+            readonly
+          />
+          <button @click="updateSetting('allTemperature', settings.allTemperature)">
+            设置
+          </button>
+        </div>
+      </div>
+      <div class="setting-item setting-item-no-border">
+        <span class="label">孵育盘温度</span>
+        <div class="options">
+          <input
+            style="width: 150px"
+            v-model="settings.incubateBoxTemperature"
+            type="number"
+            @focus="showKeyboard('number',2)"
+            readonly
+          />
+          <button @click="updateSetting('incubateBoxTemperature', settings.incubateBoxTemperature)">
+            设置
+          </button>
+        </div>
+      </div>
+      <div class="setting-item setting-item-no-border">
+        <span class="label">板夹区温度</span>
+        <div class="options">
+          <input
+            style="width: 150px"
+            v-model="settings.plateBoxTemperature"
+            type="number"
+            @focus="showKeyboard('number',3)"
+            readonly
+          />
+          <button @click="updateSetting('plateBoxTemperature', settings.plateBoxTemperature)">
+            设置
+          </button>
+        </div>
       </div>
     </div>
-    <div class="setting-item">
+
+    <div class="setting-item" style="border-radius: 0">
       <span class="label">DHCP</span>
       <div class="options">
         <button
@@ -65,7 +100,7 @@
           style="min-width: 250px"
           v-model="settings.localIp"
           type="text"
-          @focus="showKeyboard()"
+          @focus="showKeyboard(undefined, 4)"
           readonly
         />
         <button @click="updateSetting('localIP', settings.localIp)">
@@ -126,6 +161,7 @@
       <div class="keyboard" v-if="keyboardVisible">
         <SimpleKeyboard
           :input="currentInputValue"
+          :layout
           @onChange="handleKeyboardInput"
           @onKeyPress="handleKeyPress"
         />
@@ -142,20 +178,32 @@ import {
   setAutoPrint,
   setAutoLogout,
   getTemperatureRange,
-  setTemperature,
   setDHCP,
   setLocalIP,
-  setAutoLogoutTime,
-} from '../../../services/Index/settings/settings'
+  setAutoLogoutTime, setAllTemperature, setIncubateBoxTemperature, setPlateBoxTemperature
+} from '@/services'
 import { eMessage, isValidIPv4 } from '../utils'
 
+const layout = ref()
+
+const numericLayout = {
+  default: [
+    '1 2 3',
+    '4 5 6',
+    '7 8 9',
+    '{bksp} 0 {enter}' // 包含删除和确认键
+  ],
+}
+
 // 系统设置状态
 interface Settings {
   language: string
   autoPrint: boolean
   autoLogout: boolean
   autoLogoutTimeout: number
-  temperature: number
+  allTemperature: number | undefined
+  incubateBoxTemperature:number
+  plateBoxTemperature: number
   DHCP: boolean
   localIp: string
 }
@@ -165,7 +213,9 @@ const settings = ref<Settings>({
   autoPrint: true,
   autoLogout: false,
   autoLogoutTimeout: 10,
-  temperature: 0,
+  allTemperature: 20,
+  incubateBoxTemperature:20,
+  plateBoxTemperature: 20,
   DHCP: true,
   localIp: '',
 })
@@ -210,12 +260,21 @@ const fetchSettings = async () => {
     const res = await getSystemSettings()
     if (res.success) {
       settings.value = res.data
+      if (res.data.incubateBoxTemperature === res.data.plateBoxTemperature) {
+        settings.value.allTemperature = res.data.incubateBoxTemperature
+      }
     }
   } catch (error) {
     eMessage.error('获取系统设置失败')
   }
 }
 
+function isIntegerInRange(str: string): boolean {
+  // 匹配 20-40 的整数
+  const regex = /^(2[0-9]|3[0-9]|40)$/;
+  return regex.test(str);
+}
+
 // 更新设置
 const updateSetting = async (key: string, value: any) => {
   try {
@@ -233,8 +292,26 @@ const updateSetting = async (key: string, value: any) => {
       case 'autoLogoutTimeout':
         res = await setAutoLogoutTime(value)
         break
-      case 'temperature':
-        res = await setTemperature(value)
+      case 'allTemperature':
+        if (!isIntegerInRange(value)) {
+          eMessage.error('输入有误, 温度范围为20℃-40℃')
+          return
+        }
+        res = await setAllTemperature(value)
+        break
+      case 'incubateBoxTemperature':
+        if (!isIntegerInRange(value)) {
+          eMessage.error('输入有误, 温度范围为20℃-40℃')
+          return
+        }
+        res = await setIncubateBoxTemperature(value)
+        break
+      case 'plateBoxTemperature':
+        if (!isIntegerInRange(value)) {
+          eMessage.error('输入有误, 温度范围为20℃-40℃')
+          return
+        }
+        res = await setPlateBoxTemperature(value)
         break
       case 'DHCP':
         res = await setDHCP(value)
@@ -252,8 +329,18 @@ const updateSetting = async (key: string, value: any) => {
 
     if (res?.success) {
       settings.value = { ...settings.value, [key]: value }
+
+      if(key === 'allTemperature') {
+        settings.value.incubateBoxTemperature = settings.value.plateBoxTemperature = value
+      }
+      if(settings.value.incubateBoxTemperature === settings.value.plateBoxTemperature) {
+        settings.value.allTemperature = settings.value.incubateBoxTemperature
+      }else {
+        settings.value.allTemperature = undefined
+      }
     }
   } catch (error) {
+    console.log(error)
     eMessage.error('设置更新失败')
   }
 }
@@ -284,17 +371,36 @@ const keyboardVisible = ref(false)
 const currentInputValue = ref('')
 
 // 显示键盘
-const showKeyboard = () => {
+const showKeyboard = (KeyboardType: string | undefined, type: number) => {
+  inputNumberType.value = type
+  if (KeyboardType) {
+    layout.value = numericLayout
+  }else{
+    layout.value = undefined
+  }
+  keyboardVisible.value = false
+  setTimeout(() => {
+    keyboardVisible.value = true
+  }, 200)
   // 清空当前输入值，避免累加
-  currentInputValue.value = settings.value.localIp
-  keyboardVisible.value = true
+  currentInputValue.value = settings.value[inputType[type]]
+}
+
+const inputNumberType = ref(0)
+
+const inputType = {
+  1:'allTemperature',
+  2:'incubateBoxTemperature',
+  3:'plateBoxTemperature',
+  4:'localIp',
 }
 
 // 处理键盘输入
 const handleKeyboardInput = (value: string) => {
+
   // 更新当前输入值
   currentInputValue.value = value
-  settings.value.localIp = value
+  settings.value[inputType[inputNumberType.value]] = value
 }
 
 // 处理键盘按键
@@ -333,7 +439,15 @@ onUnmounted(() => {
   display: flex;
   flex-direction: column;
   gap: 20px;
+  .setting-item-box > :nth-child(2) {
+      border-top: 1px solid #ddd;
+      border-bottom: 1px solid #ddd;
+  }
 
+  .setting-item-no-border {
+    border-radius: 0 !important;
+    box-shadow: none !important;
+  }
   .setting-item {
     background-color: #fff;
     border-radius: 12px;
diff --git a/src/pages/Login/index.vue b/src/pages/Login/index.vue
index ace2b6f..0ccf0fd 100644
--- a/src/pages/Login/index.vue
+++ b/src/pages/Login/index.vue
@@ -96,7 +96,8 @@ const  next = () => {
 
 }
 const  back = () => {
-  showPassword.value = false
+  showPassword.value = false;
+  password.value = ''
 }
 
 const version = __APP_VERSION__
diff --git a/src/services/Index/settings/settings.ts b/src/services/Index/settings/settings.ts
index a655db1..3eabbc5 100644
--- a/src/services/Index/settings/settings.ts
+++ b/src/services/Index/settings/settings.ts
@@ -1,14 +1,39 @@
 import apiClient from '../../../utils/axios'
 
 // 设置设备温度
-export const setTemperature = async (data: any) => {
+export const setAllTemperature = async (data: any) => {
   try {
     const res = await apiClient.post(
-      `/api/v1/app/DeviceSetting/setTemperature?val=${data}`,
+      `/api/v1/app/DeviceSetting/setIncubateBoxTemperature?val=${data}`,
+    )
+    await apiClient.post(
+      `/api/v1/app/DeviceSetting/setPlateBoxTemperature?val=${data}`,
+    )
+    return res.data
+  } catch (error) {
+    console.log('修改温度出错', error)
+  }
+}
+
+export const setIncubateBoxTemperature = async (data: any) => {
+  try {
+    const res = await apiClient.post(
+      `/api/v1/app/DeviceSetting/setIncubateBoxTemperature?val=${data}`,
+    )
+    return res.data
+  } catch (error) {
+    console.log('修改温度出错', error)
+  }
+}
+
+export const setPlateBoxTemperature = async (data: any) => {
+  try {
+    const res = await apiClient.post(
+      `/api/v1/app/DeviceSetting/setPlateBoxTemperature?val=${data}`,
     )
     return res.data
   } catch (error) {
-    console.log('修改设备温度出错', error)
+    console.log('修改温度出错', error)
   }
 }