From 5470429a79313630a7ddef601de1d89e7dada754 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 09:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev-new_pro_OA
---
src/layout/components/Navbar.vue | 682 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 374 insertions(+), 308 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index cb08221..aae5330 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,316 +1,382 @@
-<template>
- <div class="navbar">
- <div>
- <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container"
- @toggleClick="toggleSideBar" />
- <breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />
- </div>
- <!-- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->
- <div class="right-menu">
- <!-- 娑堟伅閫氱煡 -->
- <el-popover
- v-model:visible="notificationVisible"
- :width="500"
- placement="bottom-end"
- trigger="click"
- :popper-options="{ modifiers: [{ name: 'offset', options: { offset: [0, 10] } }] }"
- popper-class="notification-popover"
- >
- <template #reference>
- <div class="notification-container right-menu-item hover-effect">
- <el-badge :value="unreadCount" :hidden="unreadCount === 0" class="notification-badge">
- <el-icon :size="20" style="cursor: pointer;">
- <Bell />
- </el-icon>
- </el-badge>
- </div>
- </template>
- <NotificationCenter
- @unreadCountChange="handleUnreadCountChange"
- ref="notificationCenterRef"
- />
- </el-popover>
- <div class="avatar-container">
- <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
- <div class="avatar-wrapper">
- <img :src="userStore.avatar" class="user-avatar" />
- <el-icon><caret-bottom /></el-icon>
- </div>
- <template #dropdown>
- <el-dropdown-menu>
- <router-link to="/user/profile">
- <el-dropdown-item>涓汉涓績</el-dropdown-item>
- </router-link>
- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
- <span>甯冨眬璁剧疆</span>
- </el-dropdown-item>
- <el-dropdown-item divided command="logout">
- <span>閫�鍑虹櫥褰�</span>
- </el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- </div>
- </div>
- </div>
-</template>
-
-<script setup>
-import { ElMessageBox } from 'element-plus'
-import { Bell } from '@element-plus/icons-vue'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import HeaderSearch from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
-import NotificationCenter from './NotificationCenter/index.vue'
-import useAppStore from '@/store/modules/app'
-import useUserStore from '@/store/modules/user'
-import useSettingsStore from '@/store/modules/settings'
-
-const appStore = useAppStore()
-const userStore = useUserStore()
-const settingsStore = useSettingsStore()
-const notificationVisible = ref(false)
-const notificationCenterRef = ref(null)
-const unreadCount = ref(0)
-function toggleSideBar() {
- appStore.toggleSideBar()
-}
-// const redirect = ref(undefined)
-// watch(route, (newRoute) => {
-// redirect.value = newRoute.query && newRoute.query.redirect
-// }, { immediate: true })
-
-function handleCommand(command) {
- switch (command) {
- case "setLayout":
- setLayout()
- break
- case "logout":
- logout()
- break
- default:
- break
- }
-}
-
-function logout() {
- ElMessageBox.confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- userStore.logOut().then(() => {
- location.href = '/index'
- })
- }).catch(() => { })
-}
-
-const emits = defineEmits(['setLayout'])
-function setLayout() {
- emits('setLayout')
-}
-
-function toggleTheme() {
- settingsStore.toggleTheme()
-}
-
-// 娑堟伅閫氱煡鐩稿叧
-function handleUnreadCountChange(count) {
- unreadCount.value = count
-}
-
-// 缁勪欢鎸傝浇鏃跺姞杞芥湭璇绘暟閲忓拰瀹氭椂鍒锋柊
-let unreadCountTimer = null
-onMounted(() => {
- // 寤惰繜鍔犺浇锛岀‘淇濈粍浠跺凡娓叉煋
- nextTick(() => {
- if (notificationCenterRef.value) {
- notificationCenterRef.value.loadUnreadCount()
- }
- })
- // 瀹氭椂鍒锋柊鏈鏁伴噺锛堟瘡30绉掞級
- unreadCountTimer = setInterval(() => {
- if (notificationCenterRef.value) {
- notificationCenterRef.value.loadUnreadCount()
- }
- }, 30000)
-})
-
-// 鐩戝惉 popover 鏄剧ず鐘舵�侊紝鎵撳紑鏃跺姞杞芥秷鎭垪琛�
-watch(notificationVisible, (val) => {
- if (val && notificationCenterRef.value) {
- nextTick(() => {
- notificationCenterRef.value.loadMessages()
- })
- }
-})
-
-onUnmounted(() => {
- if (unreadCountTimer) {
- clearInterval(unreadCountTimer)
- }
-})
-</script>
-
-<style lang='scss' scoped>
+<template>
+ <div class="navbar">
+ <div class="left-zone">
+ <hamburger
+ id="hamburger-container"
+ :is-active="appStore.sidebar.opened"
+ class="hamburger-container"
+ @toggleClick="toggleSideBar"
+ />
+ <breadcrumb
+ v-if="!settingsStore.topNav"
+ id="breadcrumb-container"
+ class="breadcrumb-container"
+ />
+ </div>
+
+ <div class="center-zone">
+ <el-icon class="search-icon" @click="openHeaderSearch"><Search /></el-icon>
+ <el-input
+ v-model="topSearchKeyword"
+ placeholder="鎼滅储鑿滃崟 / 鍔熻兘 / 鏁版嵁"
+ clearable
+ @keyup.enter="openHeaderSearch"
+ />
+ <header-search
+ ref="headerSearchRef"
+ :keyword="topSearchKeyword"
+ class="search-popup-trigger"
+ />
+ </div>
+
+ <div class="right-menu">
+ <el-popover
+ v-model:visible="notificationVisible"
+ :width="500"
+ placement="bottom-end"
+ trigger="click"
+ :popper-options="{ modifiers: [{ name: 'offset', options: { offset: [0, 10] } }] }"
+ popper-class="notification-popover"
+ >
+ <template #reference>
+ <div class="notification-container right-menu-item hover-effect">
+ <el-badge :value="unreadCount" :hidden="unreadCount === 0" class="notification-badge">
+ <el-icon :size="18">
+ <Bell />
+ </el-icon>
+ </el-badge>
+ </div>
+ </template>
+ <NotificationCenter @unreadCountChange="handleUnreadCountChange" ref="notificationCenterRef" />
+ </el-popover>
+
+ <div class="right-menu-item hover-effect screenfull-container">
+ <screenfull />
+ </div>
+
+ <div class="avatar-container">
+ <el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
+ <div class="avatar-wrapper">
+ <div class="user-summary">
+ <div class="user-name">{{ userStore.nickName || userStore.name || "绠＄悊鍛�" }}</div>
+ <div class="user-role">{{ userStore.roleName || "绯荤粺鐢ㄦ埛" }}</div>
+ </div>
+ <img :src="userStore.avatar" class="user-avatar" />
+ <el-icon><caret-bottom /></el-icon>
+ </div>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <router-link to="/user/profile">
+ <el-dropdown-item>涓汉涓績</el-dropdown-item>
+ </router-link>
+ <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
+ <span>甯冨眬璁剧疆</span>
+ </el-dropdown-item>
+ <el-dropdown-item divided command="logout">
+ <span>閫�鍑虹櫥褰�</span>
+ </el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script setup>
+import { ElMessageBox } from "element-plus";
+import { Bell, Search } from "@element-plus/icons-vue";
+import Breadcrumb from "@/components/Breadcrumb";
+import Hamburger from "@/components/Hamburger";
+import Screenfull from "@/components/Screenfull";
+import HeaderSearch from "@/components/HeaderSearch";
+import NotificationCenter from "./NotificationCenter/index.vue";
+import useAppStore from "@/store/modules/app";
+import useUserStore from "@/store/modules/user";
+import useSettingsStore from "@/store/modules/settings";
+
+const appStore = useAppStore();
+const userStore = useUserStore();
+const settingsStore = useSettingsStore();
+
+const topSearchKeyword = ref("");
+const headerSearchRef = ref(null);
+const notificationVisible = ref(false);
+const notificationCenterRef = ref(null);
+const unreadCount = ref(0);
+
+function toggleSideBar() {
+ appStore.toggleSideBar();
+}
+
+function openHeaderSearch() {
+ headerSearchRef.value?.open(topSearchKeyword.value);
+}
+
+function handleCommand(command) {
+ switch (command) {
+ case "setLayout":
+ setLayout();
+ break;
+ case "logout":
+ logout();
+ break;
+ default:
+ break;
+ }
+}
+
+function logout() {
+ ElMessageBox.confirm("纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ userStore.logOut().then(() => {
+ location.href = "/index";
+ });
+ })
+ .catch(() => {});
+}
+
+const emits = defineEmits(["setLayout"]);
+function setLayout() {
+ emits("setLayout");
+}
+
+function handleUnreadCountChange(count) {
+ unreadCount.value = count;
+}
+
+let unreadCountTimer = null;
+onMounted(() => {
+ nextTick(() => {
+ if (notificationCenterRef.value) {
+ notificationCenterRef.value.loadUnreadCount();
+ }
+ });
+
+ unreadCountTimer = setInterval(() => {
+ if (notificationCenterRef.value) {
+ notificationCenterRef.value.loadUnreadCount();
+ }
+ }, 30000);
+});
+
+watch(notificationVisible, (val) => {
+ if (val && notificationCenterRef.value) {
+ nextTick(() => {
+ notificationCenterRef.value.loadMessages();
+ });
+ }
+});
+
+onUnmounted(() => {
+ if (unreadCountTimer) {
+ clearInterval(unreadCountTimer);
+ }
+});
+</script>
+
+<style lang="scss" scoped>
.navbar {
- height: 56px;
- overflow: hidden;
- position: relative;
- background: var(--navbar-bg);
- border: 1px solid rgba(216, 225, 219, 0.9);
- border-radius: 22px;
- backdrop-filter: blur(18px);
- box-shadow: var(--shadow-sm);
+ height: var(--topbar-height);
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 14px;
+ background: rgba(255, 255, 255, 0.86);
+ border: 1px solid rgba(148, 163, 184, 0.18);
+ border-radius: var(--content-radius);
+ backdrop-filter: blur(16px);
+ box-shadow: 0 8px 20px rgba(15, 23, 42, 0.05);
padding: 0 18px;
-
- .hamburger-container {
- line-height: 52px;
- height: 100%;
- float: left;
- cursor: pointer;
- transition: background 0.3s;
- -webkit-tap-highlight-color: transparent;
-
- &:hover {
- background: var(--navbar-hover);
- }
- }
-
- .breadcrumb-container {
- float: left;
- }
-
- .topmenu-container {
- position: absolute;
- left: 50px;
- }
-
- .errLog-container {
- display: inline-block;
- vertical-align: top;
- }
-
- .right-menu {
- float: right;
- height: 100%;
- align-items: center;
- display: flex;
-
- &:focus {
- outline: none;
- }
-
- .right-menu-item {
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 0 8px;
- height: 100%;
- font-size: 18px;
- color: var(--navbar-text);
- border-radius: 14px;
-
- &.hover-effect {
- cursor: pointer;
- transition: background 0.3s;
-
- &:hover {
- background: var(--navbar-hover);
- }
- }
-
- &.theme-switch-wrapper {
- display: flex;
- align-items: center;
-
- svg {
- transition: transform 0.3s;
-
- &:hover {
- transform: scale(1.15);
- }
- }
- }
- }
-
- .notification-container {
- margin-right: 12px;
- display: flex;
- align-items: center;
- cursor: pointer;
-
- .notification-badge {
- :deep(.el-badge__content) {
- border: none;
- }
- }
- }
-
- .avatar-container {
- margin-right: 4px;
- height: 100%;
- display: flex;
- align-items: center;
+}
- :deep(.el-dropdown) {
- height: 100%;
- display: flex;
- align-items: center;
- }
+.left-zone {
+ flex: 0 1 420px;
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ gap: 10px;
+}
- .avatar-wrapper {
- position: relative;
- display: flex;
- align-items: center;
- justify-content: center;
- gap: 10px;
- padding: 6px 10px 6px 6px;
- height: 44px;
- border-radius: 999px;
- background: rgba(247, 250, 248, 0.92);
- border: 1px solid var(--surface-border);
+.hamburger-container {
+ line-height: 36px;
+ height: 36px;
+ width: 36px;
+ border-radius: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: var(--navbar-text);
- .user-avatar {
- cursor: pointer;
- width: 34px;
- height: 34px;
- border-radius: 50px;
- }
+ &:hover {
+ background: var(--navbar-hover);
+ }
+}
- i {
- cursor: pointer;
- position: static;
- font-size: 12px;
- }
- }
- }
- }
-}
-
-</style>
-
-<style lang="scss">
+.breadcrumb-container {
+ min-width: 0;
+}
+
+.center-zone {
+ width: clamp(360px, 34vw, 560px);
+ min-width: 320px;
+ height: 38px;
+ border-radius: 999px;
+ border: 1px solid rgba(148, 163, 184, 0.24);
+ background: rgba(248, 251, 255, 0.92);
+ display: flex;
+ align-items: center;
+ padding: 0 12px;
+ gap: 8px;
+}
+
+.search-icon {
+ color: #5b86c9;
+ cursor: pointer;
+}
+
+.center-zone :deep(.el-input__wrapper) {
+ border: 0;
+ box-shadow: none !important;
+ background: transparent;
+ padding: 0;
+}
+
+.center-zone :deep(.el-input__inner) {
+ color: #334155;
+ font-size: 13px;
+}
+
+.search-popup-trigger :deep(.search-icon) {
+ color: #5b86c9;
+ font-size: 16px;
+ cursor: pointer;
+}
+
+.right-menu {
+ height: 100%;
+ align-items: center;
+ display: flex;
+ gap: 14px;
+}
+
+.right-menu-item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: var(--navbar-text);
+ border-radius: 8px;
+}
+
+.hover-effect {
+ cursor: pointer;
+ transition: background 0.2s;
+
+ &:hover {
+ background: var(--navbar-hover);
+ }
+}
+
+.notification-container,
+.screenfull-container {
+ width: 36px;
+ height: 36px;
+}
+
+.notification-badge :deep(.el-badge__content) {
+ border: none;
+}
+
+.screenfull-container :deep(.svg-icon) {
+ width: 16px;
+ height: 16px;
+ color: var(--navbar-text);
+}
+
+.avatar-container {
+ height: 100%;
+ display: flex;
+ align-items: center;
+}
+
+.avatar-container :deep(.el-dropdown) {
+ height: 100%;
+ display: flex;
+ align-items: center;
+}
+
+.avatar-wrapper {
+ display: flex;
+ align-items: center;
+ gap: 10px;
+ padding: 4px 10px 4px 8px;
+ height: 44px;
+ border-radius: 22px;
+ background: rgba(255, 255, 255, 0.9);
+ border: 1px solid rgba(148, 163, 184, 0.22);
+}
+
+.user-summary {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-end;
+ gap: 2px;
+}
+
+.user-name {
+ color: var(--text-primary);
+ font-size: 13px;
+ line-height: 1;
+}
+
+.user-role {
+ color: var(--text-tertiary);
+ font-size: 11px;
+ line-height: 1;
+}
+
+.user-avatar {
+ cursor: pointer;
+ width: 36px;
+ height: 36px;
+ border-radius: 50%;
+ border: 1px solid rgba(148, 163, 184, 0.3);
+}
+
+@media (max-width: 1200px) {
+ .center-zone {
+ display: none;
+ }
+
+ .user-summary {
+ display: none;
+ }
+}
+</style>
+
+<style lang="scss">
.notification-popover {
padding: 0 !important;
- border-radius: 20px !important;
- border: 1px solid var(--surface-border) !important;
- box-shadow: var(--shadow-md) !important;
-
- .el-popover__title {
- display: none;
- }
-
- .el-popover__body {
- padding: 0 !important;
- }
-}
-.el-badge__content.is-fixed{
- top: 12px;
-}
-</style>
+ border-radius: 16px !important;
+ border: 1px solid rgba(148, 163, 184, 0.22) !important;
+ box-shadow: 0 18px 40px rgba(15, 23, 42, 0.12) !important;
+ background: rgba(255, 255, 255, 0.94) !important;
+ backdrop-filter: blur(16px);
+
+ .el-popover__title {
+ display: none;
+ }
+
+ .el-popover__body {
+ padding: 0 !important;
+ }
+}
+
+.el-badge__content.is-fixed {
+ top: 8px;
+}
+</style>
--
Gitblit v1.9.3