Browse Source

延时1s的问题

master
maochaoying 2 years ago
parent
commit
abdd28cb15
  1. 2
      src/components/Operator.vue
  2. 55
      src/components/SealTest.vue
  3. 9
      src/components/dialogs/EnvirPicker.vue
  4. 4
      src/store/modules/websocket.js

2
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

55
src/components/SealTest.vue

@ -45,7 +45,9 @@
<div class="oper_box">
<div class="emp_box">
<div class="title">测试时间</div>
<div class="num">{{ resultTime ? resultTime : '未开始' }}</div>
<div class="num">
{{ resultTime ? resultTime : '未开始' }}
</div>
</div>
<div class="emp_box">
<div class="title">气压差值</div>
@ -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
// getStatecurrentAirPressure
sealStore.updateOldAirPressure(sealStore.currentAirPressure)
//
timerFunc()
sealStore.updateOldAirPressure(sealStore.currentAirPressure)
sealStore.updateIsStartTest(true)
}
if (flag == '2') {

9
src/components/dialogs/EnvirPicker.vue

@ -6,8 +6,8 @@
<van-picker
:columns="columns"
:show-toolbar="false"
visible-option-num="2"
option-height="48"
visible-option-num="3"
option-height="42"
v-model="selectedValues"
/>
</div>
@ -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]

4
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)

Loading…
Cancel
Save