Browse Source

fix: 图表判断

master
guoapeng 2 weeks ago
parent
commit
1f9473a6f2
  1. 2
      src/layouts/default.vue
  2. 12
      src/stores/homeStore.ts
  3. 3
      src/views/home/chart.vue
  4. 18
      src/views/home/index.vue

2
src/layouts/default.vue

@ -63,7 +63,7 @@ const onFullScreen = () => {
} }
const showDeviceStateName = () => { const showDeviceStateName = () => {
if (deviceState.value.state.toLocaleLowerCase() !== 'idle') {
if (deviceState.value.state?.toLocaleLowerCase() !== 'idle') {
if (disinfectState.value !== 'idle' && disinfectState.value !== 'finished') { if (disinfectState.value !== 'idle' && disinfectState.value !== 'finished') {
workStateName.value = homeStore.disinfectionState.statedisplayName workStateName.value = homeStore.disinfectionState.statedisplayName
} }

12
src/stores/homeStore.ts

@ -52,18 +52,6 @@ export const useHomeStore = defineStore('home', () => {
*/ */
const updateHomeData = (data: Home.DisplayrelyMgr[]) => { const updateHomeData = (data: Home.DisplayrelyMgr[]) => {
data.forEach((item, index) => { 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] = {
...h2O2SensorData.value[index], ...h2O2SensorData.value[index],
...item, ...item,

3
src/views/home/chart.vue

@ -116,8 +116,9 @@ const getData = async () => {
onMounted(async () => { onMounted(async () => {
await getData() await getData()
poll = setInterval(() => { poll = setInterval(() => {
if (!operationState.value) {
if (operationState.value) {
clearInterval(poll) clearInterval(poll)
return
} }
getData() getData()
}, 1000 * 30) }, 1000 * 30)

18
src/views/home/index.vue

@ -155,8 +155,12 @@ const computedStyle = () => {
v-if="deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B" v-if="deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B"
class="card" class="card"
:class="{ :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,
}" }"
> >
<template #default> <template #default>
@ -179,8 +183,14 @@ const computedStyle = () => {
:key="item.sensorId" :key="item.sensorId"
class="card" class="card"
:class="{ :class="{
'card-center-1': index === 0 && deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B && homeStore.h2O2SensorData.length === 3,
'card-center-2': index === 0 && deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B && homeStore.h2O2SensorData.length === 5,
'card-center-1':
index === 0
&& deviceStore.deviceInfo.deviceType === deviceStore.deviceTypeMap.LargeSpaceDM_B
&& homeStore.h2O2SensorData.length === 3,
'card-center-2':
index === 0
&& deviceStore.deviceInfo.deviceType !== deviceStore.deviceTypeMap.LargeSpaceDM_B
&& homeStore.h2O2SensorData.length === 5,
}" }"
> >
<Environment :env-params="item" /> <Environment :env-params="item" />

Loading…
Cancel
Save