From ed066dc0bdfa9a7c3a3d55b8b4f70cd07e2e8d8a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 五月 2025 09:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev
---
src/layout/components/Navbar.vue | 65 ++++++++++++--------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index cab43c5..42f14c1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,35 +1,16 @@
<template>
<div class="navbar">
- <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" />
- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />
-
+<!-- <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" />-->
+<!-- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->
+ <div class="logo">
+ <img src="@/assets/logo/logo.png" alt=""/>
+ </div>
<div class="right-menu">
<template v-if="appStore.device !== 'mobile'">
<header-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>
-
- <el-tooltip content="鏂囨。鍦板潃" effect="dark" placement="bottom">
- <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
- </el-tooltip>
-
<screenfull id="screenfull" class="right-menu-item hover-effect" />
-
- <el-tooltip content="涓婚妯″紡" effect="dark" placement="bottom">
- <div class="right-menu-item hover-effect theme-switch-wrapper" @click="toggleTheme">
- <svg-icon v-if="settingsStore.isDark" icon-class="sunny" />
- <svg-icon v-if="!settingsStore.isDark" icon-class="moon" />
- </div>
- </el-tooltip>
-
- <el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">
- <size-select id="size-select" class="right-menu-item hover-effect" />
- </el-tooltip>
</template>
-
<el-dropdown @command="handleCommand" class="avatar-container right-menu-item hover-effect" trigger="hover">
<div class="avatar-wrapper">
<img :src="userStore.avatar" class="user-avatar" />
@@ -46,9 +27,9 @@
</el-dropdown-menu>
</template>
</el-dropdown>
- <div class="right-menu-item hover-effect setting" @click="setLayout" v-if="settingsStore.showSettings">
- <svg-icon icon-class="more-up" />
- </div>
+<!-- <div class="right-menu-item hover-effect setting" @click="setLayout" v-if="settingsStore.showSettings">-->
+<!-- <svg-icon icon-class="more-up" />-->
+<!-- </div>-->
</div>
</div>
</template>
@@ -114,20 +95,24 @@
.navbar {
height: 50px;
overflow: hidden;
- position: relative;
+ position: fixed; /* 灏嗗ご閮ㄥ浐瀹� */
+ top: 0; /* 鍦ㄩ《閮ㄥ浐瀹� */
+ width: 100%; /* 瀹藉害100%锛岃鐩栨暣涓鍙� */
+ //background-color: #f8f9fa; /* 璁剧疆鑳屾櫙棰滆壊锛屼互渚挎洿鏄庢樉鍦扮湅鍒版晥鏋� */
+ z-index: 1000; /* 纭繚澶撮儴鍦ㄥ叾浠栧唴瀹逛箣涓� */
background: var(--navbar-bg);
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
-
- .hamburger-container {
- line-height: 46px;
- height: 100%;
- float: left;
- cursor: pointer;
- transition: background 0.3s;
- -webkit-tap-highlight-color: transparent;
-
- &:hover {
- background: rgba(0, 0, 0, 0.025);
+ display: flex;
+ justify-content: space-between;
+ padding: 0 20px;
+
+ .logo {
+ height: 50px;
+ line-height: 50px;
+ img {
+ cursor: pointer;
+ width: 146px;
+ height: 46px;
}
}
--
Gitblit v1.9.3