From bd6fe7818b0f302b9be1b06357db444ac57cfa38 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Fri, 1 Aug 2025 20:00:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8E=A5=E6=94=B6=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E5=92=8C=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/default.vue | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index e36890a..d033d5b 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -26,8 +26,8 @@ const homeStore = useHomeStore()
 const router = useRouter()
 
 onMounted(async () => {
-  socket.init(receiveMessage, 'alarm')
-  socket.init(receiveMessage1, 'warn')
+  socket.init(receiveMessage, 'popup')
+  socket.init(receiveMessage1, 'toast')
   socket.init(receiveMessage2, 'cmd_debug')
   socket.init(receiveMessage2, 'cmd_response')
   if (!systemStore.systemStatus.currentUser) {
@@ -53,19 +53,17 @@ const receiveMessage2 = (data: Socket.cmdData) => {
   }
 }
 
-let flag = false
-
 const receiveMessage1 = (data: any) => {
-  FtMessage.warning(data)
+  FtMessage[data.level](`${data.code}: ${data.msg}`)
 }
 
+let messageBoxInstance: any = null
 const receiveMessage = async (data: any) => {
-  if (flag) {
-    return
+  if (messageBoxInstance) {
+    ElMessageBox.close()
   }
-  flag = true
-  await ElMessageBox.confirm(
-    data,
+  messageBoxInstance = ElMessageBox.confirm(
+    `${data.code}: ${data.msg}`,
     '提示',
     {
       confirmButtonText: '确认',
@@ -73,10 +71,11 @@ const receiveMessage = async (data: any) => {
       showCancelButton: false,
       closeOnClickModal: false,
       closeOnPressEscape: false,
-      type: 'warning',
+      type: data.level,
     },
   )
-  flag = false
+  await messageBoxInstance
+  messageBoxInstance = null
 }
 
 watch (() => isClose.value, async (newVal) => {