From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/layout/components/Navbar.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index da89cf9..54e2258 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,12 +6,22 @@
<img src="@/assets/logo/ZTTlogo.png" />
</div>
<div class="center-menu">
- <span class="label">LIMS瀹為獙瀹ょ鐞嗙郴缁�</span>
+ <span class="label">瑁呭LIMS瀹為獙瀹ょ鐞嗙郴缁�</span>
</div>
<div class="right-menu">
<div class="avatar-wrapper">
- <img :src="avatar" class="user-avatar" />
+ <el-avatar shape="square" :size="30">{{ nickName.substring(0, 1) }}</el-avatar>
<span class="userName">{{ nickName }}</span>
+ <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
+ <div class="avatar-wrapper">
+ <i class="el-icon-caret-bottom" />
+ </div>
+ <el-dropdown-menu slot="dropdown">
+ <router-link to="/user/profile">
+ <el-dropdown-item>涓汉涓績</el-dropdown-item>
+ </router-link>
+ </el-dropdown-menu>
+ </el-dropdown>
<img
class="logoout"
src="@/assets/images/logoout.png"
@@ -78,7 +88,7 @@
RuoYiDoc,
},
computed: {
- ...mapGetters(["avatar", "device", "nickName"]),
+ ...mapGetters(["device", "nickName"]),
setting: {
get() {
return this.$store.state.settings.showSettings;
@@ -211,9 +221,6 @@
}
}
- .avatar-container {
- margin-right: 30px;
- }
}
}
</style>
--
Gitblit v1.9.3