From 54295ac2c51e89b8925dbde0cc571f088aac1810 Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Tue, 14 Jan 2025 15:20:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Index/Index.vue | 41 ++++++++++++++++++++++++------------ src/pages/Index/Regular/TestTube.vue | 2 +- src/store/modules/device.ts | 9 +++++++- src/websocket/socket.ts | 1 + 4 files changed, 38 insertions(+), 15 deletions(-) diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue index b72bceb..fb4a1fa 100644 --- a/src/pages/Index/Index.vue +++ b/src/pages/Index/Index.vue @@ -99,8 +99,13 @@ -
-
系统:{{ EventText }}
+
+
+ {{ deviceStore.messageState.topMessage.message }} +
@@ -109,6 +114,18 @@
+ + + + + + + import { useRouter } from 'vue-router' import { ref, onMounted, onBeforeUnmount } from 'vue' -import { ElMessage } from 'element-plus' +import { ElMessage, ElDialog } from 'element-plus' import { Time, InitWarn, LoadingModal } from './components/Consumables' import { startWork, @@ -217,12 +234,12 @@ import { import { User } from '../../types/Index' import { useConsumablesStore, useDeviceStore } from '../../store' import { createWebSocket } from '../../websocket/socket' -import type { - AppEventMessage -} from '../../websocket/socket' +import type { AppEventMessage } from '../../websocket/socket' import { getServerInfo } from '../../utils/getServerInfo' import { eventBus } from '../../eventBus' import { logout } from '@/services/Login/login' +// import { formatDate } from '@/utils/formDate' + const selectedTab = ref(sessionStorage.getItem('selectedTab') || '常规') const lineWidth = ref(0) const lineLeft = ref(0) @@ -250,6 +267,8 @@ const ErrorMessage = ref('') const showErrorModal = ref(false) const WarnMessage = ref('') +const showRecentMsgDialog = ref(false) + // WebSocket 实例 const { wsUrl } = getServerInfo('/api/v1/app/ws/event') @@ -272,18 +291,14 @@ const handleAppEvent = (data: AppEventMessage['data']) => { } else if (data.typeName === 'AppIDCardMountEvent') { consumableStore.setIdCardInserted(true) idCardInserted.value = true - EventText.value = 'id卡已插入' + // EventText.value = 'id卡已插入' } else if (data.typeName === 'AppIDCardUnmountEvent') { consumableStore.setIdCardInserted(false) idCardInserted.value = false - EventText.value = 'id卡已拔出' + // EventText.value = 'id卡已拔出' } else if (data.typeName === 'AppTubeholderSettingUpdateEvent') { - EventText.value = '试管架配置更新' + // EventText.value = '试管架配置更新' eventBus.emit('AppTubeSettingUpdateEvent') - } else if (data.typeName === 'DoA8kStepActionEvent') { - EventText.value = data.actionStepName! - } else { - EventText.value = '闲置...' } } diff --git a/src/pages/Index/Regular/TestTube.vue b/src/pages/Index/Regular/TestTube.vue index 5ec1612..08a6677 100644 --- a/src/pages/Index/Regular/TestTube.vue +++ b/src/pages/Index/Regular/TestTube.vue @@ -244,7 +244,7 @@ const getTubeData = async () => { if (res.success) { tubeRacks.value = mockData(res.data) - console.log(tubeRacks.value) + // console.log(tubeRacks.value) } else { ElMessage({ message: '加载试管架数据失败', diff --git a/src/store/modules/device.ts b/src/store/modules/device.ts index 68a6c89..66fe675 100644 --- a/src/store/modules/device.ts +++ b/src/store/modules/device.ts @@ -17,7 +17,14 @@ export const useDeviceStore = defineStore('device', () => { sensorState.value = data } - const messageState = ref(undefined) + const messageState = ref({ + topMessage: { + time: 0, + messageLevel: 'Info', + message: '空闲' + }, + messageBoxList: [] + }) const setMessageState = (data: FooterMessageState['data']) => { messageState.value = data } diff --git a/src/websocket/socket.ts b/src/websocket/socket.ts index b3269b5..1029935 100644 --- a/src/websocket/socket.ts +++ b/src/websocket/socket.ts @@ -50,6 +50,7 @@ interface AppEventMessage extends BaseMessage { export type MsgLevel = 'Info' | 'Warn' | 'Error' export type MsgItem = { + time: number messageLevel: MsgLevel message: string }