From b3e00f677518d8c0a5ad7d74c427af4abba810b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 24 八月 2024 08:20:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/layout/components/Navbar.vue | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index b280cbc..dba4a53 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -16,7 +16,11 @@
<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:
+ block;line-height: 50px;">{{greeting}}</h1>
+ </el-tooltip>
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">
@@ -24,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">
@@ -68,12 +72,36 @@
RuoYiGit,
RuoYiDoc
},
+ data() {
+ return {
+
+ greeting: "",
+
+ };
+ },
+ mounted() {
+ this.setGreeting();
+ },
computed: {
...mapGetters([
'sidebar',
'avatar',
'device'
]),
+ setGreeting() {
+ const currentTime = new Date();
+ const currentHour = currentTime.getHours();
+ let name = this.$store.state.user.name
+ if (currentHour < 12) {
+ this.greeting = "鏃╀笂濂�,"+name;
+ } else if (currentHour < 14) {
+ this.greeting = "涓崍濂�,"+name;
+ } else if (currentHour < 18) {
+ this.greeting = "涓嬪崍濂�,"+name;
+ } else {
+ this.greeting = "鏅氫笂濂�,"+name;
+ }
+ },
setting: {
get() {
return this.$store.state.settings.showSettings
--
Gitblit v1.9.1