From 76a3eb05129f0af9f9b5798b1c8abbf9afaf7f19 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 八月 2024 17:59:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/layout/components/Navbar.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 97b87fe..2be56e8 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -8,7 +8,7 @@
<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>
@@ -16,9 +16,9 @@
<el-tooltip content="鏂囨。鍦板潃" effect="dark" placement="bottom">
<ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
</el-tooltip>
- -->
+ -->
<el-tooltip effect="dark" placement="bottom">
- <h1 class="right-menu-item hover-effect" style="text-align: center;display:
+ <h1 class="right-menu-item hover-effect" style="text-align: center;display:
block;line-height: 50px;">{{greeting}}</h1>
</el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
@@ -28,7 +28,7 @@
</el-tooltip>
</template>
-
+
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
@@ -76,19 +76,21 @@
return {
greeting: "",
-
+
};
},
+
mounted() {
this.setGreeting();
},
+
computed: {
...mapGetters([
'sidebar',
'avatar',
'device'
]),
-
+
setting: {
get() {
return this.$store.state.settings.showSettings
@@ -124,6 +126,7 @@
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
+
async logout() {
this.$confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
--
Gitblit v1.9.1