From 85447bbc62987ae620b4142fcaba5784571f73c4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 03 Apr 2026 22:34:22 +0800
Subject: [PATCH] 优化样式
---
ruoyi-ui/src/layout/components/Navbar.vue | 120 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 87 insertions(+), 33 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 18c89a0..ac2959d 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -1,14 +1,17 @@
<template>
- <div class="navbar">
+ <div class="navbar" :class="'nav' + navType">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
-
+ <breadcrumb v-if="navType == 1" id="breadcrumb-container" class="breadcrumb-container" />
+ <top-nav v-if="navType == 2" id="topmenu-container" class="topmenu-container" />
+ <template v-if="navType == 3">
+ <logo v-show="showLogo" :collapse="false"></logo>
+ <top-bar id="topbar-container" class="topbar-container" />
+ </template>
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
-
+
<el-tooltip content="源码地址" effect="dark" placement="bottom">
<ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
</el-tooltip>
@@ -23,19 +26,26 @@
<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 class="avatar-container right-menu-item hover-effect" trigger="click">
+ <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
- <i class="el-icon-caret-bottom" />
+ <span class="user-nickname"> {{ nickName }} </span>
</div>
<el-dropdown-menu slot="dropdown">
<router-link to="/user/profile">
<el-dropdown-item>个人中心</el-dropdown-item>
</router-link>
- <el-dropdown-item @click.native="setting = true">
+ <el-dropdown-item @click.native="setLayout" v-if="setting">
<span>布局设置</span>
+ </el-dropdown-item>
+ <el-dropdown-item @click.native="lockScreen">
+ <span>锁定屏幕</span>
</el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span>退出登录</span>
@@ -49,45 +59,51 @@
<script>
import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
+import TopNav from './TopNav'
+import TopBar from './TopBar'
+import Logo from './Sidebar/Logo'
import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
+import HeaderNotice from './HeaderNotice'
export default {
components: {
Breadcrumb,
+ Logo,
TopNav,
+ TopBar,
Hamburger,
Screenfull,
SizeSelect,
Search,
RuoYiGit,
- RuoYiDoc
+ RuoYiDoc,
+ HeaderNotice
},
computed: {
...mapGetters([
'sidebar',
'avatar',
- 'device'
+ 'device',
+ 'nickName'
]),
setting: {
get() {
return this.$store.state.settings.showSettings
- },
- set(val) {
- this.$store.dispatch('settings/changeSetting', {
- key: 'showSettings',
- value: val
- })
}
},
- topNav: {
+ navType: {
get() {
- return this.$store.state.settings.topNav
+ return this.$store.state.settings.navType
+ }
+ },
+ showLogo: {
+ get() {
+ return this.$store.state.settings.sidebarLogo
}
}
},
@@ -95,36 +111,58 @@
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
- async logout() {
+ setLayout(event) {
+ this.$emit('setLayout')
+ },
+ lockScreen() {
+ const currentPath = this.$route.fullPath
+ this.$store.dispatch('lock/lockScreen', currentPath).then(() => {
+ this.$router.push('/lock')
+ })
+ },
+ logout() {
this.$confirm('确定注销并退出系统吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
- location.href = '/index';
+ location.href = '/index'
})
- })
+ }).catch(() => {})
}
}
}
</script>
<style lang="scss" scoped>
+.navbar.nav3 {
+ .hamburger-container {
+ display: none !important;
+ }
+}
+
.navbar {
height: 50px;
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
+ display: flex;
+ align-items: center;
+ // padding: 0 8px;
+ box-sizing: border-box;
.hamburger-container {
line-height: 46px;
height: 100%;
- float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color:transparent;
+ display: flex;
+ align-items: center;
+ flex-shrink: 0;
+ margin-right: 8px;
&:hover {
background: rgba(0, 0, 0, .025)
@@ -132,7 +170,7 @@
}
.breadcrumb-container {
- float: left;
+ flex-shrink: 0;
}
.topmenu-container {
@@ -140,15 +178,21 @@
left: 50px;
}
- .errLog-container {
- display: inline-block;
- vertical-align: top;
+ .topbar-container {
+ flex: 1;
+ min-width: 0;
+ display: flex;
+ align-items: center;
+ overflow: hidden;
+ margin-left: 8px;
}
.right-menu {
- float: right;
height: 100%;
line-height: 50px;
+ display: flex;
+ align-items: center;
+ margin-left: auto;
&:focus {
outline: none;
@@ -173,17 +217,27 @@
}
.avatar-container {
- margin-right: 30px;
+ margin-right: 0px;
+ padding-right: 0px;
.avatar-wrapper {
- margin-top: 5px;
+ margin-top: 10px;
+ right: 8px;
position: relative;
.user-avatar {
cursor: pointer;
- width: 40px;
- height: 40px;
- border-radius: 10px;
+ width: 30px;
+ height: 30px;
+ border-radius: 50%;
+ }
+
+ .user-nickname{
+ position: relative;
+ bottom: 10px;
+ left: 2px;
+ font-size: 14px;
+ font-weight: bold;
}
.el-icon-caret-bottom {
--
Gitblit v1.9.3