From 2c5b9d4fccf621933fd52e0f79da1239b61d624a Mon Sep 17 00:00:00 2001
From: Ironsp <1522278303@qq.com>
Date: Mon, 25 May 2026 10:19:50 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=9F=A5=E7=9C=8B=E7=94=BB=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue       | 10 ++++++++--
 src/layout/components/notice/index.vue | 25 ++++++++-----------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 469f4ba..343f47f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -35,12 +35,14 @@
           </div>
         </el-tooltip> -->
         <!-- 消息 -->
-        <el-tooltip :content="proxy.$t('navbar.message')" effect="dark" placement="bottom">
+        <el-tooltip content="警报" effect="dark" placement="bottom">
           <div style="display: flex; align-items: center">
             <el-popover placement="bottom" trigger="click" transition="el-zoom-in-top" :width="300" :persistent="false">
               <template #reference>
                 <el-badge :value="newNotice > 0 ? newNotice : ''" :max="99">
-                  <div class="right-menu-item hover-effect"><svg-icon icon-class="message" /></div>
+                  <div class="right-menu-item hover-effect" @click="goToWarningList">
+                    <el-icon><BellFilled /></el-icon>
+                  </div>
                 </el-badge>
               </template>
               <template #default>
@@ -215,6 +217,10 @@ watch(
 const refresh = () => {
   proxy?.$tab.refreshPage();
 };
+
+const goToWarningList = () => {
+  router.push('/warningList/list');
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/components/notice/index.vue b/src/layout/components/notice/index.vue
index a810e53..aa1d580 100644
--- a/src/layout/components/notice/index.vue
+++ b/src/layout/components/notice/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="state.loading" class="layout-navbars-breadcrumb-user-news">
     <div class="head-box">
-      <div class="head-box-title">通知公告</div>
+      <div class="head-box-title"><p style="color: red; font-size: 16px; font-weight: 800">入侵警告</p></div>
       <!-- <div class="head-box-btn" @click="readAll">全部已读</div> -->
     </div>
     <div v-loading="state.loading" class="content-box">
@@ -14,8 +14,8 @@
             <div class="content-box-time">{{ v.time }}</div>
           </div>
           <!-- 已读/未读 -->
-          <span v-if="v.read" class="el-tag el-tag--success el-tag--mini read">已读</span>
-          <span v-else class="el-tag el-tag--danger el-tag--mini read">未读</span>
+          <!-- <span v-if="v.read" class="el-tag el-tag--success el-tag--mini read">已读</span> -->
+          <span v-if="!v.read" class="el-tag el-tag--danger el-tag--mini read">查看画面</span>
         </div>
       </template>
       <el-empty v-else :description="'消息为空'"></el-empty>
@@ -38,26 +38,17 @@ const state = reactive({
 const newsList = ref([]) as any;
 
 /**
- * 过滤5分钟内的消息（最多5条）
+ * 过滤消息（只保留最新的5条）
  * @param messages 消息列表
  * @returns 过滤后的消息列表
  */
 const filterMessages = (messages: any[]) => {
-  const now = new Date().getTime();
-  const fiveMinutesAgo = now - 5 * 60 * 1000; // 5分钟前的时间戳
-
-  // 过滤掉5分钟前的消息
-  const recentMessages = messages.filter((msg: any) => {
-    const msgTime = new Date(msg.time).getTime();
-    return msgTime >= fiveMinutesAgo;
-  });
-
-  // 如果5分钟内的消息超过5条，则只保留最新的5条
-  if (recentMessages.length > 5) {
-    return recentMessages.slice(0, 5); // 只取前5条最新消息
+  // 如果消息超过5条，则只保留最新的5条
+  if (messages.length > 5) {
+    return messages.slice(0, 5); // 只取前5条最新消息
   }
 
-  return recentMessages;
+  return messages;
 };
 
 /**