diff --git a/src/layouts/default.vue b/src/layouts/default.vue index 68557e3..ca7062e 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -63,7 +63,7 @@ const onFullScreen = () => { } const showDeviceStateName = () => { - if (deviceState.value.state.toLocaleLowerCase() !== 'idle') { + if (deviceState.value.state?.toLocaleLowerCase() !== 'idle') { if (disinfectState.value !== 'idle' && disinfectState.value !== 'finished') { workStateName.value = homeStore.disinfectionState.statedisplayName } diff --git a/src/stores/homeStore.ts b/src/stores/homeStore.ts index 1aaf7a5..7c867b6 100644 --- a/src/stores/homeStore.ts +++ b/src/stores/homeStore.ts @@ -52,18 +52,6 @@ export const useHomeStore = defineStore('home', () => { */ const updateHomeData = (data: Home.DisplayrelyMgr[]) => { data.forEach((item, index) => { - if (allData.value[index]) { - allData.value[index].data.push(item) - // data中的数据只保留最后30条 - if (allData.value[index].data.length > 200) { - allData.value[index].data.shift() - } - } - else { - allData.value.push({ - data: [item], - }) - } h2O2SensorData.value[index] = { ...h2O2SensorData.value[index], ...item, diff --git a/src/views/home/chart.vue b/src/views/home/chart.vue index c13ae56..32495ef 100644 --- a/src/views/home/chart.vue +++ b/src/views/home/chart.vue @@ -116,8 +116,9 @@ const getData = async () => { onMounted(async () => { await getData() poll = setInterval(() => { - if (!operationState.value) { + if (operationState.value) { clearInterval(poll) + return } getData() }, 1000 * 30) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 079513b..ddfc5a8 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -155,8 +155,12 @@ const computedStyle = () => { v-if="deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B" class="card" :class="{ - 'card-center-1': deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B && homeStore.h2O2SensorData.length === 2, - 'card-center-2': deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B && homeStore.h2O2SensorData.length === 4, + 'card-center-1': + deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B + && homeStore.h2O2SensorData.length === 2, + 'card-center-2': + deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B + && homeStore.h2O2SensorData.length === 4, }" >