diff --git a/src/components/info/EnvironmentInfo.vue b/src/components/info/EnvironmentInfo.vue index e566c9f..e83ce98 100644 --- a/src/components/info/EnvironmentInfo.vue +++ b/src/components/info/EnvironmentInfo.vue @@ -66,9 +66,11 @@ const { envirTemperature1, envirHumidity1, envirHP1, + envSaturation1, envirTemperature2, envirHumidity2, envirHP2, + envSaturation2 } = storeToRefs(deviceStore) const props = defineProps({ cardType: { @@ -130,10 +132,10 @@ const getSaturation = () => { return binSaturation } if (props.cardType == 2) { - return 0 + return envSaturation1 } if (props.cardType == 3) { - return 0 + return envSaturation2 } } diff --git a/src/store/modules/device.js b/src/store/modules/device.js index 75dc50e..8ec1112 100644 --- a/src/store/modules/device.js +++ b/src/store/modules/device.js @@ -19,12 +19,16 @@ export const useDeviceStore = defineStore({ envirHumidity1: 0, // 环境一 过氧化氢浓度 envirHP1: 0, + // 环境一 相对饱和度 + envSaturation1 : 0, // 环境二 温度 envirTemperature2: 0, // 环境二 湿度 envirHumidity2: 0, // 环境二 过氧化氢浓度 envirHP2: 0, + // 环境二 相对饱和度 + envSaturation2 : 0, // 仓内过氧化氢相对饱和度 binSaturation: 0, // 剩余log @@ -101,6 +105,13 @@ export const useDeviceStore = defineStore({ } this.envirHP1 = envirHP1 }, + updateEnvSaturation1(envSaturation1) { + if (envSaturation1 < 0) { + this.envSaturation1 = 0 + return + } + this.envSaturation1 = envSaturation1 + }, updateEnvirTemperature2(envirTemperature2) { if (envirTemperature2 < 0) { this.envirTemperature2 = 0 @@ -122,5 +133,12 @@ export const useDeviceStore = defineStore({ } this.envirHP2 = envirHP2 }, + updateEnvSaturation2(envSaturation2) { + if (envSaturation2 < 0) { + this.envSaturation2 = 0 + return + } + this.envSaturation2 = envSaturation2 + }, }, }) diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 63a80c9..4504f05 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -73,6 +73,8 @@ export const useWebSocketStore = defineStore({ humid_2, humid_3, saturation_1, + saturation_2, + saturation_3, temp_1, temp_2, temp_3, @@ -128,9 +130,11 @@ export const useWebSocketStore = defineStore({ deviceStore.updateEnvirTemperature1(temp_2) deviceStore.updateEnvirHumidity1(humid_2) deviceStore.updateEnvirHP1(h2o2_2) + deviceStore.updateEnvSaturation1(saturation_2) deviceStore.updateEnvirTemperature2(temp_3) deviceStore.updateEnvirHumidity2(humid_3) deviceStore.updateEnvirHP2(h2o2_3) + deviceStore.updateEnvSaturation2(saturation_3) userStore.updatePermission(permissionLevel) settingStore.updateInitLoading()