diff --git a/src/composables/useZMQJsonWorker.ts b/src/composables/useZMQJsonWorker.ts index 064b23d..7aeb5b1 100644 --- a/src/composables/useZMQJsonWorker.ts +++ b/src/composables/useZMQJsonWorker.ts @@ -8,6 +8,7 @@ import type { ZmqMessage } from '@/utils/zmq' import webWorker from '@/utils/zmqJsonWorker?worker' +import dayjs from "dayjs"; const env = import.meta.env let defaultHost = env.VITE_ZMQ_BASE_URL @@ -121,7 +122,8 @@ class ZMQJsonWorker { private handleMessage(e: MessageEvent) { const { cmd, msg, topic, community } = e.data; - console.log(e.data) + // const now = dayjs().format('YYYY-MM-DD HH:mm:ss') + // console.log(now, e.data) if (cmd === ZmqCMD.STATUS) { const status = community ? 'disconnected' : 'connected'; if (this.statusCallback) { diff --git a/src/stores/transferData.ts b/src/stores/transferData.ts index 240e383..5364f1d 100644 --- a/src/stores/transferData.ts +++ b/src/stores/transferData.ts @@ -4,12 +4,14 @@ import type { IOnlineDevice, IUpFirmwareStatus } from '@/views/stationData/type' import ZMQWorker from '@/composables/useZMQJsonWorker' import { getSubTopic, type SubMsgData } from '@/utils/zmq' import { getDeviceTopic } from '@/views/stationData/utils' + export const useTransferDataStore = defineStore('transfer', () => { const subDevices = getSubTopic('client', 'status', 'transfer') const worker = ZMQWorker.getInstance() const isConnected = ref(false) const connectSite = ref(null) + async function initConnectSite() { if (connectSite.value) return connectSite.value = { @@ -21,11 +23,12 @@ export const useTransferDataStore = defineStore('transfer', () => { const devicesMap = reactive(new Map()) const checkDeviceStatusInterval = ref() + function checkDeviceStatus() { checkDeviceStatusInterval.value = setInterval(() => { const now = Date.now(); devicesMap.forEach((device: IOnlineDevice, sn) => { - if (now - device.lastUpdated > 5000) { + if (now - device.lastUpdated > 5500) { device.status = '离线'; } }); @@ -97,7 +100,6 @@ export const useTransferDataStore = defineStore('transfer', () => { }) - function upFirmwareStatus(sn: string, feedback: any[]) { const device = devicesMap.get(sn) if (device) { diff --git a/src/views/stationData/index.vue b/src/views/stationData/index.vue index bfe2fa1..ba355c6 100644 --- a/src/views/stationData/index.vue +++ b/src/views/stationData/index.vue @@ -1,7 +1,8 @@