From 58c567e1a839a4d81f2eb70f4615ee7a81dbcc89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Thu, 3 Jul 2025 16:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=98=E5=82=A8=E5=88=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/system/ErrorEventsModal.vue |  8 ++++----
 src/layouts/default.vue                    | 32 ++++++++++++++----------------
 src/stores/systemStore.ts                  | 16 ++++++++++-----
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/components/system/ErrorEventsModal.vue b/src/components/system/ErrorEventsModal.vue
index 0ac5eb5..a2c8608 100644
--- a/src/components/system/ErrorEventsModal.vue
+++ b/src/components/system/ErrorEventsModal.vue
@@ -2,13 +2,13 @@
 import { ref, watchEffect } from 'vue'
 
 import { syncSendCmd } from '@/apis/system'
-// import { useDeviceStore } from '@/stores/deviceStore'
+import { useDeviceStore } from '@/stores/deviceStore'
 
-// const deviceStore = useDeviceStore()
+const deviceStore = useDeviceStore()
 const appEvents = ref<Record<string, any>[]>([])
 
 watchEffect(() => {
-  // appEvents.value = deviceStore.deviceStete.appEvents
+  appEvents.value = deviceStore.deviceStete.appEvents
 })
 
 const confirmClose = (item: Record<string, any>) => {
@@ -41,7 +41,7 @@ const confirmClose = (item: Record<string, any>) => {
               {{ checkItem.ecodeInfo }}
             </span>
           </span>
-          <!--          <span v-else>{{ item.description || item.message }}</span> -->
+          <span v-else>{{ item.description || item.message }}</span>
           <div class="actions">
             <button class="delete-button" @click.stop="confirmClose(item)">
               关闭
diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 50f6750..8e428b7 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -151,7 +151,7 @@ const toggleLanguage = () => {
 const statusMap = {
   info: {
     type: 'primary',
-    name: '设备提示信息',
+    name: '设备弹窗信息',
   },
   success: {
     type: 'success',
@@ -234,20 +234,6 @@ const statusMap = {
         </router-view>
       </el-main>
     </el-container>
-    <!--    <footer class="footer">
-      <div class="ip-info">
-        IP : {{ deviceInfo.ip }}
-      </div>
-      <div class="alarm-info">
-        <img :src="HomeAlarmSvg" width="20" alt="报警">
-        <div class="alarm-workState">
-          {{ workStateName || '空闲' }}
-        </div>
-      </div>
-      <div class="time">
-        {{ currentTime }}
-      </div>
-    </footer> -->
     <el-footer class="footer">
       <el-row>
         <el-col :span="6">
@@ -279,8 +265,8 @@ const statusMap = {
                   >
                     <div style="display: flex; justify-content: space-between; width: 100%">
                       <span>
-                        <span>{{ item.name }}: </span>
-                        <span>{{ statusMap[item.status as keyof typeof statusMap].name }}</span>
+                        <span>{{ statusMap[item.status as keyof typeof statusMap].name }}: </span>
+                        <span>{{ item.name }}</span>
                       </span>
                       <span>{{ item.time }}</span>
                     </div>
@@ -392,6 +378,18 @@ const statusMap = {
     background: #fff;
   }
 }
+.log-box {
+  width: 500px;
+  height: 400px;
+  overflow: auto;
+  :deep(.el-tag) {
+    margin: 5px 0;
+    width: 100%;
+    .el-tag__content {
+      width: 100%;
+    }
+  }
+}
 .aside {
   overflow: hidden;
   padding-left: 10px;
diff --git a/src/stores/systemStore.ts b/src/stores/systemStore.ts
index 0ff0e6b..3fb6a99 100644
--- a/src/stores/systemStore.ts
+++ b/src/stores/systemStore.ts
@@ -15,23 +15,29 @@ export const useSystemStore = defineStore('system', () => {
     systemLogList.value.unshift(log)
     systemLogList.value = systemLogList.value.slice(0, 200)
   }
+  const uuids: Set<string> = new Set()
   const insertLogs = (appEvents: System.appEvent[]) => {
     appEvents.forEach((item) => {
-      if (item.type === 'AppCheckPointCheckFailEvent' && item.errCheckPoints) {
+      if (uuids.has(item.uuid)) {
+        return
+      }
+      if (uuids.size > 500) {
+        uuids.clear()
+      }
+      uuids.add(item.uuid)
+      if (item.type === 'AppCheckPointCheckFailEvent' && item.errCheckPoints) { // 传感器检测失败弹窗事件
         item.errCheckPoints.forEach((errCheckPoint) => {
           const log: System.SystemLog = { name: `${errCheckPoint.ecodeInfo}(${errCheckPoint.ecode})`, status: 'check', time: formatDateTime('YYYY-MM-DD HH:mm:ss', Date.now()), uuid: item.uuid }
-          ElMessage.error(errCheckPoint.ecodeInfo)
           insertLog(log)
         })
       }
-      if (item.type === 'AppWarningPromoptEvent') {
+      if (item.type === 'AppWarningPromoptEvent') { // 报警事件
         const log: System.SystemLog = { name: item.description || '', status: 'warn', time: formatDateTime('YYYY-MM-DD HH:mm:ss', Date.now()), uuid: item.uuid }
         ElMessage.warning(item.description)
         insertLog(log)
       }
-      if (item.type === 'AppPromoptEvent') {
+      if (item.type === 'AppPromoptEvent') { // 普通弹窗事件
         const log: System.SystemLog = { name: item.message || '', status: 'info', time: formatDateTime('YYYY-MM-DD HH:mm:ss', Date.now()), uuid: item.uuid }
-        ElMessage.warning(item.message)
         insertLog(log)
       }
     })