优化网络断开

src/apis/system.ts

@@ -1,13 +1,19 @@
+import { useSystemStore } from '@/stores/systemStore'
 import { createWebSocket } from 'libs/socket'
+import { nanoid } from 'nanoid'
 
 const wsClient = createWebSocket()
-export async function sendCmd(resParams: { className: string, fnName: string, params: Record<string, any> }) {
+
+export async function sendCmd(resParams: System.SendCmdParams) {
+  const { className, fnName, params = {} } = resParams
+  const systemStore = useSystemStore()
+  systemStore.updateConnected(wsClient.isConnected.value)
   const res = await wsClient.waitAndSend({
     messageType: 'Command',
-    fnName: resParams.fnName,
-    className: resParams.className,
-    messageId: `msg_${Date.now()}`,
-    params: resParams.params,
+    fnName,
+    className,
+    messageId: `msg_${nanoid()}`,
+    params,
   })
   if (res.ackcode === 0) {
     return res.rely
@@ -16,16 +22,20 @@ export async function sendCmd(resParams: { className: string, fnName: string, pa
     throw new Error(res.message)
   }
 }
-export async function syncSendCmd(resParams: { className: string, fnName: string, params: Record<string, any> }) {
+export async function syncSendCmd(resParams: System.SendCmdParams) {
+  const { className, fnName, params = {} } = resParams
+  const systemStore = useSystemStore()
+  systemStore.updateConnected(wsClient.isConnected.value)
   return await wsClient.sendRequest({
     messageType: 'Command',
-    fnName: resParams.fnName,
-    className: resParams.className,
-    messageId: `msg_${Date.now()}`,
-    params: resParams.params,
+    fnName,
+    className,
+    messageId: `msg_${nanoid()}`,
+    params,
   })
 }
 
+// 业务状态订阅
 export async function subscribeEvent(fromFn: string | '*', callback: (response: Socket.WebSocketResponse) => void) {
   wsClient.socket.addEventListener('message', (event) => {
     const data = JSON.parse(event.data)

src/app.vue

@@ -6,19 +6,38 @@ import { useLiquidStore } from 'stores/liquidStore'
 import { onBeforeMount, ref } from 'vue'
 import { useFormulaStore } from './stores/formulaStore'
 
+/**
+ * 应用初始化组件
+ * @description 负责系统初始化流程控制，包括设备信息获取、数据同步及进度展示
+ */
+
+// 状态管理
 const deviceStore = useDeviceStore()
 const homeStore = useHomeStore()
 const formulaStore = useFormulaStore()
 const liquidStore = useLiquidStore()
+
+// 组件状态
+const progress = ref(0) // 初始化进度百分比
+const version = __APP_VERSION__ // 应用版本号
+let timer: any = null // 进度条定时器
+
+/**
+ * @hook 生命周期钩子 - 组件挂载前执行
+ * @description 启动初始化流程和数据轮询
+ */
 onBeforeMount(async () => {
-  // 过渡页面加载进度
-  startProgress()
-  // 环境(探头)数据需要轮询获取，没有上报的事件
-  setInterval(async () => {
-    await readH2o2Data()
-  }, 2000)
+  startProgress() // 启动进度条
+  // 环境数据轮询（每2秒获取一次）
+  // setInterval(async () => {
+  //   await readH2o2Data()
+  // }, 3000)
 })
 
+/**
+ * @function 初始化设备信息
+ * @desc 从服务端获取设备信息并更新到状态存储
+ */
 const initDeviceInfo = async () => {
   const deviceParams = {
     className: 'DeviceInfoMgrService',
@@ -30,82 +49,91 @@ const initDeviceInfo = async () => {
   return res
 }
 
+/**
+ * @function 获取默认配方数据
+ * @desc 从服务端获取所有配置信息并更新配方配置
+ */
 const getFormualDefaultData = async () => {
-  const defaultParams = {
-    className: 'SettingMgrService',
-    fnName: 'getAllSetting',
-    params: {},
-  }
-  const res = await sendCmd(defaultParams)
-  formulaStore.updateFormulaConfigData(res)
+  formulaStore.getFormualDefaultData()
 }
 
-const progress = ref(0)
-let timer: any = null
-const version = __APP_VERSION__
-
+/**
+ * @function 启动初始化进度条
+ * @desc 模拟初始化进度，同步加载各项数据
+ */
 const startProgress = () => {
   timer = setInterval(async () => {
-    const randomStep = Math.floor(Math.random() * 9 + 1)
+    // 生成随机进度增长（1-9%）
+    const randomStep = Math.floor((Math.random() * 9) + 1)
     progress.value = Math.min(progress.value + randomStep, 100)
+
+    // 初始化数据流程
     await initData()
-    // 获取设备信息
     await initLiquidConfig()
     await initDeviceInfo()
-    // 获取默认配方数据
     await getFormualDefaultData()
+
+    // 进度完成后清除定时器
     if (progress.value >= 100) {
       clearInterval(timer)
     }
   }, 100)
 }
 
-const readH2o2Data = async () => {
-  const envParams = {
-    fnName: 'readH2O2SensorData',
-    className: 'FrontEndRealtimeDisplayContentMgr',
-    params: {},
-  }
-  const resData = await sendCmd(envParams)
-  if (resData.val.length) {
-    homeStore.updateHomeData(resData.val)
-  }
-}
+/**
+ * @function 读取过氧化氢传感器数据
+ * @desc 轮询获取环境传感器数据并更新到主页状态
+ */
+// const readH2o2Data = async () => {
+//   const envParams = {
+//     fnName: 'readH2O2SensorData',
+//     className: 'FrontEndRealtimeDisplayContentMgr',
+//     params: {},
+//   }
+//   const resData = await sendCmd(envParams)
+//   if (resData.val.length) {
+//     homeStore.updateHomeData(resData.val)
+//   }
+// }
+
+/**
+ * @function 初始化核心数据
+ * @desc 同步获取消毒状态、液体余量和设备状态数据
+ */
 const initData = async () => {
-  // 获取消毒时状态
+  // 获取消毒状态
   const disinfectionParams = {
     className: 'DisinfectionCtrlServiceExt',
     fnName: 'getState',
-    params: {},
   }
   const disinfectionData = await sendCmd(disinfectionParams)
   homeStore.updateHomeDisinfectionState(disinfectionData)
 
-  // 消毒液当前使用余量
+  // 获取液体余量
   const liquidParams = {
     fnName: 'getState',
     className: 'AddLiquidService',
-    params: {},
   }
   const liquidData = await sendCmd(liquidParams)
   liquidStore.updateLiquidState(liquidData)
 
+  // 获取设备状态
   const deviceParams = {
     className: 'AppCore',
-    fnName: 'getState',
-    params: {},
+    fnName: 'startStateReport',
   }
-  // 当前设备状态
-  const deviceData = await sendCmd(deviceParams)
-  homeStore.setDeviceState(deviceData)
+  await sendCmd(deviceParams)
+  // deviceStore.setDeviceState(deviceData)
 }
 
-// 消毒液最大量
+/**
+ * @function 初始化液体配置
+ * @desc 获取液体最大容量和更新周期配置
+ */
 const initLiquidConfig = async () => {
   const params = {
     className: 'AddLiquidService',
     fnName: 'getServiceConfig',
-    params: {},
   }
   const liquidConfig = await sendCmd(params)
   liquidStore.initLiquidConfig(liquidConfig)

src/components/formula/FormulaConfig.vue

@@ -1,30 +1,81 @@
 <script lang="ts" setup>
 import { FtMessage } from '@/libs/message'
-import { convertValuesToString } from '@/libs/utils'
+import { compareJSON, convertValuesToInt, convertValuesToString } from '@/libs/utils'
 import { useFormulaStore } from '@/stores/formulaStore'
-import { syncSendCmd } from 'apis/system'
+import { sendCmd, syncSendCmd } from 'apis/system'
 import SelectModal from 'components/common/SelectModal/index.vue'
 import SoftKeyboard from 'components/common/SoftKeyboard/index.vue'
 import { formulaNameMap } from 'libs/constant'
 import { cloneDeep } from 'lodash'
 import { inject, onMounted, ref, watch, watchEffect } from 'vue'
 
+/**
+ * 配方表单组件 - 用于配置和管理各种配方参数
+ * 支持三种模式：主页模式(home)、设置模式(setting)和配方管理模式(formula)
+ * @component
+ * @props {string} type - 组件使用模式，可选值：'home' | 'setting' | 'formula'
+ */
+
 const props = defineProps<{
   type: string
 }>()
 
 const formulaStore = useFormulaStore()
+
+/**
+ * 当前表单数据
+ * 不同模式下有不同的初始值：
+ * - home: 当前选中的配方
+ * - setting: 默认配方信息
+ * - formula: 当前选中的配方或默认配方
+ */
 const formData = ref<Record<string, any>>({
   ...formulaStore.defaultFormulaInfo,
 })
+
+/**
+ * 软键盘当前输入值
+ */
 const inputValue = ref<string>('')
+
+/**
+ * 软键盘是否可见
+ */
 const keyboardVisible = ref(false)
+
+/**
+ * 软键盘类型：'text' 或 'number'
+ */
 const keyboardType = ref<'text' | 'number'>('number')
+
+/**
+ * 软键盘组件引用
+ */
 const softKeyboardRef = ref()
+
+/**
+ * 当前聚焦的输入字段名称
+ */
 const focusedInput = ref<string | null>(null)
+
+/**
+ * 注册孙子组件方法的注入函数
+ */
 const registerGrandsonMethods = inject<(methods: any) => void>('registerGrandsonMethods', () => {})
+
+/**
+ * 配方配置列表
+ */
 const formulaConfigList = ref(formulaStore.formulaConfigList)
+
+/**
+ * 日志级别选项列表
+ */
 const options = ref(formulaStore.logLevelOptions)
+
+/**
+ * 标签单位映射表，用于显示各参数的单位
+ */
 const labelUnitMap: Record<string, any> = {
   injection_pump_speed: 'g/min',
   continued_gs: 'ppm',
@@ -35,30 +86,54 @@ const labelUnitMap: Record<string, any> = {
   stoped_satur: '%RS',
   loglevel: 'Log',
 }
+
+/**
+ * 组件挂载时注册方法供父组件调用
+ */
 onMounted(() => {
   registerGrandsonMethods && registerGrandsonMethods({ getFormData })
 })
 
+/**
+ * 模态框选中的值
+ */
 const selectedValue = ref()
+
+/**
+ * 模态框是否打开
+ */
 const isModalOpen = ref(false)
+
+/**
+ * 打开模态框
+ */
 const openModal = () => {
   isModalOpen.value = true
 }
 
+/**
+ * 监听配方配置列表和表单数据变化
+ * 根据不同的type属性值初始化表单数据
+ */
 watchEffect(() => {
   formulaConfigList.value = formulaStore.formulaConfigList
   if (props.type === 'home') {
     formData.value = cloneDeep(formulaStore.selectedFormulaInfo) || cloneDeep(formulaStore.defaultFormulaInfo)
   }
   else if (props.type === 'setting') {
-    formData.value = formulaStore.defaultFormulaInfo
+    formData.value = cloneDeep(formulaStore.defaultFormulaInfo)
   }
   else {
     formData.value = cloneDeep(formulaStore.currentSelectedFormulaInfo) || cloneDeep(formulaStore.defaultFormulaInfo)
   }
+  // 后端给的数据类型是字符串型，前端需要的是int型，后端开发说后端不好转换，由前端进行转换
+  formData.value = convertValuesToInt(formData.value)
 })
 
-// 监听软键盘输入
+/**
+ * 监听软键盘输入值变化，更新表单数据
+ * @param {string | number} newVal - 新的输入值
+ */
 watch(inputValue, (newVal: string | number) => {
   if (focusedInput.value) {
     if (focusedInput.value !== 'name') {
@@ -68,56 +143,139 @@ watch(inputValue, (newVal: string | number) => {
   }
 })
 
-// 父组件消毒配置用到这个函数获取当前form表单数据
+/**
+ * 获取当前表单数据，将值转换为字符串格式
+ * @returns {Record<string, string>} 转换后的表单数据
+ */
 const getFormData = () => {
   return convertValuesToString(formData.value, 'name')
 }
 
-// 表单数据变化为最大值时，最新值重新给软键盘组件
+/**
+ * 监听表单数据变化，同步更新软键盘输入值
+ * @param {Record<string, any>} newValue - 新的表单数据
+ */
 watch(formData, (newValue) => {
   if (focusedInput.value) {
     inputValue.value = newValue[focusedInput.value].toString()
   }
 }, { deep: true })
 
-// 编辑
+/**
+ * 处理表单提交
+ * 根据不同的type属性值执行不同的保存逻辑
+ */
 const handleSubmit = () => {
-  if (!formData.value.name) {
+  if (props.type !== 'setting' && !formData.value.name) {
     FtMessage.warning('请输入配方名称')
     return
   }
-  if (formData.value.formula_id) {
-    const formulaForm: Record<string, string> = convertValuesToString(formData.value, 'name')
-    const editParams = {
-      className: 'SettingMgrService',
-      fnName: 'updateFormula',
-      params: {
-        formula_id: formData.value.formula_id,
-        formula: cloneDeep(formulaForm),
-      },
+
+  // 配方管理的【确定】
+  if (props.type === 'formula') {
+    onSaveFormula()
   }
-    syncSendCmd(editParams).then(() => {
-      FtMessage.success('操作成功')
-      formulaStore.initFormulaList()
-      // getFormualDefaultData()
-    })
+
+  // 设置中的【确定】
+  if (props.type === 'setting') {
+    onSaveSetting()
+  }
+}
+
+/**
+ * 保存配方
+ * 根据是否有formula_id决定是添加新配方还是编辑已有配方
+ */
+const onSaveFormula = () => {
+  console.log('formData.value.formula_id---', formData.value.formula_id)
+  if (formData.value.formula_id) {
+    const formulaForm: Record<string, any> = convertValuesToString(formData.value, 'name')
+    onEditFormula(formulaForm.formula_id, formulaForm as Formula.FormulaItem)
   }
   else {
     onAddFormula()
   }
 }
 
+/**
+ * 保存设置
+ * 比较当前表单数据与默认配方数据的差异，只更新有变化的字段
+ */
+const onSaveSetting = async () => {
+  // 修改默认值
+  const diff = compareJSON(formulaStore.defaultFormulaInfo, formData.value)
+  const diffKeys = Object.keys(diff)
+  if (diffKeys.length) {
+    await Promise.all(diffKeys.map(async (key) => {
+      await setSettingFormulaConfig(key, diff[key].newVal)
+    }))
+    FtMessage.success('配方修改成功')
+  }
+}
+
+/**
+ * 设置配方配置项值
+ * @param {string} settingName - 设置名称
+ * @param {string} settingVal - 设置值
+ * @returns {Promise<void>}
+ */
+const setSettingFormulaConfig = async (settingName: string, settingVal: string) => {
+  await sendCmd({
+    className: 'SettingMgrService',
+    fnName: 'setSettingVal',
+    params: {
+      settingName,
+      settingVal: settingVal.toString(),
+    },
+  })
+  formulaStore.getFormualDefaultData()
+}
+
+/**
+ * 添加新配方
+ * 先调用API创建新配方，然后更新配方数据
+ */
 const onAddFormula = () => {
   const params = {
     className: 'SettingMgrService',
     fnName: 'addNewFormula',
-    params: {},
   }
-  syncSendCmd(params).then(() => {
+  syncSendCmd(params).then((res) => {
+    if (res.ackcode === 0) {
+      const item = res.rely
+      const formulaForm: Record<string, any> = convertValuesToString(formData.value, 'name')
+      formulaForm.name = item.name
+      formulaForm.formula_id = item.formula_id
+      onEditFormula(item.formula_id, formulaForm as Formula.FormulaItem)
+    }
+  })
+}
+
+/**
+ * 编辑配方
+ * @param {string} formula_id - 配方ID
+ * @param {Formula.FormulaItem} formulaForm - 配方表单数据
+ */
+const onEditFormula = (formula_id: string, formulaForm: Formula.FormulaItem) => {
+  const editParams = {
+    className: 'SettingMgrService',
+    fnName: 'updateFormula',
+    params: {
+      formula_id,
+      formula: cloneDeep(formulaForm),
+    },
+  }
+  syncSendCmd(editParams).then(() => {
+    FtMessage.success('操作成功')
     formulaStore.initFormulaList()
+    formData.value = formulaForm
   })
 }
 
+/**
+ * 打开软键盘
+ * @param {Event} e - 事件对象
+ */
 const openKeyboard = (e: any) => {
   setTimeout(() => {
     keyboardVisible.value = true
@@ -129,23 +287,53 @@ const openKeyboard = (e: any) => {
   }, 100)
 }
 
+/**
+ * 取消操作，重置配方数据
+ */
 const handleCancel = () => {
   formulaStore.initFormulaData()
 }
+
+/**
+ * 恢复默认设置
+ */
+const handleResetDefault = async () => {
+  await sendCmd({
+    className: 'SettingMgrService',
+    fnName: 'factoryResetSettings',
+  })
+  formulaStore.getFormualDefaultData()
+}
+
+/**
+ * 确认输入值
+ * @param {string} value - 输入值
+ */
 const handleConfirm = (value: string) => {
   console.log('确认输入:', value)
 }
 
+/**
+ * 确认日志级别选择
+ * @param {any} value - 选择的值
+ */
 const handleLogConfirm = (value: any) => {
   isModalOpen.value = false
   formData.value.loglevel = value
   formulaStore.loglevel = value
 }
 
+/**
+ * 取消日志级别选择
+ */
 const handleLogCancel = () => {
   isModalOpen.value = false
 }
-// 软键盘是数字键盘还是全键盘
+
+/**
+ * 根据标签名称确定软键盘类型
+ * @param {string} labelName - 标签名称
+ */
 const openKeyboardType = (labelName: string) => {
   keyboardType.value = labelName === 'name' ? 'text' : 'number'
 }
@@ -154,7 +342,7 @@ const openKeyboardType = (labelName: string) => {
 <template>
   <div class="formula-form">
     <el-form :model="formData" label-width="auto" label-position="left" class="formulaFormItem" inline>
-      <el-form-item label="配方名称" style="margin-top:20px">
+      <el-form-item v-if="type !== 'setting'" label="配方名称" style="margin-top:20px">
         <el-input v-model="formData.name" v-prevent-keyboard name="name" placeholder="配方名称" class="formdata-input-home" @focus="openKeyboard" />
       </el-form-item>
       <el-form-item
@@ -210,7 +398,10 @@ const openKeyboardType = (labelName: string) => {
           <el-button type="primary" @click="handleSubmit">
             确定
           </el-button>
-          <el-button @click="handleCancel">
+          <el-button v-if="type === 'setting'" @click="handleResetDefault">
+            恢复默认值
+          </el-button>
+          <el-button v-else @click="handleCancel">
             取消
           </el-button>
         </div>

src/components/formula/FormulaTable.vue

@@ -1,14 +1,13 @@
 <script lang="ts" setup>
 import { FtMessage } from '@/libs/message'
 import { FtMessageBox } from '@/libs/messageBox'
+import { convertValuesToInt } from '@/libs/utils'
 import { useFormulaStore } from '@/stores/formulaStore'
-import { useHomeStore } from '@/stores/homeStore'
 import { syncSendCmd } from 'apis/system'
 import { ElMessageBox } from 'element-plus'
 import { onMounted, ref, watchEffect } from 'vue'
 
 const formulaStore = useFormulaStore()
-const homeStore = useHomeStore()
 const selectedIndex = ref<number | null>(null)
 const recipes = ref<Formula.FormulaItem[]>([])
 const currectFormula = ref<Formula.FormulaItem>()
@@ -34,11 +33,13 @@ const initFormulaList = () => {
 
 const selectRecipe = (item: Formula.FormulaItem, index: number) => {
   selectedIndex.value = selectedIndex.value === index ? null : index
+  item = convertValuesToInt(item) as Formula.FormulaItem
   formulaStore.updateSelectedFormulaData(item)
 }
 
 const onStartFormula = (item: Formula.FormulaItem) => {
   formulaStore.updateSelectedFormulaData(item)
+  // 执行配方时做设备的状态检查
   FtMessageBox.warning('请确认是否使用此配方进行消毒？').then(() => {
     currectFormula.value = item
     if (item.formula_id) {
@@ -51,8 +52,7 @@ const onStartFormula = (item: Formula.FormulaItem) => {
       }
       syncSendCmd(params).then((res) => {
         if (res.ackcode === 0) {
-          // 执行消毒指令
-          homeStore.subscribeDisinfectEvent()
+          FtMessage.success('已开始消毒')
         }
       })
     }

src/components/home/Environment.vue

@@ -5,10 +5,23 @@ import homeProbe2 from 'assets/images/home/home-probe2.svg'
 import { roundNumber } from 'libs/utils'
 import { onMounted } from 'vue'
 
+/**
+ * 环境参数展示组件
+ * @description 用于展示仓内或探头的环境数据（温度、湿度、过氧化氢浓度等）
+ * @props {Object} envParams - 环境参数对象
+ * @props {string} lineColor - 线条颜色（默认值：red）
+ */
 defineProps({
   envParams: {
     type: Object,
-    default: () => {},
+    default: () => ({
+      type: 'inside', // 环境类型（inside/env1/env2）
+      title: '仓内', // 环境名称
+      temp: 0, // 温度
+      rh: 0, // 相对湿度
+      rs: 0, // 相对饱和度
+      h2o2: 0, // 过氧化氢浓度
+    }),
   },
   lineColor: {
     type: String,
@@ -16,12 +29,25 @@ defineProps({
   },
 })
 
+/**
+ * 图片资源映射对象
+ * @type {Record<string, any>}
+ * @property {string} inside - 仓内图标路径
+ * @property {string} env1 - 探头1图标路径
+ * @property {string} env2 - 探头2图标路径
+ */
 const imgs: Record<string, any> = {
   inside: homeInside,
   env1: homeProbe1,
   env2: homeProbe2,
 }
+
+/**
+ * @hook 生命周期钩子 - 组件挂载完成时执行
+ * @description 可在此处添加初始化逻辑（当前为空实现）
+ */
 onMounted(() => {
+  // 可扩展初始化操作
 })
 </script>
 

src/components/home/HomeOperation.vue

@@ -12,11 +12,19 @@ import { startTimer, stopTimer } from 'libs/countdownTimer'
 import { deviceStateMap } from 'libs/utils'
 import { computed, onMounted, ref, watchEffect } from 'vue'
 
+/**
+ * 消毒操作控制组件
+ * @description 负责处理消毒流程控制（开始/结束）、状态监听及倒计时逻辑
+ */
+
+// 状态管理
 const homeStore = useHomeStore()
 const formulaStore = useFormulaStore()
 const systemStore = useSystemStore()
-const curStateRemainTimeS = ref<string>('')
-const disinfectionState = ref(homeStore.disinfectionState)
+
+// 组件状态
+const curStateRemainTimeS = ref<string>('') // 当前状态剩余时间（字符串格式）
+const disinfectionState = ref(homeStore.disinfectionState) // 消毒状态
 const btnStyle = {
   width: '27vw',
   height: '7vh',
@@ -24,11 +32,17 @@ const btnStyle = {
   borderRadius: '12px',
   textColor: '#FFFFFF',
 }
-let isDisinfection = false
+let isDisinfection = false // 是否处于消毒中状态
 
+/**
+ * @hook 响应式依赖监听
+ * @description 监听消毒状态变化，处理倒计时逻辑
+ */
 watchEffect(() => {
   disinfectionState.value = homeStore.disinfectionState
   const time = disinfectionState.value.curStateRemainTimeS
+
+  // 进入消毒状态且未启动倒计时时开始计时
   if (disinfectionState.value.state === 'disinfection' && !isDisinfection && time > 0) {
     isDisinfection = true
     startTimer(time * 1000, (times: string) => {
@@ -38,58 +52,89 @@ watchEffect(() => {
   }
 })
 
-onMounted(() => {
+/**
+ * @hook 生命周期钩子 - 组件挂载完成时执行
+ * @description 订阅消毒状态更新事件
+ */
+onMounted(async () => {
+  await systemStore.subscribeDisinfectEvent() // 订阅状态更新
   subscribeEvent('stateUpdate', handleDisinfectState)
 })
 
+/**
+ * @function 处理消毒状态更新事件
+ * @param {Socket.WebSocketResponse<Home.DisinfectState>} report - 状态更新报告
+ * @desc 接收并更新消毒状态数据
+ */
 const handleDisinfectState = (report: Socket.WebSocketResponse<Home.DisinfectState>) => {
   if (report.fromClass === 'DisinfectionCtrlServiceExt') {
     homeStore.updateHomeDisinfectionState(report.rely)
   }
 }
-// 开始消毒
+
+/**
+ * @function 开始消毒操作
+ * @desc 校验设备状态并发起消毒请求
+ */
 const onStartDisinfect = async () => {
+  // 校验日志等级
   if (!formulaStore.loglevel) {
-    FtMessage.warning('选择消毒等级')
+    FtMessage.warning('请选择消毒等级')
     return
   }
+
+  // 校验设备状态
   const statusName = getDeviceStatus()
   if (statusName) {
     FtMessageBox.error(statusName)
     return
   }
 
+  systemStore.updateLoading(true)
+  try {
+    // 使用选中配方或默认配置启动消毒
     if (formulaStore.selectedFormulaInfo && formulaStore.selectedFormulaInfo.formula_id) {
-    formulaStore.saveDisinfectFormula(formulaStore.selectedFormulaInfo)
+      await formulaStore.saveDisinfectFormula(formulaStore.selectedFormulaInfo)
     }
     else {
       const startParams = {
         className: 'DisinfectionCtrlServiceExt',
         fnName: 'start',
-      params: {
-        loglevel: formulaStore.loglevel,
-      },
+        params: { loglevel: formulaStore.loglevel },
       }
-    systemStore.updateLoading(true)
       await sendCmd(startParams)
     }
-  homeStore.subscribeDisinfectEvent()
+  }
+  finally {
+    systemStore.updateLoading(false)
+  }
 }
 
-// 结束消毒
+/**
+ * @function 结束消毒操作
+ * @desc 停止倒计时并发起结束消毒请求
+ */
 const onFinishDisinfect = async () => {
-  stopTimer()
+  stopTimer() // 停止倒计时
+  systemStore.updateLoading(true)
+  try {
     const stopParams = {
       className: 'DisinfectionCtrlServiceExt',
       fnName: 'stop',
-    params: {
-      loglevel: formulaStore.loglevel,
-    },
+      params: { loglevel: formulaStore.loglevel },
     }
-  systemStore.updateLoading(true)
     await sendCmd(stopParams)
   }
+  finally {
+    systemStore.updateLoading(false)
+  }
+}
 
+/**
+ * @computed 计算属性 - 操作状态判断
+ * @returns {boolean} - 是否处于空闲或已完成状态
+ * @desc 控制开始/结束按钮的显示逻辑
+ */
 const operationState = computed(() => {
   return disinfectionState.value.state === 'idle' || disinfectionState.value.state === 'finished'
 })
@@ -128,7 +173,7 @@ const operationState = computed(() => {
       </template>
     </bt-button>
   </div>
-  <!--  开始消毒时显示 -->
+  <!-- 开始消毒时显示剩余时间或状态 -->
   <div v-if="!operationState" class="home-remain-time">
     <div class="home-remaini-label">
       <span v-if="disinfectionState.state === 'disinfection'">
@@ -138,7 +183,6 @@ const operationState = computed(() => {
         消毒状态：
       </span>
     </div>
-    <!--  消毒中显示时间，其它情况显示状态 -->
     <div v-if="disinfectionState.state === 'disinfection'" class="home-remaini-value">
       {{ curStateRemainTimeS }}
     </div>

src/components/home/HomeSetting.vue

@@ -13,133 +13,187 @@ import { cloneDeep } from 'lodash'
 import { computed, onMounted, provide, ref, watchEffect } from 'vue'
 import { useRouter } from 'vue-router'
 
+/**
+ * 主页操作控制组件
+ * @description 负责处理压力控制、消毒设置、图表导航等功能，协调组件间通信
+ */
+
+// 依赖注入
 const configRef = ref()
 provide<(methods: Home.GrandsonMethods) => void>('registerGrandsonMethods', (methods) => {
   configRef.value = methods
 })
+
+// 状态管理
 const router = useRouter()
 const formulaStore = useFormulaStore()
 const homeStore = useHomeStore()
-const isModalOpen = ref(false)
-const optionsLeft = ref<System.Option[]>([])
-const optionsRight = ref<System.Option[]>([])
-const selectedValue = ref()
-const disinfectionState = ref(homeStore.disinfectionState)
-// 消毒设置
-const disinfectFormulaVisible = ref(false)
-const selectedByFormulas = ref(cloneDeep(formulaStore.selectedFormulaInfo))
 
+// 组件状态
+const isModalOpen = ref(false) // 级联选择模态框是否打开
+const optionsLeft = ref<System.Option[]>([]) // 压力类型选项（左列）
+const optionsRight = ref<System.Option[]>([]) // 压力强度选项（右列）
+const selectedValue = ref() // 选中的压力配置值
+const disinfectionState = ref(homeStore.disinfectionState) // 消毒状态
+const disinfectFormulaVisible = ref(false) // 消毒设置对话框是否显示
+const selectedByFormulas = ref(cloneDeep(formulaStore.selectedFormulaInfo)) // 当前选中的配方信息
+const pressureConfig = ref(homeStore.pressureConfig)
+
+/**
+ * @hook 响应式依赖监听
+ * @description 监听消毒状态和配方变化，同步更新组件状态
+ */
 watchEffect(() => {
   disinfectionState.value = homeStore.disinfectionState
   selectedByFormulas.value = formulaStore.selectedFormulaInfo
+  pressureConfig.value = homeStore.pressureConfig
 })
 
-onMounted(() => {
-  // 初始化正负压力值
-  homeStore.getPressureConfig()
+/**
+ * @hook 生命周期钩子 - 组件挂载完成时执行
+ * @description 初始化压力配置
+ */
+onMounted(async () => {
+  await getPressureConfig() // 获取压力配置
 })
 
+/**
+ * @function getPressureConfig
+ * @desc 获取当前压力配置信息
+ */
+const getPressureConfig = async () => {
+  const pressureParams = {
+    className: 'PipelinePressureControl',
+    fnName: 'getConfig',
+  }
+  const res = await sendCmd(pressureParams)
+  console.log('res---', res)
+  homeStore.updatePressureConfig(res)
+}
+
+/**
+ * @computed 计算属性 - 设备状态判断
+ * @returns {boolean} - 设备是否处于空闲或已完成状态
+ * @desc 控制按钮可用状态
+ */
 const deviceState = computed(() => {
   return disinfectionState.value.state === 'idle' || disinfectionState.value.state === 'finished'
 })
 
+/**
+ * @function 打开消毒设置对话框
+ * @desc 根据当前选中配方或默认配方初始化设置
+ */
 const onDisinfectConfig = () => {
-  if (selectedByFormulas.value) {
-    formulaStore.updateSelectedFormulaDataByList(cloneDeep(selectedByFormulas.value))
-  }
-  else {
-    formulaStore.updateSelectedFormulaDataByList(cloneDeep(formulaStore.defaultFormulaInfo))
-  }
+  formulaStore.updateSelectedFormulaDataByList(selectedByFormulas.value || cloneDeep(formulaStore.defaultFormulaInfo))
   disinfectFormulaVisible.value = true
 }
 
+/**
+ * @function 导航到图表页面
+ * @desc 路由跳转至消毒图表页面
+ */
 const onShowChart = () => {
   router.push('/home/chart')
 }
 
-// 保存消毒参数
+/**
+ * @function 保存消毒参数
+ * @desc 处理表单数据保存逻辑，区分消毒中与非消毒状态
+ */
 const onSave = async () => {
   const formData = configRef.value?.getFormData()
-  console.log('formData---', JSON.stringify(formData))
-  formulaStore.updateSelectedFormulaDataByList(cloneDeep(formData))
-  // 消毒中 设置消毒参数
-  if (!homeStore.isDeviceIdle) {
-    // 获取正在执行的消毒参数
-    const params = {
+  if (!formData) {
+    return
+  }
+  formulaStore.updateSelectedFormulaDataByList(cloneDeep(formData)) // 更新选中配方
+
+  if (!homeStore.isDeviceIdle) { // 消毒中时更新实时配置
+    const res = await sendCmd({
       className: 'DisinfectionCtrlServiceExt',
       fnName: 'getRealtimeConfig',
       params: {},
-    }
-    const res = await sendCmd(params)
-    const result = compareJSON(res, formData)
-    const resultKey = Object.keys(result)
-    if (resultKey && resultKey.length) {
-      resultKey.forEach(async (item) => {
-        await setRealtimeConfig(item, result[item].newVal)
     })
+    const diff = compareJSON(res, formData)
+    const diffKeys = Object.keys(diff)
+    if (diffKeys.length) {
+      await Promise.all(diffKeys.map(async (key) => {
+        await setRealtimeConfig(key, diff[key].newVal)
+      }))
       FtMessage.success('配方修改成功')
     }
   }
-  else {
-    // 未消毒 设置消毒配方
+  else { // 非消毒时保存配方
     if (formData.formula_id) {
       await formulaStore.saveDisinfectFormula(formData)
     }
   }
-  onClose()
+  onClose() // 关闭对话框
 }
 
+/**
+ * @function 设置实时消毒参数
+ * @param {string} key - 参数键名
+ * @param {string} val - 参数值
+ * @desc 向设备发送实时参数修改指令
+ */
 const setRealtimeConfig = async (key: string, val: string) => {
-  const params = {
+  await sendCmd({
     className: 'DisinfectionCtrlServiceExt',
     fnName: 'setRealtimeConfig',
-    params: {
-      key,
-      val,
-    },
-  }
-  await sendCmd(params)
+    params: { key, val },
+  })
 }
 
-// 设置压力
+/**
+ * @function 打开压力控制模态框
+ * @desc 初始化压力类型和强度选项
+ */
 const onSetPressure = () => {
-  // 接口中获取压力值
-  const pressureConfig = homeStore.pressureConfig
-  const { typeDisplayNames, types } = pressureConfig
-  const intensitys: Record<string, any> = pressureConfig.intensitys
-  const left: System.Option[] = []
-  let negativePressure: string[] = []
-  if (typeDisplayNames && typeDisplayNames.length) {
-    typeDisplayNames.forEach((el: string, index: number) => {
-      left.push({
-        label: el,
+  const pressureVal = pressureConfig.value
+  const { typeDisplayNames, types, intensitys } = pressureVal || {}
+
+  // 构建压力类型选项（左列）
+  const leftOptions: System.Option[] = typeDisplayNames?.map((name: string, index: number) => ({
+    label: name,
     value: types[index],
-      })
-      if (types[index] === 'positivePressure') {
-        negativePressure = intensitys.positivePressure
-      }
-    })
-  }
-  optionsLeft.value = left
-  const right: System.Option[] = []
-  if (negativePressure.length) {
-    negativePressure.forEach((el) => {
-      right.push({
-        label: el,
-        value: el,
-      })
+  })) || []
+
+  // 构建压力强度选项（右列）
+  const rightOptions: System.Option[] = []
+  if (types?.includes('positivePressure')) {
+    intensitys?.positivePressure?.forEach((intensity: string) => {
+      rightOptions.push({ label: `${intensity}%`, value: intensity })
     })
   }
-  optionsRight.value = right
+
+  optionsLeft.value = leftOptions
+  optionsRight.value = rightOptions
   isModalOpen.value = true
 }
+
+/**
+ * @function 确认压力选择
+ * @param {string|number[]} value - 选中的压力配置值（[类型, 强度]）
+ * @desc 关闭模态框并更新压力配置
+ */
 const handleConfirm = (value: string | number[]) => {
   isModalOpen.value = false
   homeStore.updatePressure(value)
 }
+
+/**
+ * @function 取消压力选择
+ * @desc 关闭模态框
+ */
 const handleCancel = () => {
   isModalOpen.value = false
 }
+
+/**
+ * @function 关闭消毒设置对话框
+ * @desc 重置对话框状态
+ */
 const onClose = () => {
   disinfectFormulaVisible.value = false
 }

src/components/home/config.vue

@@ -6,27 +6,48 @@ import SelectModal from 'components/common/SelectModal/index.vue'
 import FormulaConfig from 'components/formula/FormulaConfig.vue'
 import { computed, onMounted, ref, watchEffect } from 'vue'
 
+/**
+ * 配方选择页面组件
+ * @description 负责处理配方选择逻辑、设备状态判断及界面交互
+ */
+
+// 状态管理
 const formulaStore = useFormulaStore()
 const homeStore = useHomeStore()
-const recipes = ref<Formula.FormulaItem[]>([])
-const isModalOpen = ref(false)
-const selectedValue = ref()
-const isDeviceIdle = ref(homeStore.isDeviceIdle)
+
+// 组件状态
+const recipes = ref<Formula.FormulaItem[]>([]) // 配方列表
+const isModalOpen = ref(false) // 选择模态框是否打开
+const selectedValue = ref() // 选中的配方ID
+const isDeviceIdle = ref(homeStore.isDeviceIdle) // 设备是否空闲状态
+
+/**
+ * @hook 生命周期钩子 - 挂载完成时执行
+ * @description 初始化时检查配方列表，若为空则重新获取
+ */
 onMounted(() => {
-  // store中没有配方表单时，重新获取
   if (!formulaStore.formulaList || !formulaStore.formulaList.length) {
     formulaStore.initFormulaList()
   }
 })
+
+/**
+ * @hook 响应式依赖监听
+ * @description 监听store数据变化，同步更新组件状态
+ */
 watchEffect(() => {
   recipes.value = [...formulaStore.formulaList]
   isDeviceIdle.value = homeStore.isDeviceIdle
 })
 
+/**
+ * @computed 计算属性 - 生成选择框选项
+ * @returns {System.Option[]} 包含label和value的选项数组
+ */
 const options = computed(() => {
   const list = formulaStore.formulaList
   const optionList: System.Option[] = []
-  list.forEach((item) => {
+  list.forEach((item: Formula.FormulaItem) => {
     optionList.push({
       label: item.name.toString(),
       value: item.formula_id,
@@ -34,6 +55,12 @@ const options = computed(() => {
   })
   return optionList
 })
+
+/**
+ * @function 确认选择处理函数
+ * @param {any} value - 选中的配方ID
+ * @description 关闭模态框，更新选中配方并转换数值类型
+ */
 const handleConfirm = (value: any) => {
   isModalOpen.value = false
   let selectedFormula = {}
@@ -42,18 +69,31 @@ const handleConfirm = (value: any) => {
       selectedFormula = item
     }
   })
-  const selectedFormulaToInt = convertValuesToInt(selectedFormula, 'name')
-  // 更新选择的配方
+  const selectedFormulaToInt = convertValuesToInt(selectedFormula)
   formulaStore.updateSelectedFormulaDataByList(selectedFormulaToInt as Formula.FormulaItem)
 }
+
+/**
+ * @function 取消选择处理函数
+ * @description 关闭模态框
+ */
 const handleCancel = () => {
   isModalOpen.value = false
 }
+
+/**
+ * @function 打开选择配方模态框
+ * @description 触发模态框显示
+ */
 const onChooseFormula = () => {
   isModalOpen.value = true
 }
+
+/**
+ * @function 应用默认配方
+ * @description 重置配方数据为默认配置
+ */
 const onDefaultFormula = () => {
-  // 获取默认值数据
   formulaStore.initFormulaData()
 }
 </script>

src/components/liquid/LiquidLevel.vue

@@ -61,6 +61,7 @@ const liquidHeight = computed(() => {
   width: 100%;
   background: linear-gradient(to top, #0099ff, #e6f7ff); /* 颜色渐变，可按需调整 */
   border-radius: 10px;
+  min-height: 1.5rem;
 }
 .liquid-level-middle{
     background: linear-gradient(352deg, #0093f5, #effafe);

src/components/setting/SystemDate.vue

@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import { sendCmd } from '@/apis/system'
 import { FtMessage } from '@/libs/message'
+import { formatDateTime } from '@/libs/utils'
 import { ref } from 'vue'
 
-const dateVal = ref()
+const dateVal = ref(formatDateTime())
+
 const onChangeDate = async (value: string) => {
   if (value) {
     const splitDate = value.split(' ') // 先以空格分隔

src/components/system/NetReconnection.vue

@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import { useSystemStore } from '@/stores/systemStore'
+import { startTimer, stopTimer } from 'libs/countdownTimer'
+import { ref, watchEffect } from 'vue'
+import { useRouter } from 'vue-router'
+
+const systemStore = useSystemStore()
+const router = useRouter()
+const timer = ref()
+
+const countdownToReconnection = () => {
+  startTimer(30 * 1000, (times: string) => {
+    if (times === '0') {
+      router.push('/login')
+      return
+    }
+    timer.value = times
+  })
+}
+
+watchEffect(() => {
+  if (!systemStore.websocketConnected) {
+    countdownToReconnection()
+  }
+  else {
+    stopTimer()
+  }
+})
+</script>
+
+<template>
+  <div class="reconnect-modal-overlay">
+    <div class="reconnect-modal-container">
+      <div class="reconnect-spinner" />
+      <h2 class="reconnect-title">
+        正在重连中 {{ timer }}
+      </h2>
+      <p class="reconnect-message">
+        请稍候，系统正在尝试重新连接网格...
+      </p>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+  .reconnect-modal-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    backdrop-filter: blur(4px);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 9999;
+  }
+
+  .reconnect-modal-container {
+    background-color: white;
+    border-radius: 12px;
+    padding: 40px;
+    box-shadow: 0 10px 25px rgba(0, 0, 0, 0.1);
+    text-align: center;
+    animation: fadeIn 0.3s ease-out;
+  }
+
+  .reconnect-spinner {
+    width: 64px;
+    height: 64px;
+    border: 6px solid #f3f3f3;
+    border-radius: 50%;
+    border-top: 6px solid #3b82f6;
+    margin: 0 auto 24px;
+    animation: spin 1s linear infinite;
+  }
+
+  .reconnect-title {
+    font-size: 1.12rem;
+    font-weight: bold;
+    color: #1f2937;
+    margin-bottom: 12px;
+  }
+
+  .reconnect-message {
+  font-size: 16px;
+  color: #4b5563;
+  }
+
+  @keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+  }
+
+  @keyframes fadeIn {
+    from { opacity: 0; transform: scale(0.95); }
+    to { opacity: 1; transform: scale(1); }
+  }
+</style>

src/layouts/default.vue

@@ -6,7 +6,8 @@ import { useLiquidStore } from '@/stores/liquidStore'
 import { useSealStore } from '@/stores/sealStore'
 import { useSystemStore } from '@/stores/systemStore'
 import HomeAlarmSvg from 'assets/images/home/home-alarm.svg'
-import ErrorBox from 'libs/modalUtil'
+import NetReconnection from 'components/system/NetReconnection.vue'
+// import ErrorBox from 'libs/modalUtil'
 import { formatDateTime, openFullscreen } from 'libs/utils'
 import { authRoutes } from 'router/routes'
 import { useDeviceStore } from 'stores/deviceStore'
@@ -30,11 +31,19 @@ const wordStateName = ref<string>('空闲')
 const disinfectState = ref(homeStore.disinfectionState.state)
 const liquidAddState = ref(liquidStore.liquidAddWorkState)
 const liquidDrainState = ref(liquidStore.liquidDrainWorkState)
+const deviceStete = ref(deviceStore.deviceStete)
 const sealInfo = ref(sealStore.sealInfo)
+const websocketConnected = ref(systemStore.websocketConnected)
 let touchStartTime = 0
 let touchCount = 0
+
 onMounted(() => {
   // 连续3次点击任意地方，全屏显示
+  onFullScreen()
+  deviceStore.startSubscribDevice()
+})
+
+const onFullScreen = () => {
   document.body.addEventListener('touchstart', (event) => {
     const now = Date.now()
     const timeDiff = now - touchStartTime
@@ -50,18 +59,10 @@ onMounted(() => {
     }
     touchStartTime = now
   })
-})
-
-const showWorkState = () => {
-  // 消毒状态
-  disinfectState.value = homeStore.disinfectionState.state
-  // 加液/排液状态
-  liquidAddState.value = liquidStore.liquidStateData
-  liquidDrainState.value = liquidStore.liquidDrainWorkState
-
-  // 密封测试状态
-  sealInfo.value = sealStore.sealInfo
+}
 
+const showDeviceStateName = () => {
+  if (deviceStete.value.state.toLocaleLowerCase() !== 'idle') {
     if (disinfectState.value !== 'idle' && disinfectState.value !== 'finished') {
       wordStateName.value = homeStore.disinfectionState.statedisplayName
     }
@@ -74,6 +75,7 @@ const showWorkState = () => {
     else if (sealInfo.value.workState !== 'idle') {
       wordStateName.value = sealInfo.value.workStateDisplay
     }
+  }
   else {
     wordStateName.value = '空闲'
   }
@@ -81,15 +83,24 @@ const showWorkState = () => {
 
 watchEffect(() => {
   deviceInfo.value = deviceStore.deviceInfo
-  showWorkState()
+  websocketConnected.value = systemStore.websocketConnected
+  // 消毒状态
+  disinfectState.value = homeStore.disinfectionState.state
+  // 加液/排液状态
+  liquidAddState.value = liquidStore.liquidStateData
+  liquidDrainState.value = liquidStore.liquidDrainWorkState
+  deviceStete.value = deviceStore.deviceStete
+  // 密封测试状态
+  sealInfo.value = sealStore.sealInfo
+  showDeviceStateName()
 })
 
 onUnmounted(() => {
   clearInterval(timeInterval)
 })
-const showErrorModal = () => {
-  ErrorBox.alert('这是一条警告信息')
-}
+// const showErrorModal = () => {
+//   ErrorBox.alert('这是一条警告信息')
+// }
 const onLogout = () => {
   // 判断是否有正在执行的操作
   const hasEx = getDeviceStatus()
@@ -156,14 +167,15 @@ const onLogout = () => {
       <div class="ip-info">
         IP : {{ deviceInfo.ip }}
       </div>
-      <div class="alarm-info" @click="showErrorModal">
+      <div class="alarm-info">
         <img :src="HomeAlarmSvg" width="20" alt="报警">
-        <div>{{ wordStateName }}</div>
+        <div>{{ wordStateName || '空闲' }}</div>
       </div>
       <div class="time">
         {{ currentTime }}
       </div>
     </footer>
+    <NetReconnection v-if="!websocketConnected" />
   </el-container>
 </template>
 

src/libs/constant.ts

@@ -22,8 +22,8 @@ export const formulaNameMap: Record<string, any> = {
 export const PARSSURE_DATA = {
   intensitys: {
     constantPressure: null,
-    negativePressure: ['0%', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'],
-    positivePressure: ['0%', '10%', '20%', '30%', '40%', '50%', '60%', '70%', '80%', '90%', '100%'],
+    negativePressure: ['0', '10', '20', '30', '40', '50', '60', '70', '80', '90', '100'],
+    positivePressure: ['0', '10', '20', '30', '40', '50', '60', '70', '80', '90', '100'],
   },
   typeDisplayNames: ['恒压', '正压', '负压'],
   types: ['constantPressure', 'positivePressure', 'negativePressure'],

src/libs/countdownTimer.ts

@@ -28,9 +28,15 @@ class CountdownTimer {
   private initDiaplay(): void {
     const seconds = Math.floor(this.endTime / 1000)
     const curStateRemainTimeS = this.formatTime(seconds)
+    if (this.endTime === 0 || this.endTime < 1000) {
+      this.callback && this.callback('0')
+      this.stopTimer()
+    }
+    else {
       this.callback && this.callback(curStateRemainTimeS)
       this.endTime -= 1000
     }
+  }
 
   private updateDisplay(): void {
     this.timer = window.setInterval(() => {

src/libs/socket.ts

@@ -13,6 +13,9 @@ export class WebSocketClient {
   private responseHandlers = new Map<string, (response: Socket.WebSocketResponse) => void>()
 
   private eventListeners = new Map<string, ((response: Socket.WebSocketResponse) => void)[]>()
+  private connectCount = 0
+  private maxConnectCount = 10
+  private intervalVal: any = 0
 
   constructor(url: string) {
     this.url = url
@@ -161,6 +164,11 @@ export class WebSocketClient {
 
   // 重连逻辑
   private reconnect() {
+    if (this.connectCount > this.maxConnectCount) {
+      clearInterval(this.intervalVal)
+      console.log('-----达到最大重连次数，停止重连------')
+      return
+    }
     this.isConnecting = true
     if (this.socket.readyState !== WebSocket.CLOSED && this.socket.readyState !== WebSocket.CLOSING) {
       this.socket.close()
@@ -174,8 +182,10 @@ export class WebSocketClient {
       return
     }
     this.isConnecting = true
-    setTimeout(() => {
+    this.intervalVal = setInterval(() => {
       this.isConnecting = false
+      this.connectCount++
+      console.log('重连------------', this.connectCount)
       this.reconnect()
     }, 3000) // 3秒后重连
   }

src/libs/utils.ts

@@ -30,7 +30,7 @@ export const deviceStateMap = <Record<string, any>>{
   finished: '消毒完成',
   dehumidificationBeforeDisinfection: '消毒前除湿',
   dehumidificationAfterDisinfection: '消毒后除湿',
-  emptyLiquidFromTheLine: '排空管路',
+  emptyLineLiquid: '排空管路',
 }
 
 export const sealStateMap = <Record<string, any>>{
@@ -96,10 +96,15 @@ export const convertValuesToString = (jsonObj: Record<string, any>, exName: stri
   return result
 }
 
-export const convertValuesToInt = (jsonObj: Record<string, any>, exName: string) => {
+function isNumber(str: string | number) {
+  // 先转换为数字，再用 isNaN 判断是否为 NaN
+  return !Number.isNaN(Number(str)) && Number.isFinite(Number(str))
+}
+
+export const convertValuesToInt = (jsonObj: Record<string, any>) => {
   const result: Record<string, any> = {}
   for (const [key, value] of Object.entries(jsonObj)) {
-    if (key !== exName) {
+    if (isNumber(value)) {
       result[key] = Number(value)
     }
     else {
@@ -108,3 +113,15 @@ export const convertValuesToInt = (jsonObj: Record<string, any>, exName: string)
   }
   return result
 }
+
+export const DEVICE_STATES = {
+  IDLE: 'idle', // 空闲
+  INIT: 'init', // 初始化
+  PREHEAT: 'preheat', // 预热
+  DISINFECTION: 'disinfection', // 消毒
+  DEGRADATION: 'degradation', // 降解
+  FINISHED: 'finished', // 结束
+  DEHUMIDIFICATION_BEFORE: 'dehumidification_before_disinfection', // 消毒前除湿
+  DEHUMIDIFICATION_AFTER: 'dehumidification_after_disinfection', // 消毒后除湿
+  EMPTY_LINE: 'empty_liquid_from_the_line', // 清空管路
+}

src/stores/deviceStore.ts

@@ -1,3 +1,5 @@
+import { subscribeEvent } from '@/apis/system'
+import { DEVICE_STATES } from '@/libs/utils'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
@@ -12,12 +14,34 @@ const initDeviceInfo = {
 
 export const useDeviceStore = defineStore('device', () => {
   const deviceInfo = ref<Device.DeviceInfo>(initDeviceInfo)
+  const deviceStete = ref({ state: DEVICE_STATES.IDLE }) // 设备状态
+
   const updateDeviceInfo = (info: Device.DeviceInfo) => {
     deviceInfo.value = info
   }
 
+  /**
+   * @function setDeviceState
+   * @param {Device.State} deviceInfo - 设备状态信息
+   * @desc 更新设备整体状态
+   */
+  const setDeviceState = (deviceInfo: Device.State) => {
+    deviceStete.value = deviceInfo
+  }
+
+  const startSubscribDevice = () => {
+    subscribeEvent('stateUpdate', (report: Socket.WebSocketResponse<Device.State>) => {
+      if (report.fromClass === 'AppCore') {
+        deviceStete.value = report.rely
+      }
+    })
+  }
+
   return {
     deviceInfo,
+    deviceStete,
     updateDeviceInfo,
+    setDeviceState,
+    startSubscribDevice,
   }
 })

src/stores/formulaStore.ts

@@ -2,7 +2,7 @@ import { FtMessage } from '@/libs/message'
 import { sendCmd, syncSendCmd } from 'apis/system'
 import { cloneDeep } from 'lodash'
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 // 常量定义
 const LOG_ITEMS = Array.from({ length: 12 }, (_, i) => ({
@@ -45,10 +45,17 @@ export const useFormulaStore = defineStore('formula', () => {
   const formulaList = ref<Formula.FormulaItem[]>([])
   const loglevel = ref<string>('1')
 
+  watch(defaultFormulaInfo, (newVal) => {
+    currentSelectedFormulaInfo.value = cloneDeep(newVal)
+  }, { deep: true })
   // 计算属性
   const isDefaultFormula = computed(() => currentSelectedFormulaInfo.value.name === defaultFormulaInfo.value.name)
 
-  // 私有
+  /**
+   * @function mapConfigToFormula
+   * @param {Formula.FormulaConfig[]} config - 配方配置列表
+   * @desc 将配方配置映射为配方项对象
+   */
   const mapConfigToFormula = (config: Formula.FormulaConfig[]) => {
     const formulaMap: Record<string, any> = {}
     config.forEach((item) => {
@@ -61,13 +68,32 @@ export const useFormulaStore = defineStore('formula', () => {
     return formulaMap as Formula.FormulaItem
   }
 
-  // 公共方法
+  /**
+   * @function updateFormulaConfigData
+   * @param {Formula.FormulaConfig[]} data - 配方配置数据
+   * @desc 更新配方配置数据并生成默认配方
+   */
   const updateFormulaConfigData = (data: Formula.FormulaConfig[]) => {
     const visibleConfig = data.filter(item => item.is_visible_in_formula_page)
     formulaConfigList.value = visibleConfig
     defaultFormulaInfo.value = mapConfigToFormula(visibleConfig)
   }
 
+  const getFormualDefaultData = async () => {
+    const defaultParams = {
+      className: 'SettingMgrService',
+      fnName: 'getAllSetting',
+      params: {},
+    }
+    const res = await sendCmd(defaultParams)
+    updateFormulaConfigData(res)
+  }
+
+  /**
+   * @function updateLogLevels
+   * @param {Formula.FormulaConfig} logLevelItem - 日志级别配置项
+   * @desc 更新日志级别选项
+   */
   const updateLogLevels = (logLevelItem: Formula.FormulaConfig) => {
     const list: System.Option[] = []
     const { enum_display_names, enums } = logLevelItem
@@ -82,22 +108,46 @@ export const useFormulaStore = defineStore('formula', () => {
     logLevelOptions.value = list
   }
 
+  /**
+   * @function updateLogLevel
+   * @param {string} level - 日志级别值
+   * @desc 更新当前选中的日志级别
+   */
   const updateLogLevel = (level: string) => {
     loglevel.value = level
   }
 
+  /**
+   * @function updatePressurList
+   * @param {string[]} pressurData - 压力选项数据
+   * @desc 更新压力选项列表
+   */
   const updatePressurList = (pressurData: string[]) => {
     pressurOptionList.value = cloneDeep(pressurData)
   }
 
+  /**
+   * @function updateSelectedFormulaData
+   * @param {Formula.FormulaItem} formulaItem - 配方项
+   * @desc 更新当前选中的配方数据
+   */
   const updateSelectedFormulaData = (formulaItem: Formula.FormulaItem) => {
     currentSelectedFormulaInfo.value = cloneDeep(formulaItem)
   }
 
+  /**
+   * @function updateSelectedFormulaDataByList
+   * @param {Formula.FormulaItem} formulaItem - 配方项
+   * @desc 通过配方列表更新选中的配方数据
+   */
   const updateSelectedFormulaDataByList = (formulaItem: Formula.FormulaItem) => {
     selectedFormulaInfo.value = cloneDeep(formulaItem)
   }
 
+  /**
+   * @function initFormulaList
+   * @desc 初始化配方列表，从服务器获取所有配方
+   */
   const initFormulaList = async () => {
     try {
       const params = {
@@ -115,15 +165,28 @@ export const useFormulaStore = defineStore('formula', () => {
     }
   }
 
+  /**
+   * @function initFormulaData
+   * @desc 初始化配方数据，重置为默认配方
+   */
   const initFormulaData = () => {
     selectedFormulaInfo.value = null
     resetToDefaultFormula()
   }
 
+  /**
+   * @function resetToDefaultFormula
+   * @desc 重置为默认配方
+   */
   const resetToDefaultFormula = () => {
     currentSelectedFormulaInfo.value = cloneDeep(defaultFormulaInfo.value)
   }
 
+  /**
+   * @function saveDisinfectFormula
+   * @param {Formula.FormulaItem} formData - 配方数据
+   * @desc 保存消毒配方并启动消毒程序
+   */
   const saveDisinfectFormula = async (formData: Formula.FormulaItem) => {
     try {
       const params = {
@@ -165,5 +228,6 @@ export const useFormulaStore = defineStore('formula', () => {
     saveDisinfectFormula,
     updateLogLevel,
     resetToDefaultFormula,
+    getFormualDefaultData,
   }
 })

src/stores/homeStore.ts

@@ -1,18 +1,10 @@
+import { DEVICE_STATES } from '@/libs/utils'
 import { sendCmd } from 'apis/system'
 import { PARSSURE_DATA } from 'libs/constant'
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue'
 
-// 空闲 idle
-// 初始化 init
-// 预热 preheat
-// 消毒 disinfection
-// 降解 degradation
-// 结束 finished
-// 消毒前除湿 dehumidification_before_disinfection
-// 消毒后除湿 dehumidification_after_disinfection
-// 清空管路 empty_liquid_from_the_line
-
+// 传感器数据初始值
 const h2O2Data: Home.DisplayrelyMgrParams[] = [{
   type: 'inside',
   title: '仓内',
@@ -23,29 +15,33 @@ const h2O2Data: Home.DisplayrelyMgrParams[] = [{
   chartId: 'inside',
 }]
 
-// 消毒中状态初始值
+// 消毒状态初始值
 const initDisinfectState = {
   curStateRemainTimeS: 0,
   h2o2SensorData: h2O2Data,
   injectedVelocity: 0,
   nlog: 0,
-  state: 'idle',
+  state: DEVICE_STATES.IDLE,
   statedisplayName: '空闲',
   tlog: 0,
 }
 
+/**
+ * 主页数据管理模块
+ * @module useHomeStore
+ */
 export const useHomeStore = defineStore('home', () => {
+  // 状态定义
   const h2O2SensorData = ref(h2O2Data)
   const pressureConfig = ref<Home.ParssureData>(PARSSURE_DATA)
   const curStateRemainTime = ref<string>()
-  const disinfectionState = ref<Home.DisinfectState>(initDisinfectState)// 当前设备正在消毒时的状态
-  const deviceStete = ref({ state: 'idle' }) // 设备状态
+  const disinfectionState = ref<Home.DisinfectState>(initDisinfectState) // 当前设备消毒状态
   let renderTimer: any
 
   /**
    * @function updateHomeData
-   * @params data 当前设备所有环境数据。 仓内、探头
-   * @desc 获取当前的压力值
+   * @param {Home.DisplayrelyMgr[]} data - 当前设备所有环境数据（仓内、探头）
+   * @desc 更新环境传感器数据（温度、湿度、过氧化氢浓度等）
    */
   const updateHomeData = (data: Home.DisplayrelyMgr[]) => {
     if (data && data.length) {
@@ -58,24 +54,14 @@ export const useHomeStore = defineStore('home', () => {
     }
   }
 
-  /**
-   * @function getPressureConfig
-   * @desc 获取当前的压力值
-   */
-  const getPressureConfig = async () => {
-    const pressureParams = {
-      className: 'PipelinePressureControl',
-      fnName: 'getConfig',
-      params: {},
-    }
-    const res = await sendCmd(pressureParams)
-    pressureConfig.value = res
+  const updatePressureConfig = (data: Home.ParssureData) => {
+    pressureConfig.value = data || PARSSURE_DATA
   }
 
   /**
    * @function updatePressure
-   * @param pressureData : 数组 压力类型及选择的压力值
-   * @desc 更新压力类型及选择的压力值
+   * @param {Array<string|number>} pressureData - 压力配置数据 [压力类型, 压力值]
+   * @desc 更新压力类型及对应压力值配置
    */
   const updatePressure = async (pressureData: string | number[]) => {
     if (pressureData && pressureData.length) {
@@ -83,19 +69,17 @@ export const useHomeStore = defineStore('home', () => {
       const pressureTypeParams = {
         className: 'PipelinePressureControl',
         fnName: 'setType',
-        params: {
-          type,
-        },
+        params: { type },
       }
       await sendCmd(pressureTypeParams)
-      if (type === 'positivePressure' || type === 'positivePressure') { // type 是正压或负压时保存设置的压力值
+
+      // 正压或负压时保存设置的压力值
+      if (type === 'positivePressure' || type === 'negativePressure') {
         const intensity = pressureData[1]
         const intensityParams = {
           className: 'PipelinePressureControl',
           fnName: 'setIntensity',
-          params: {
-            intensity,
-          },
+          params: { intensity },
         }
         await sendCmd(intensityParams)
       }
@@ -103,22 +87,16 @@ export const useHomeStore = defineStore('home', () => {
   }
 
   /**
-   * @function setDeviceState
-   * @param deviceInfo 当前设备状态
-   */
-  const setDeviceState = (deviceInfo: Device.State) => {
-    deviceStete.value = deviceInfo
-  }
-
-  /**
    * @function updateHomeDisinfectionState
-   * @param disinfectState 当前设备消毒状态
+   * @param {Home.DisinfectState} disinfectState - 当前消毒状态信息
+   * @desc 更新消毒状态信息，每3秒更新一次传感器数据
    */
   const updateHomeDisinfectionState = (disinfectState: Home.DisinfectState) => {
     disinfectionState.value = disinfectState
     if (!renderTimer) {
       renderTimer = setTimeout(() => {
         h2O2SensorData.value = [...disinfectionState.value.h2o2SensorData]// 创建副本
+        // updateHomeData(disinfectionState.value.h2o2SensorData)
         renderTimer = null
       }, 3000) as unknown as NodeJS.Timeout // 类型断言兼容不同环境
     }
@@ -126,40 +104,34 @@ export const useHomeStore = defineStore('home', () => {
 
   /**
    * @function updateHomeRemainTime
-   * @param timer 当前设备消毒状态下的剩余时间
+   * @param {string} timer - 当前状态剩余时间
+   * @desc 更新当前消毒状态剩余时间
    */
   const updateHomeRemainTime = (timer: string) => {
     curStateRemainTime.value = timer
   }
 
+  /**
+   * @computed isDeviceIdle
+   * @returns {boolean} - 设备是否处于空闲或已完成状态
+   * @desc 判断设备是否处于空闲或已完成状态
+   */
   const isDeviceIdle = computed(() => {
-    return disinfectionState.value.state.toLocaleLowerCase() === 'idle' || disinfectionState.value.state === 'finished'
+    return disinfectionState.value.state.toLocaleLowerCase() === DEVICE_STATES.IDLE || disinfectionState.value.state === DEVICE_STATES.FINISHED
   })
 
-  const subscribeDisinfectEvent = () => {
-    // 发起订阅
-    const subParams = {
-      className: 'DisinfectionCtrlServiceExt',
-      fnName: 'startStateReport',
-      params: {},
-    }
-    sendCmd(subParams)
-  }
   return {
-    // 属性
+    // 状态属性
     h2O2SensorData,
-    deviceStete,
     disinfectionState,
     pressureConfig,
     curStateRemainTime,
     isDeviceIdle,
-    // 方法
+    // 操作方法
     updateHomeData,
     updatePressure,
-    setDeviceState,
     updateHomeDisinfectionState,
-    getPressureConfig,
+    updatePressureConfig,
     updateHomeRemainTime,
-    subscribeDisinfectEvent,
   }
 })

src/stores/initHomeData.ts

@@ -1,8 +1,10 @@
 import { sendCmd } from '@/apis/system'
 import { useHomeStore } from 'stores/homeStore'
 import { useLiquidStore } from 'stores/liquidStore'
+import { useDeviceStore } from './deviceStore'
 
 const homeStore = useHomeStore()
+const deviceStore = useDeviceStore()
 const liquidStore = useLiquidStore()
 
 export const initData = async () => {
@@ -60,5 +62,5 @@ const initBaseData = async () => {
   }
   // 当前设备状态
   const deviceData = await sendCmd(deviceParams)
-  homeStore.setDeviceState(deviceData)
+  deviceStore.setDeviceState(deviceData)
 }

src/stores/liquidStore.ts

@@ -6,40 +6,67 @@ const liquidItem: Liquid.LiquidData = {
   workState: 'idle',
   workStateDisplay: '空闲',
 }
+
+/**
+ * 液体管理模块状态仓库
+ * @module useLiquidStore
+ */
 export const useLiquidStore = defineStore('Liquid', () => {
+  // 状态定义
   const liquidAddWorkState = ref<Liquid.LiquidData>(liquidItem)
   const liquidDrainWorkState = ref<Liquid.LiquidData>(liquidItem)
   const liquidStateData = ref(liquidItem)
   const liquidTotal = ref<number>(2500)
   const liquidPeriod = ref(300)
 
+  /**
+   * @function updateAddLiquidWorkState
+   * @param {Liquid.LiquidData} item - 加液工作状态数据
+   * @desc 更新加液工作状态并同步到总状态
+   */
   const updateAddLiquidWorkState = (item: Liquid.LiquidData) => {
     liquidAddWorkState.value = item
     liquidStateData.value = item
   }
 
+  /**
+   * @function updateDrainLiquidWorkState
+   * @param {Liquid.LiquidData} item - 排液工作状态数据
+   * @desc 更新排液工作状态并同步到总状态
+   */
   const updateDrainLiquidWorkState = (item: Liquid.LiquidData) => {
     liquidDrainWorkState.value = item
     liquidStateData.value = item
   }
 
+  /**
+   * @function updateLiquidState
+   * @param {Liquid.LiquidData} liquidInfo - 液体状态信息
+   * @desc 直接更新液体总体状态
+   */
   const updateLiquidState = (liquidInfo: Liquid.LiquidData) => {
     liquidStateData.value = liquidInfo
   }
 
+  /**
+   * @function initLiquidConfig
+   * @param {Liquid.LiquidConfig} liquidConfig - 液体配置信息
+   * @desc 初始化液体配置参数（总容量和更新周期）
+   */
   const initLiquidConfig = async (liquidConfig: Liquid.LiquidConfig) => {
     liquidTotal.value = liquidConfig.maxLiquid
     liquidPeriod.value = liquidConfig.updatePeriod
   }
 
   return {
-    // 属性
+    // 状态属性
     liquidAddWorkState,
     liquidDrainWorkState,
     liquidTotal,
     liquidPeriod,
     liquidStateData,
-    // 方法
+
+    // 操作方法
     updateAddLiquidWorkState,
     updateDrainLiquidWorkState,
     initLiquidConfig,

src/stores/sealStore.ts

@@ -1,20 +1,34 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
+/**
+ * 密封状态管理模块
+ * @module useSealStore
+ */
 export const useSealStore = defineStore('seal', () => {
+  // 状态定义
   const sealState = ref('idle')
   const sealInfo = ref<Seal.SealStateItem>({
     pressure: '0',
     workState: 'idle',
     workStateDisplay: '空闲',
   })
+
+  /**
+   * @function updateSealInfo
+   * @param {Seal.SealStateItem} dataInfo - 密封状态信息
+   * @desc 更新密封状态信息，包括压力值和工作状态
+   */
   const updateSealInfo = (dataInfo: Seal.SealStateItem) => {
     sealInfo.value = dataInfo
   }
 
   return {
+    // 状态属性
     sealState,
     sealInfo,
+
+    // 操作方法
     updateSealInfo,
   }
 })

src/stores/settingStore.ts

@@ -1,7 +1,12 @@
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
+/**
+ * 设置管理模块
+ * @module useSettingStore
+ */
 export const useSettingStore = defineStore('setting', () => {
+  // 设置菜单配置
   const settingMenus = [{
     name: '消毒历史记录',
     code: 'history',
@@ -19,27 +24,54 @@ export const useSettingStore = defineStore('setting', () => {
     code: 'deviceInfo',
   }]
 
+  // 历史记录数据
   const historyList: Record<string, string>[] = []
+
   /* ********************** 用户管理 **************************** */
   const userList = ref<User.UserItem[]>([])
   const addUserVisible = ref(false)
   const modifyPwdVisible = ref(false)
   const userModalState = ref('add')
   const currentEditUser = ref<User.UserItem>()
+
+  /**
+   * @function updateUserModalState
+   * @param {string} state - 模态框状态 ('add' | 'edit')
+   * @desc 更新用户管理模态框的操作状态
+   */
   const updateUserModalState = (state: string) => {
     userModalState.value = state
   }
+
+  /**
+   * @function updateCurrentEditUser
+   * @param {User.UserItem} userItem - 当前编辑的用户信息
+   * @desc 更新当前正在编辑的用户数据
+   */
   const updateCurrentEditUser = (userItem: User.UserItem) => {
     currentEditUser.value = userItem
   }
+
+  /**
+   * @function updateVisible
+   * @param {boolean} visible - 是否显示添加用户模态框
+   * @desc 控制添加用户模态框的显示与隐藏
+   */
   const updateVisible = (visible: boolean) => {
     addUserVisible.value = visible
   }
 
+  /**
+   * @function updatePwdVisible
+   * @param {boolean} visible - 是否显示修改密码模态框
+   * @desc 控制修改密码模态框的显示与隐藏
+   */
   const updatePwdVisible = (visible: boolean) => {
     modifyPwdVisible.value = visible
   }
+
   return {
+    // 状态属性
     settingMenus,
     historyList,
     addUserVisible,
@@ -47,6 +79,8 @@ export const useSettingStore = defineStore('setting', () => {
     userModalState,
     currentEditUser,
     userList,
+
+    // 操作方法
     updateVisible,
     updateUserModalState,
     updateCurrentEditUser,

src/stores/systemStore.ts

@@ -1,7 +1,9 @@
+import { sendCmd } from '@/apis/system'
 import { defineStore } from 'pinia'
 import { ref } from 'vue'
 
 export const useSystemStore = defineStore('system', () => {
+  const websocketConnected = ref(true)
   const systemUser = ref({
     username: '',
   })
@@ -32,6 +34,62 @@ export const useSystemStore = defineStore('system', () => {
     }, 1500)
   }
 
+  const updateConnected = (isConnected: boolean) => {
+    websocketConnected.value = isConnected
+  }
+
+  /**
+   * @function subscribeDisinfectEvent
+   * @desc 订阅消毒状态变更事件
+   */
+  const subscribeDisinfectEvent = async () => {
+    // 发起订阅
+    const subParams = {
+      className: 'DisinfectionCtrlServiceExt',
+      fnName: 'startStateReport',
+    }
+    await sendCmd(subParams)
+  }
+
+  /**
+   * @function subscribeAddLiquidEvent
+   * @desc 加液状态变更事件
+   */
+  const subscribeAddLiquidEvent = async () => {
+    // 发起订阅
+    const subParams = {
+      className: 'AddLiquidService',
+      fnName: 'startStateReport',
+    }
+    await sendCmd(subParams)
+  }
+
+  /**
+   * @function subscribeDrainLiquidEvent
+   * @desc 排液状态变更事件
+   */
+  const subscribeDrainLiquidEvent = async () => {
+    // 发起订阅
+    const subParams = {
+      className: 'DrainLiquidService',
+      fnName: 'startStateReport',
+    }
+    await sendCmd(subParams)
+  }
+
+  /**
+   * @function subscribeSealEvent
+   * @desc 密封状态变更事件
+   */
+  const subscribeSealEvent = async () => {
+    // 执行订阅
+    const subParams = {
+      className: 'AirLeakDetectTest',
+      fnName: 'startStateReport',
+    }
+    await sendCmd(subParams)
+  }
+
   return {
     systemUser,
     loginForm,
@@ -41,6 +99,12 @@ export const useSystemStore = defineStore('system', () => {
     streamVisible,
     systemList,
     loading,
+    websocketConnected,
     updateLoading,
+    updateConnected,
+    subscribeDisinfectEvent,
+    subscribeAddLiquidEvent,
+    subscribeDrainLiquidEvent,
+    subscribeSealEvent,
   }
 })

src/types/system.d.ts

@@ -11,4 +11,10 @@ declare namespace System {
     list: T[]
     total: number
   }
+
+  interface SendCmdParams {
+    className: string
+    fnName: string
+    params?: Record<string, any> // 改为可选属性，搭配后面的默认值处理
+  }
 }

src/views/audit/index.vue

@@ -3,16 +3,32 @@ import { FtMessage } from '@/libs/message'
 import { sendCmd } from 'apis/system'
 import { onMounted, ref } from 'vue'
 
-const pageNum = ref(1)
-const pageSize = ref(10)
-const selectedUserList = ref<Audit.AuditItem[]>([])
-const totle = ref(0)
+/**
+ * 审计日志管理组件
+ * @description 展示审计日志列表，支持分页和单条记录导出功能
+ */
 
+// 分页控制
+const pageNum = ref(1) // 当前页码
+const pageSize = ref(10) // 每页显示数量
+const totle = ref(0) // 总记录数
+
+// 表格数据
+const tableData = ref<Audit.AuditItem[]>([]) // 审计日志表格数据
+const selectedUserList = ref<Audit.AuditItem[]>([]) // 选中的日志记录
+
+/**
+ * @hook 生命周期钩子 - 组件挂载完成时执行
+ * @description 初始化加载审计日志列表
+ */
 onMounted(() => {
-  // 获取日志列表
   getAuditList()
 })
 
+/**
+ * @function 获取审计日志列表
+ * @desc 从服务端获取分页后的审计日志数据
+ */
 const getAuditList = async () => {
   const params = {
     className: 'AuditMgrService',
@@ -22,15 +38,24 @@ const getAuditList = async () => {
       pageSize: pageSize.value,
     },
   }
+  try {
     const res = await sendCmd(params)
-  const items = res.items
-  tableData.value = items
-  totle.value = res.total
+    tableData.value = res.items || []
+    totle.value = res.total || 0
+  }
+  catch (error) {
+    FtMessage.error('获取日志列表失败')
+    console.error('获取审计日志失败:', error)
+  }
 }
-const tableData = ref()
+
+/**
+ * @function 导出选中的审计记录
+ * @desc 导出单条审计记录，需先选择一条记录
+ */
 const onExportRecord = () => {
   if (selectedUserList.value.length !== 1) {
-    FtMessage.warning('选择一条数据进行导出')
+    FtMessage.warning('请选择一条数据进行导出')
     return
   }
   const params = {
@@ -39,12 +64,29 @@ const onExportRecord = () => {
     params: {},
   }
   sendCmd(params)
+    .then(() => {
+      FtMessage.success('导出成功')
+    })
+    .catch((error) => {
+      console.error('导出审计记录失败:', error)
+    })
 }
 
+/**
+ * @function 页码变更处理
+ * @param {number} page - 新的页码
+ * @desc 更新页码并重新加载数据
+ */
 const handleCurrentChange = (page: number) => {
   pageNum.value = page
   getAuditList()
 }
+
+/**
+ * @function 表格选择变更处理
+ * @param {Audit.AuditItem[]} users - 选中的记录列表
+ * @desc 更新选中的记录
+ */
 const handleSelectionChange = (users: Audit.AuditItem[]) => {
   selectedUserList.value = users
 }

src/views/liquid/index.vue

@@ -40,6 +40,8 @@ const btnStyle = {
 }
 
 onMounted(() => {
+  systemStore.subscribeAddLiquidEvent()
+  systemStore.subscribeDrainLiquidEvent()
   subScribeLiquid()
 })
 
@@ -101,13 +103,6 @@ const onStartAddLiquid = async () => {
   }
   systemStore.updateLoading(true)
   syncSendCmd(params)
-  // 发起订阅
-  const subParams = {
-    className: 'AddLiquidService',
-    fnName: 'startStateReport',
-    params: {},
-  }
-  syncSendCmd(subParams)
 }
 
 const onStopAddLiquid = () => {
@@ -134,13 +129,6 @@ const onStartDrainLiquid = async () => {
   }
   systemStore.updateLoading(true)
   await sendCmd(params)
-  // 发起订阅
-  const subParams = {
-    className: 'DrainLiquidService',
-    fnName: 'startStateReport',
-    params: {},
-  }
-  syncSendCmd(subParams)
 }
 
 const onStopDrainLiquid = async () => {
@@ -218,13 +206,14 @@ const onStopDrainLiquid = async () => {
               </bt-button>
               <bt-button
                 v-else
-                button-text="停止加液"
+                :button-text="addWorkState.workState === 'emptyLineLiquid' ? '排空管路中' : '停止加液'"
                 bg-color="#FF6767"
                 :text-color="btnStyle.textColor"
                 :width="btnStyle.width"
                 :height="btnStyle.height"
                 :text-size="btnStyle.textSize"
                 :border-radius="btnStyle.borderRadius"
+                :disabled="addWorkState.workState === 'emptyLineLiquid'"
                 @click="onStopAddLiquid"
               >
                 <template #icon>

src/views/login/index.vue

@@ -1,16 +1,25 @@
 <script setup lang="ts">
+import { FtMessage } from '@/libs/message'
 import { setToken } from '@/libs/token'
 import { login } from 'apis/user'
 import logo from 'assets/images/logo.svg'
 import password from 'assets/images/password_icon.svg'
 import user from 'assets/images/user_icon.svg'
+import SoftKeyboard from 'components/common/SoftKeyboard/index.vue'
 import { useSystemStore } from 'stores/systemStore'
-import { ref } from 'vue'
+import { ref, watchEffect } from 'vue'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
 const sys = useSystemStore()
 const formRef = ref()
+const loading = ref(false)
+const inputValue = ref('')
+const keyboardVisible = ref(false)
+const keyboardType = ref<'text' | 'number'>('text')
+const softKeyboardRef = ref()
+const loginForm = ref<Record<string, any>>(sys.loginForm)
+const focusedInput = ref<string | null>(null)
 
 const rules = {
   username: [
@@ -23,20 +32,45 @@ const rules = {
   ],
 }
 
+watchEffect(() => {
+  if (focusedInput.value) {
+    loginForm.value[focusedInput.value] = inputValue.value
+  }
+})
+
+const openKeyboard = (e: { target: { name: string | null } }) => {
+  keyboardVisible.value = true
+  if (e.target.name) {
+    const labelName = e.target.name
+    const formValue = loginForm.value[labelName]
+    inputValue.value = formValue ? formValue.toString() : ''
+    focusedInput.value = e.target.name
+  }
+}
+
 const loginHandle = async () => {
   try {
     const valid = await formRef.value.validate()
     if (!valid) {
       return
     }
-    login(sys.loginForm).then(async (res) => {
+    loading.value = true
+    login(loginForm.value as User.Login).then(async (res) => {
       if (res.ackcode === 0) {
         setToken('login success')
         await router.push('/home')
       }
+      loading.value = false
+    }).catch(() => {
+      loading.value = false
+      FtMessage.error('网络连接异常，请检查网络')
     })
   }
   catch (e) {
+    if (!sys.websocketConnected) {
+      FtMessage.error('网络连接异常，请检查网络')
+      return
+    }
     console.log(e)
   }
 }
@@ -49,29 +83,45 @@ const loginHandle = async () => {
         <img :src="logo" style="width:20vw" alt="">
       </div>
       <br/>
-      <el-form ref="formRef" :model="sys.loginForm" :rules="rules" style="width: 100%">
-        <div class="input-title">
+      <el-form ref="formRef" class="input-username" :model="loginForm" :rules="rules" style="width: 100%" >
+        <!-- <div class="input-title">
           用户名
-        </div>
-        <el-form-item>
-          <el-input v-model="sys.loginForm.name" v-prevent-keyboard size="large" placeholder="请输入用户名">
+        </div> -->
+        <el-form-item
+          prop="name"
+          :rules="{
+            required: true,
+            message: '输入用户名',
+            trigger: ['blur', 'change'],
+          }"
+        >
+          <el-input v-model="loginForm.name" v-prevent-keyboard size="large" name="name" placeholder="请输入用户名" @focus="openKeyboard">
             <template #prepend>
               <img class="input-icon" :src="user" alt="">
             </template>
           </el-input>
         </el-form-item>
-        <div class="input-title">
+        <!-- <div class="input-title">
           密码
-        </div>
-        <el-form-item>
-          <el-input v-model="sys.loginForm.pwd"  size="large" placeholder="请输入密码" type="password">
+        </div> -->
+        <el-form-item
+          class="input-title"
+          prop="pwd"
+          :rules="{
+            required: true,
+            message: '请输入密码',
+            trigger: ['blur', 'change'],
+          }"
+        >
+          <el-input v-model="loginForm.pwd" v-prevent-keyboard size="large" name="pwd" placeholder="请输入密码" type="password" @focus="openKeyboard">
             <template #prepend>
               <img class="input-icon" :src="password" alt="">
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="input-title">
           <bt-button
+            :loading="loading"
             button-text="登录"
             type="primary"
             height="5vh"
@@ -80,6 +130,15 @@ const loginHandle = async () => {
           />
         </el-form-item>
       </el-form>
+      <SoftKeyboard
+        ref="softKeyboardRef"
+        v-model="inputValue"
+        :is-visible="keyboardVisible"
+        :keyboard-type="keyboardType"
+        @update-keyboard-visible="(visible: boolean) => keyboardVisible = visible"
+        @confirm="keyboardVisible = false"
+        @close="keyboardVisible = false"
+      />
     </div>
   </div>
 </template>
@@ -92,7 +151,7 @@ const loginHandle = async () => {
   align-items: center;
   .login-box-content {
     padding: 50px 50px;
-    background: white;
+    background: linear-gradient(180deg, rgba(250, 252, 255, 0.51) 0%, rgba(255, 255, 255, 0.52) 100%);
     border-radius: 10px;
     display: flex;
     flex-direction: column;
@@ -113,14 +172,22 @@ const loginHandle = async () => {
 .input-icon {
   width: 15px !important;
 }
+.input-username{
+  font-size: 14px;
+  color: #2C3E59;
+  // margin-bottom: 10px;
+  margin-top: 3rem;
+}
 .input-title {
   font-size: 14px;
   color: #2C3E59;
-  margin-bottom: 10px;
+  // margin-bottom: 10px;
+  margin-top: 4rem;
 }
 .login-btn{
   height: 2.5vh;
   display: flex;
   align-items: center;
+  margin-top: 4rem;
 }
 </style>

src/views/seal/index.vue

@@ -28,6 +28,7 @@ const loading = ref(false)
 
 onMounted(() => {
   // initData()
+  systemStore.subscribeSealEvent()
   subscribeSealState()
 })
 
@@ -91,13 +92,6 @@ const onStartTest = () => {
     startPosityveTimer((time) => {
       sealRemainTimeS.value = time
     })
-    // 执行订阅
-    const subParams = {
-      className: 'AirLeakDetectTest',
-      fnName: 'startStateReport',
-      params: {},
-    }
-    syncSendCmd(subParams)
   })
 }
 const onFinishTest = () => {