From 6b31cd21bf7d7a2076a558494fee4edbf7f4af58 Mon Sep 17 00:00:00 2001 From: guoapeng Date: Wed, 2 Jul 2025 20:57:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/homeStore.ts | 28 +++++++++++++++++----------- src/stores/systemStore.ts | 2 +- src/views/home/index.vue | 6 ++++++ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/stores/homeStore.ts b/src/stores/homeStore.ts index 7dd0279..74db936 100644 --- a/src/stores/homeStore.ts +++ b/src/stores/homeStore.ts @@ -6,15 +6,17 @@ import { computed, ref } from 'vue' import { DEVICE_STATES } from '@/libs/utils' // 传感器数据初始值 -const h2O2Data: Home.DisplayrelyMgrParams[] = [{ - type: 'inside', - title: '仓内', - temp: 0, - rh: 0, - rs: 0, - h2o2: 0, - chartId: 'inside', -}] +const h2O2Data: Home.DisplayrelyMgrParams[] = [ + { + type: 'inside', + title: '仓内', + temp: 0, + rh: 0, + rs: 0, + h2o2: 0, + chartId: 'inside', + }, +] // 消毒状态初始值 const initDisinfectState = { @@ -47,6 +49,7 @@ export const useHomeStore = defineStore('home', () => { * @desc 更新环境传感器数据(温度、湿度、过氧化氢浓度等) */ const updateHomeData = (data: Home.DisplayrelyMgrs) => { + console.log('updateHomeData', data) const sensordata = data.sensordata if (sensordata && sensordata.length) { sensordata.forEach((item, index) => { @@ -98,7 +101,7 @@ export const useHomeStore = defineStore('home', () => { disinfectionState.value = disinfectState if (!renderTimer) { renderTimer = setTimeout(() => { - h2O2SensorData.value = [...disinfectionState.value.h2o2SensorData]// 创建副本 + h2O2SensorData.value = [...disinfectionState.value.h2o2SensorData] // 创建副本 // updateHomeData(disinfectionState.value.h2o2SensorData) renderTimer = null }, 3000) as unknown as NodeJS.Timeout // 类型断言兼容不同环境 @@ -120,7 +123,10 @@ export const useHomeStore = defineStore('home', () => { * @desc 判断设备是否处于空闲或已完成状态 */ const isDeviceIdle = computed(() => { - return disinfectionState.value.state.toLocaleLowerCase() === DEVICE_STATES.IDLE || disinfectionState.value.state === DEVICE_STATES.FINISHED + return ( + disinfectionState.value.state.toLocaleLowerCase() === DEVICE_STATES.IDLE + || disinfectionState.value.state === DEVICE_STATES.FINISHED + ) }) const updateDefaultIntensityValue = (value: number) => { diff --git a/src/stores/systemStore.ts b/src/stores/systemStore.ts index 2006b65..f6e97b1 100644 --- a/src/stores/systemStore.ts +++ b/src/stores/systemStore.ts @@ -11,7 +11,7 @@ export const useSystemStore = defineStore('system', () => { const loginForm = ref({ name: import.meta.env.FT_NODE_ENV !== 'prod' ? 'admin' : '', - pwd: import.meta.env.FT_NODE_ENV !== 'prod' ? '123' : '', + pwd: import.meta.env.FT_NODE_ENV !== 'prod' ? '9973' : '', }) const languages = [ diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 3fcf6de..bde1bf6 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -43,6 +43,7 @@ watchEffect(() => { liquidInfo.value = liquidStore.liquidStateData loading.value = systemStore.loading if (homeStore.h2O2SensorData && homeStore.h2O2SensorData.length) { + console.log('homeStore.h2O2SensorData', homeStore.h2O2SensorData) environmentParams.value = { ...homeStore.h2O2SensorData[0], title: '仓内', @@ -58,6 +59,11 @@ watchEffect(() => { if (homeStore.h2O2SensorData.length === 3) { probe1Params.value = { + ...homeStore.h2O2SensorData[1], + title: '探头1', + type: 'env1', + } + probe2Params.value = { ...homeStore.h2O2SensorData[2], title: '探头2', type: 'env2',