From 530c8e4742978a25d2358561d55a4add144e9c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Mon, 7 Jul 2025 00:52:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E6=8A=A5?=
 =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/default.vue   | 94 ++++++++++++++++++++++++++++++++++++++---------
 src/stores/systemStore.ts | 57 +++++++++++++---------------
 2 files changed, 103 insertions(+), 48 deletions(-)

diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 79c95fa..e171baf 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { syncSendCmd } from 'apis/system'
 import WifiConnSvg from 'assets/images/wifi-conn.svg'
 import WifiUnconnSvg from 'assets/images/wifi-unconn.svg'
-import ErrorEventsModal from 'components/system/ErrorEventsModal.vue'
 import NetReconnection from 'components/system/NetReconnection.vue'
 import { delToken } from 'libs/token'
 import { formatDateTime } from 'libs/utils'
@@ -17,6 +17,8 @@ import { useHomeStore } from '@/stores/homeStore'
 import { useLiquidStore } from '@/stores/liquidStore'
 import { useSealStore } from '@/stores/sealStore'
 import { useSystemStore } from '@/stores/systemStore'
+import SystemLog = System.SystemLog
+import { ElMessageBox } from 'element-plus'
 
 // const routes = generateRoutes()
 // const childrenRoutes = routes.find(r => r.path === '/')?.children || []
@@ -166,7 +168,6 @@ const toggleLanguage = () => {
   locale.value = locale.value === 'zh' ? 'en' : 'zh'
   localStorage.setItem('locale', locale.value) // 保存到本地存储
 }
-
 const statusMap = {
   info: {
     type: 'info',
@@ -185,6 +186,43 @@ const statusMap = {
     name: '设备告警信息',
   },
 }
+const handleClose = async (item: SystemLog, key: number) => {
+  console.log('item === ', item)
+  const evenid = item.uuid
+  const params = {
+    className: 'AppCore',
+    fnName: 'appEventConfirm',
+    params: {
+      evenid,
+    },
+  }
+  await syncSendCmd(params)
+  systemStore.systemLogList.splice(key, 1)
+}
+const handleCloseAll = async () => {
+  await ElMessageBox.confirm(
+    '确认关闭所有？',
+    'Warning',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+  for (let i = 0; i < systemStore.systemLogList.length; i++) {
+    const item = systemStore.systemLogList[i]
+    const evenid = item.uuid
+    const params = {
+      className: 'AppCore',
+      fnName: 'appEventConfirm',
+      params: {
+        evenid,
+      },
+    }
+    await syncSendCmd(params)
+  }
+  systemStore.systemLogList = []
+}
 </script>
 
 <template>
@@ -260,7 +298,7 @@ const statusMap = {
             IP : {{ deviceInfo.ip }}
           </div>
         </el-col>
-        <el-col :span="12" class="warning-border">
+        <el-col :span="12" :class="systemStore?.systemLogList.length > 0 ? 'warning-border' : ''">
           <div class="footer-left">
             <img src="../assets/images/run.svg" alt="" style="padding-right: 5px">
             <span v-if="!systemStore.systemLogList.length" class="text">设备运行状态</span>
@@ -277,19 +315,28 @@ const statusMap = {
               </template>
               <template #default>
                 <div class="log-box">
-                  <el-tag
-                    v-for="(item, key) in systemStore.systemLogList"
-                    :key
-                    :type="statusMap[item?.status as keyof typeof statusMap].type"
-                  >
-                    <div style="display: flex; justify-content: space-between; width: 100%">
-                      <span>
-                        <span>{{ statusMap[item.status as keyof typeof statusMap].name }}: </span>
-                        <span>{{ item.name }}</span>
-                      </span>
-                      <span>{{ item.time }}</span>
-                    </div>
-                  </el-tag>
+                  <div class="tag-box">
+                    <el-tag
+                      v-for="(item, key) in systemStore.systemLogList"
+                      :key
+                      :type="statusMap[item?.status as keyof typeof statusMap].type"
+                      closable
+                      @close="handleClose(item, key)"
+                    >
+                      <div style="display: flex; justify-content: space-between; width: 100%">
+                        <span>
+                          <span>{{ statusMap[item.status as keyof typeof statusMap].name }}: </span>
+                          <span>{{ item.name }}</span>
+                        </span>
+                        <span>{{ item.time }}</span>
+                      </div>
+                    </el-tag>
+                  </div>
+                  <div class="close-btn">
+                    <el-button type="primary" @click="handleCloseAll">
+                      关闭所有
+                    </el-button>
+                  </div>
                 </div>
               </template>
             </el-popover>
@@ -303,7 +350,7 @@ const statusMap = {
       </el-row>
     </el-footer>
     <NetReconnection />
-    <ErrorEventsModal />
+    <!--    <ErrorEventsModal /> -->
   </el-container>
 </template>
 
@@ -408,6 +455,19 @@ const statusMap = {
       width: 100%;
     }
   }
+  .close-btn{
+   display: flex;
+    justify-content: center;
+    align-items: flex-end;
+    margin-top: 12px;
+  }
+  .tag-box{
+    height: 350px;
+    overflow: auto;
+  }
+}
+:deep(.el-popover) {
+  padding: 10px!important;
 }
 .aside {
   overflow: hidden;
diff --git a/src/stores/systemStore.ts b/src/stores/systemStore.ts
index 4c9d0fd..a2424aa 100644
--- a/src/stores/systemStore.ts
+++ b/src/stores/systemStore.ts
@@ -15,48 +15,43 @@ export const useSystemStore = defineStore(
       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 (uuids.has(item.uuid)) {
-          return
-        }
-        if (uuids.size > 500) {
-          uuids.clear()
-        }
-        uuids.add(item.uuid)
-        if (item.type === 'AppCheckPointCheckFailEvent' && item.errCheckPoints) {
+        const log = systemLogList.value.find(log => log.uuid === item.uuid)
+        if (!log) {
+          if (item.type === 'AppCheckPointCheckFailEvent' && item.errCheckPoints) {
           // 传感器检测失败弹窗事件
-          item.errCheckPoints.forEach((errCheckPoint) => {
+            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,
+              }
+              insertLog(log)
+            })
+          }
+          if (item.type === 'AppWarningPromoptEvent') {
+          // 报警事件
             const log: System.SystemLog = {
-              name: `${errCheckPoint.ecodeInfo}(${errCheckPoint.ecode})`,
-              status: 'check',
+              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 === '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,
+            const log: System.SystemLog = {
+              name: item.message || '',
+              status: 'check',
+              time: formatDateTime('YYYY-MM-DD HH:mm:ss', Date.now()),
+              uuid: item.uuid,
+            }
+            insertLog(log)
           }
-          insertLog(log)
         }
       })
     }