diff --git a/src/components/Operator.vue b/src/components/Operator.vue index 9213a3d..cd8f8af 100644 --- a/src/components/Operator.vue +++ b/src/components/Operator.vue @@ -561,7 +561,7 @@ const changeLogVal = val => { localStorage.setItem('logVal', val) logVisible.value = false } -const envirVal = ref('1') +const envirVal = ref('0') const changeEnvirVal = val => { envirVal.value = val envirVisible.value = false diff --git a/src/components/SealTest.vue b/src/components/SealTest.vue index 751390d..fcab8fc 100644 --- a/src/components/SealTest.vue +++ b/src/components/SealTest.vue @@ -45,7 +45,9 @@
测试时间
-
{{ resultTime ? resultTime : '未开始' }}
+
+ {{ resultTime ? resultTime : '未开始' }} +
气压差值
@@ -166,30 +168,35 @@ const n_hour = ref(0) // 时 const resultTime = ref('') const timerStart = ref(null) +const timerReal = () => { + var str_sec = n_sec.value + var str_min = n_min.value + var str_hour = n_hour.value + if (n_sec.value < 10) { + str_sec = '0' + n_sec.value + } + if (n_min.value < 10) { + str_min = '0' + n_min.value + } + if (n_hour.value < 10) { + str_hour = '0' + n_hour.value + } + resultTime.value = str_hour + ':' + str_min + ':' + str_sec + n_sec.value = n_sec.value + 1 + if (n_sec.value > 59) { + n_sec.value = 0 + n_min.value = n_min.value + 1 + } + if (n_min.value > 59) { + n_min.value = 0 + n_hour.value = n_hour.value + 1 + } +} + const timerFunc = () => { + timerReal() timerStart.value = setInterval(() => { - var str_sec = n_sec.value - var str_min = n_min.value - var str_hour = n_hour.value - if (n_sec.value < 10) { - str_sec = '0' + n_sec.value - } - if (n_min.value < 10) { - str_min = '0' + n_min.value - } - if (n_hour.value < 10) { - str_hour = '0' + n_hour.value - } - resultTime.value = str_hour + ':' + str_min + ':' + str_sec - n_sec.value = n_sec.value + 1 - if (n_sec.value > 59) { - n_sec.value = 0 - n_min.value = n_min.value + 1 - } - if (n_min.value > 59) { - n_min.value = 0 - n_hour.value = n_hour.value + 1 - } + timerReal() }, 1000) } @@ -213,9 +220,9 @@ const handleStartTest = flag => { if (flag == '1') { // 改变测试前oldAirPressure为测试前气压值 // 也就是将getState中获取的当前值currentAirPressure赋予 - sealStore.updateOldAirPressure(sealStore.currentAirPressure) // 开始测试需要记录时间 timerFunc() + sealStore.updateOldAirPressure(sealStore.currentAirPressure) sealStore.updateIsStartTest(true) } if (flag == '2') { diff --git a/src/components/dialogs/EnvirPicker.vue b/src/components/dialogs/EnvirPicker.vue index a73d3eb..ada56ba 100644 --- a/src/components/dialogs/EnvirPicker.vue +++ b/src/components/dialogs/EnvirPicker.vue @@ -6,8 +6,8 @@
@@ -50,8 +50,9 @@ const props = defineProps({ }) const columns = ref([ + { text: '正常环境', value: '0' }, { text: '正压环境', value: '1' }, - { text: '负压环境', value: '2' }, + { text: '负压环境', value: '-1' }, ]) const chooseLog = () => { @@ -62,7 +63,7 @@ const handleClickClose = () => { props.hiddenLogVisible() } -const selectedValues = ref(['1']) +const selectedValues = ref(['0']) watch(() => { selectedValues.value = [props.logVal] diff --git a/src/store/modules/websocket.js b/src/store/modules/websocket.js index 63a80c9..9ce89c4 100644 --- a/src/store/modules/websocket.js +++ b/src/store/modules/websocket.js @@ -11,6 +11,7 @@ import { useFormulaStore } from './formula' import { useHistoryStore } from './history' import { useEchartsStore } from './echarts' import { useRunningStore } from './running' +import { useSealStore } from './seal' import { showSuccessToast, showFailToast } from 'vant' import { saveEchartsDataToLocal } from '@/utils' @@ -40,6 +41,7 @@ export const useWebSocketStore = defineStore({ const formulaStore = useFormulaStore() const runningStore = useRunningStore() const historyStore = useHistoryStore() + const sealStore = useSealStore() init.connect() init.ws.onmessage = function (ev) { const { messageId, timeStamp } = JSON.parse(ev.data) @@ -87,6 +89,7 @@ export const useWebSocketStore = defineStore({ chargingPumpRPM, sprinklerPumpRPM, sprinklerPumpGPM, + pressure, } = sensor_data const { nowlog, targetlog } = disinfectionState || {} deviceStore.updateTargetLog(targetlog) @@ -100,6 +103,7 @@ export const useWebSocketStore = defineStore({ } else { operatorStore.updateStopReady(false) } + sealStore.updateCurrentAirPressure(pressure[1]) settingStore.updateSprinklerPumpGPM(sprinklerPumpGPM) settingStore.updateChargingPumpRPM(chargingPumpRPM) settingStore.updateSprinklerPumpRPM(sprinklerPumpRPM)