From bf418230ad7a58446b2989ed55d4642c863d3d6f Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 14 Feb 2026 19:15:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=9A=E7=9F=A5=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=96=B0=E5=A2=9E=E6=9C=AA=E8=AF=BB=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E6=98=BE=E7=A4=BA=E5=B9=B6=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NoticeDropdown/index.vue    |  4 ++--
 src/components/NoticeDropdown/useNotice.ts | 13 +++++++++++++
 src/types/api/role.ts                      |  6 ++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/NoticeDropdown/index.vue b/src/components/NoticeDropdown/index.vue
index 48d83afd..4b68acc2 100644
--- a/src/components/NoticeDropdown/index.vue
+++ b/src/components/NoticeDropdown/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dropdown class="notice__dropdown" trigger="click">
     <div class="notice__trigger">
-      <el-badge v-if="list.length > 0" :value="list.length" :max="99">
+      <el-badge v-if="unreadTotal > 0" :value="unreadTotal" :max="99">
         <div class="i-svg:bell" />
       </el-badge>
 
@@ -78,7 +78,7 @@
 <script setup lang="ts">
 import { useNotice } from "./useNotice";
 
-const { list, detail, dialogVisible, read, readAll, goMore } = useNotice();
+const { list, unreadTotal, detail, dialogVisible, read, readAll, goMore } = useNotice();
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/NoticeDropdown/useNotice.ts b/src/components/NoticeDropdown/useNotice.ts
index d1fce09c..6dd184b2 100644
--- a/src/components/NoticeDropdown/useNotice.ts
+++ b/src/components/NoticeDropdown/useNotice.ts
@@ -14,6 +14,7 @@ export function useNotice() {
 
   // 状态
   const list = ref<NoticeItem[]>([]);
+  const unreadTotal = ref(0);
   const detail = ref<NoticeDetail | null>(null);
   const dialogVisible = ref(false);
 
@@ -32,6 +33,7 @@ export function useNotice() {
     };
     const page = await NoticeAPI.getMyNoticePage(query);
     list.value = page.list || [];
+    unreadTotal.value = page.total ?? 0;
   }
 
   async function read(id: string) {
@@ -41,11 +43,15 @@ export function useNotice() {
     // 从列表中移除已读项
     const idx = list.value.findIndex((item: NoticeItem) => item.id === id);
     if (idx >= 0) list.value.splice(idx, 1);
+    if (unreadTotal.value > 0) unreadTotal.value -= 1;
+
+    await fetchList();
   }
 
   async function readAll() {
     await NoticeAPI.readAll();
     list.value = [];
+    unreadTotal.value = 0;
     ElMessage.success("已全部标记为已读");
   }
 
@@ -68,6 +74,8 @@ export function useNotice() {
         // 避免重复
         if (list.value.some((item: NoticeItem) => item.id === data.id)) return;
 
+        unreadTotal.value += 1;
+
         list.value.unshift({
           id: data.id,
           title: data.title,
@@ -75,6 +83,10 @@ export function useNotice() {
           publishTime: data.publishTime,
         } as NoticeItem);
 
+        if (list.value.length > PAGE_SIZE) {
+          list.value.length = PAGE_SIZE;
+        }
+
         ElNotification({
           title: "您收到一条新的通知消息！",
           message: data.title,
@@ -105,6 +117,7 @@ export function useNotice() {
 
   return {
     list,
+    unreadTotal,
     detail,
     dialogVisible,
     fetchList,
diff --git a/src/types/api/role.ts b/src/types/api/role.ts
index 26ead5ee..2128ff24 100644
--- a/src/types/api/role.ts
+++ b/src/types/api/role.ts
@@ -22,8 +22,10 @@ export interface RoleItem {
   sort?: number;
   /** 角色状态 */
   status?: number;
-  /** 创建时间 */
-  createTime?: Date;
+  /** 数据权限(1-所有数据 2-部门及子部门数据 3-本部门数据 4-本人数据 5-自定义部门数据) */
+  dataScope?: number;
+  /** 数据权限标签 */
+  dataScopeLabel?: string;
   /** 修改时间 */
   updateTime?: Date;
 }