From 4216374c9c4a2eff3537f81d46cce568dff06f19 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 20 Mar 2026 10:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=B0=E5=A2=9E=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/notice.js                     |  28 ++-
 src/assets/icons/svg/bell.svg                |   1 +
 src/layout/components/HeaderNotice/index.vue | 237 +++++++++++++++++++
 src/layout/components/Navbar.vue             |  10 +-
 4 files changed, 270 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/icons/svg/bell.svg
 create mode 100644 src/layout/components/HeaderNotice/index.vue

diff --git a/src/api/system/notice.js b/src/api/system/notice.js
index 737fc16..c620e47 100644
--- a/src/api/system/notice.js
+++ b/src/api/system/notice.js
@@ -41,4 +41,30 @@ export function delNotice(noticeId) {
     url: '/system/notice/' + noticeId,
     method: 'delete'
   })
-}
\ No newline at end of file
+}
+
+// 首页顶部公告列表（带已读状态）
+export function listNoticeTop() {
+  return request({
+    url: '/system/notice/listTop',
+    method: 'get'
+  })
+}
+
+// 标记公告已读
+export function markNoticeRead(noticeId) {
+  return request({
+    url: '/system/notice/markRead',
+    method: 'post',
+    params: { noticeId }
+  })
+}
+
+// 批量标记已读
+export function markNoticeReadAll(ids) {
+  return request({
+    url: '/system/notice/markReadAll',
+    method: 'post',
+    params: { ids }
+  })
+}
diff --git a/src/assets/icons/svg/bell.svg b/src/assets/icons/svg/bell.svg
new file mode 100644
index 0000000..a7320a0
--- /dev/null
+++ b/src/assets/icons/svg/bell.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1773923748724" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5930" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 212l48.8 12c101.6 24.8 176 117.6 176 220.8v254.4l18.4 18.4 24.8 25.6h-536l24.8-25.6 18.4-18.4V444.8c0-103.2 73.6-196.8 176-220.8l48.8-12M512 64c-36.8 0-64 30.4-64 68v30.4C320.8 192 223.2 307.2 223.2 444.8v228.8L136 763.2v44.8h752v-44.8l-87.2-89.6V444.8c0-137.6-97.6-252.8-224.8-283.2v-28.8c0-32-17.6-60.8-48-67.2-5.6-1.6-11.2-1.6-16-1.6z m88 808H424c0 49.6 38.4 88 88 88s88-38.4 88-88z" p-id="5931"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/HeaderNotice/index.vue b/src/layout/components/HeaderNotice/index.vue
new file mode 100644
index 0000000..9e33528
--- /dev/null
+++ b/src/layout/components/HeaderNotice/index.vue
@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <el-popover ref="noticePopover" placement="bottom-end" :width="320" trigger="manual" v-model:visible="noticeVisible" popper-class="notice-popover">
+      <!-- 弹出内容 -->
+      <div class="notice-header">
+        <span class="notice-title">通知公告</span>
+        <span class="notice-mark-all" @click="markAllRead">全部已读</span>
+      </div>
+      <div v-if="noticeLoading" class="notice-loading">
+        <el-icon class="is-loading"><Loading /></el-icon> 加载中...
+      </div>
+      <div v-else-if="noticeList.length === 0" class="notice-empty">
+        <el-icon style="font-size:24px;display:block;margin-bottom:6px;"><Postcard /></el-icon>
+        暂无公告
+      </div>
+      <div v-else>
+        <div v-for="item in noticeList" :key="item.noticeId" class="notice-item" :class="{ 'is-read': item.isRead }" @click="previewNotice(item)">
+          <el-tag size="small" :type="item.noticeType === '1' ? 'warning' : 'success'" class="notice-tag">
+            {{ item.noticeType === '1' ? '通知' : '公告' }}
+          </el-tag>
+          <span class="notice-item-title">{{ item.noticeTitle }}</span>
+          <span class="notice-item-date">{{ item.createTime }}</span>
+        </div>
+      </div>
+
+      <!-- 触发器 -->
+      <template #reference>
+        <div class="right-menu-item hover-effect notice-trigger" @mouseenter="onNoticeEnter" @mouseleave="onNoticeLeave">
+          <svg-icon icon-class="bell" />
+          <span v-if="unreadCount > 0" class="notice-badge">{{ unreadCount }}</span>
+        </div>
+      </template>
+    </el-popover>
+
+    <!-- 预览弹窗 -->
+    <el-dialog v-model="previewVisible" :title="previewTitle" width="680px" append-to-body class="notice-preview-dialog">
+      <div class="notice-preview-meta">
+        <el-tag size="small" :type="previewNoticeType === '1' ? 'warning' : 'success'">
+          {{ previewNoticeType === '1' ? '通知' : '公告' }}
+        </el-tag>
+        <span class="notice-preview-info">
+          <el-icon><User /></el-icon> {{ previewCreateBy }}
+        </span>
+        <span class="notice-preview-info">
+          <el-icon><Timer /></el-icon> {{ previewCreateTime }}
+        </span>
+      </div>
+      <div class="notice-preview-divider"></div>
+      <div class="notice-preview-content" v-html="previewContent"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { listNoticeTop, markNoticeRead, markNoticeReadAll, getNotice } from '@/api/system/notice'
+
+const noticePopover = ref(null)
+const noticeList = ref([])
+const unreadCount = ref(0)
+const noticeLoading = ref(false)
+const noticeVisible = ref(false)
+const noticeLeaveTimer = ref(null)
+const previewVisible = ref(false)
+const previewTitle = ref('')
+const previewContent = ref('')
+const previewNoticeType = ref('')
+const previewCreateBy = ref('')
+const previewCreateTime = ref('')
+
+// 加载顶部公告列表
+function loadNoticeTop() {
+  noticeLoading.value = true
+  listNoticeTop().then(res => {
+    noticeList.value = res.data || []
+    unreadCount.value = res.unreadCount !== undefined ? res.unreadCount : noticeList.value.filter(n => !n.isRead).length
+  }).finally(() => {
+    noticeLoading.value = false
+  })
+}
+
+onMounted(() => loadNoticeTop())
+
+// 鼠标移入铃铛区域
+function onNoticeEnter() {
+  clearTimeout(noticeLeaveTimer.value)
+  noticeVisible.value = true
+  nextTick(() => {
+    const popper = noticePopover.value?.popperRef?.contentRef
+    if (popper && !popper._noticeBound) {
+      popper._noticeBound = true
+      popper.addEventListener('mouseenter', () => clearTimeout(noticeLeaveTimer.value))
+      popper.addEventListener('mouseleave', () => {
+        noticeLeaveTimer.value = setTimeout(() => { noticeVisible.value = false }, 100)
+      })
+    }
+  })
+}
+
+// 鼠标离开铃铛区域
+function onNoticeLeave() {
+  noticeLeaveTimer.value = setTimeout(() => { noticeVisible.value = false }, 150)
+}
+
+// 预览公告详情
+function previewNotice(item) {
+  if (!item.isRead) {
+    markNoticeRead(item.noticeId).catch(() => {})
+    const idx = noticeList.value.indexOf(item)
+    if (idx !== -1) noticeList.value[idx] = { ...item, isRead: true }
+    unreadCount.value = Math.max(0, unreadCount.value - 1)
+  }
+  getNotice(item.noticeId).then(res => {
+    const notice = res.data
+    previewTitle.value = notice.noticeTitle
+    previewContent.value = notice.noticeContent
+    previewNoticeType.value = notice.noticeType
+    previewCreateBy.value = notice.createBy
+    previewCreateTime.value = notice.createTime
+    previewVisible.value = true
+  })
+}
+
+// 全部已读
+function markAllRead() {
+  const ids = noticeList.value.map(n => n.noticeId).join(',')
+  if (!ids) return
+  markNoticeReadAll(ids).catch(() => {})
+  noticeList.value = noticeList.value.map(n => ({ ...n, isRead: true }))
+  unreadCount.value = 0
+}
+</script>
+
+<style lang="scss" scoped>
+.notice-trigger {
+  position: relative;
+  transform: translateX(-6px);
+  .svg-icon { width: 1.2em; height: 1.2em; vertical-align: -0.2em; }
+  .notice-badge {
+    position: absolute;
+    top: 7px;
+    right: -3px;
+    background: #f56c6c;
+    color: #fff;
+    border-radius: 10px;
+    font-size: 10px;
+    height: 16px;
+    line-height: 16px;
+    padding: 0 4px;
+    min-width: 16px;
+    text-align: center;
+    white-space: nowrap;
+    pointer-events: none;
+  }
+}
+.notice-popover { padding: 0 !important; }
+.notice-popover .notice-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10px 14px;
+  background: #f7f9fb;
+  border-bottom: 1px solid #eee;
+  font-size: 13px;
+  font-weight: 600;
+  color: #333;
+}
+.notice-popover .notice-mark-all {
+  font-size: 12px;
+  color: var(--el-color-primary);
+  font-weight: normal;
+  cursor: pointer;
+}
+.notice-popover .notice-mark-all:hover { color: #2b7cc1; }
+.notice-popover .notice-loading,
+.notice-popover .notice-empty {
+  padding: 24px;
+  text-align: center;
+  color: #bbb;
+  font-size: 12px;
+  line-height: 1.8;
+}
+.notice-popover .notice-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 10px 14px;
+  border-bottom: 1px solid #f5f5f5;
+  cursor: pointer;
+  transition: background 0.15s;
+}
+.notice-popover .notice-item:last-child { border-bottom: none; }
+.notice-popover .notice-item:hover { background: #f7f9fb; }
+.notice-popover .notice-item.is-read .notice-tag,
+.notice-popover .notice-item.is-read .notice-item-title,
+.notice-popover .notice-item.is-read .notice-item-date { opacity: 0.45; filter: grayscale(1); color: #999; }
+.notice-popover .notice-tag { flex-shrink: 0; }
+.notice-popover .notice-item-title {
+  flex: 1;
+  font-size: 12px;
+  color: #333;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.notice-popover .notice-item-date {
+  flex-shrink: 0;
+  font-size: 11px;
+  color: #bbb;
+}
+</style>
+
+<style>
+.notice-preview-dialog .el-dialog__body { padding: 0 10px 10px; }
+.notice-preview-dialog .notice-preview-meta {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  padding: 12px 0;
+  font-size: 12px;
+  color: #888;
+}
+.notice-preview-dialog .notice-preview-info { display: flex; align-items: center; gap: 4px; }
+.notice-preview-dialog .notice-preview-divider {
+  height: 1px;
+  background: linear-gradient(to right, transparent, #e2e8f0, transparent);
+  margin-bottom: 16px;
+}
+.notice-preview-dialog .notice-preview-content {
+  font-size: 14px;
+  line-height: 1.85;
+  color: #2d3748;
+  word-break: break-word;
+}
+.notice-preview-dialog .notice-preview-content img { max-width: 100%; border-radius: 4px; }
+.notice-preview-dialog .notice-preview-content p { margin: 0 0 1em; }
+.notice-preview-dialog .notice-preview-content a { color: var(--el-color-primary); text-decoration: underline; }
+</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c5d03af..f2cffd4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -32,6 +32,10 @@
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
+
+        <el-tooltip content="消息通知" effect="dark" placement="bottom">
+          <header-notice id="header-notice" class="right-menu-item hover-effect" />
+        </el-tooltip>
       </template>
 
       <el-dropdown @command="handleCommand" class="avatar-container right-menu-item hover-effect" trigger="hover">
@@ -72,6 +76,7 @@ import RuoYiDoc from '@/components/RuoYi/Doc'
 import useAppStore from '@/store/modules/app'
 import useUserStore from '@/store/modules/user'
 import useSettingsStore from '@/store/modules/settings'
+import HeaderNotice from './HeaderNotice'
 
 const appStore = useAppStore()
 const userStore = useUserStore()
@@ -204,11 +209,6 @@ async function toggleTheme(event) {
     margin-left: 8px;
   }
 
-  .errLog-container {
-    display: inline-block;
-    vertical-align: top;
-  }
-
   .right-menu {
     height: 100%;
     line-height: 50px;