From 02950a964bb0dcc202bd1f4ddd6c6fc4a92c8048 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 15 四月 2025 17:14:50 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/layout/components/Navbar.vue | 108 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 91 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 5a32d99..6bb9626 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -31,7 +31,7 @@
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
- <img :src="avatar" class="user-avatar">
+ <img :src="ximg" class="user-avatar">
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown">
@@ -74,9 +74,39 @@
},
data() {
return {
-
+ xm: {"寮�":"zhang.png","鏉�":"鏉�.png","鏇�":"鏇�.png","鏇�":"鏇�.png","璧�":"璧�.png",
+ "闄�":"闄�.png","閭�":"閭�.png","鑼�":"鑼�.png","鏂�":"鏂�.png","鍐�":"鍐�.png",
+ "閮�":"閮�.png","闊�":"闊�.png","浣�":"浣�.png","鑳�":"鑳�.png","榛�":"榛�.png",
+ "钂�":"钂�.png","瀛�":"瀛�.png","璧�":"璧�.png","姊�":"姊�.png","鏋�":"鏋�.png",
+ "椹�":"椹�.png","閽�":"閽�.png","绉�":"绉�.png","娌�":"娌�.png","鍙�":"鍙�.png",
+ "瀛�":"瀛�.png","鍞�":"鍞�.png","鐜�":"鐜�.png","鍗�":"鍗�.png","鍚�":"鍚�.png",
+ "鑲�":"鑲�.png","璁�":"璁�.png","钖�":"钖�.png","涓�":"涓�.png","鏉�":"鏉�.png",
+ "濮�":"濮�.png","閮�":"閮�.png","鍛�":"鍛�.png","鏈�":"鏈�.png","搴�":"搴�.png",
+ "閽�":"閽�.png","鑻�":"鑻�.png","宀�":"宀�.png","鏄�":"鏄�.png","鎴�":"鎴�.png",
+ "姹�":"姹�.png","鎴�":"鎴�.png",'鐙�':"鐙�.png",'涓滄柟':"涓滄柟",'璐�':"璐�",
+ '椋�':"椋�.png",'浼�':"浼�.png",'鍏瓩':"鍏瓩.png",'鍏緤':"鍏緤.png",'椤�':"椤�.png",
+ '閮�':"閮�.png",'闊�':"闊�.png",'閮�':"閮�.png",
+ "璐�":"璐�.png","璧繛":"璧繛.png","鑺�":"鑺�.png","榛�":"榛�.png","绾�":"绾�.png",
+ "搴�":"搴�.png","闆�":"闆�.png","鏉�":"鏉�.png","寤�":"寤�.png","姊�":"姊�.png",
+ "鐨囩敨":"鐨囩敨.png","鏋�":"鏋�.png","浠ょ嫄":"浠ょ嫄.png","鏌�":"鏌�.png",
+ "椴�":"椴�.png","缃�":"缃�.png","瀛�":"瀛�.png","绫�":"绫�.png","鑻�":"鑻�.png",
+ "鎱曞":"鎱曞.png","绌�":"绌�.png","鍗楀":"鍗楀.png","鍊�":"鍊�.png",
+ "娆ч槼":"娆ч槼.png","搴�":"搴�.png","褰�":"褰�.png","鐨�":"鐨�.png",
+ "骞�":"骞�.png","榻�":"榻�.png","閽�":"閽�.png","绉�":"绉�.png","灞�":"灞�.png",
+ "浠�":"浠�.png","娌�":"娌�.png","涓婂畼":"涓婂畼.png","閭�":"閭�.png",
+ "娌�":"娌�.png","鑸�":"鑸�.png","鍙搁┈":"鍙搁┈.png","鍙稿緬":"鍙稿緬.png",
+ "鎷撹穻":"鎷撹穻.png","姹�":"姹�.png","婊�":"婊�.png","涓囦繜":"涓囦繜.png","姹�":"姹�.png","闊�":"闊�.png",
+ "灏夎繜":"灏夎繜.png",
+ "闂讳汉":"闂讳汉.png","浼�":"浼�.png","瑗块棬":"瑗块棬.png","钀�":"钀�.png","鑲�":"鑲�.png",
+ "鐔�":"鐔�.png","璁�":"璁�.png","杞╄緯":"杞╄緯.png","钖�":"钖�.png",
+ "涓�":"涓�.png","鏉�":"鏉�.png","濮�":"濮�.png",
+ "鍙�":"鍙�.png","娈�":"娈�.png","灏�":"灏�.png","浣�":"浣�.png","淇�":"淇�.png","瀹囨枃":"瀹囨枃.png",
+ "鍏�":"鍏�.png","琚�":"琚�.png","婀�":"婀�.png","闀垮瓩":"闀垮瓩.png","璧�":"璧�.png",
+ "閮�":"閮�.png","璇歌憶":"璇歌憶.png","鑷�":"鑷�.png"
+
+ },
greeting: "",
-
+ ximg: "",
};
},
@@ -90,6 +120,7 @@
'avatar',
'device'
]),
+
setting: {
get() {
return this.$store.state.settings.showSettings
@@ -108,23 +139,66 @@
}
},
methods: {
+ getLastName(fullname)
+ {
+ let hyphenated = ['娆ч槼', '澶彶', '绔湪', '涓婂畼', '鍙搁┈', '涓滄柟', '鐙', '鍗楀', '涓囦繜', '闂讳汉',
+ '澶忎警', '璇歌憶', '灏夎繜', '鍏緤', '璧繛', '婢瑰彴', '鐨囩敨', '瀹楁斂', '婵槼', '鍏喍',
+ '澶彅', '鐢冲睜', '鍏瓩', '鎱曞', '浠插瓩', '閽熺', '闀垮瓩', '瀹囨枃', '鍩庢睜', '鍙稿緬',
+ '椴滀簬', '鍙哥┖', '姹濆', '闂句笜', '瀛愯溅', '浜撳畼', '鍙稿瘒', '宸┈', '鍏タ', '棰涘瓩',
+ '澹ら┓', '鍏壇', '婕嗛洉', '涔愭', '瀹扮埗', '璋锋', '鎷撹穻', '澶硅胺', '杞╄緯', '浠ょ嫄',
+ '娈靛共', '鐧鹃噷', '鍛煎欢', '涓滈儹', '鍗楅棬', '缇婅垖', '寰敓', '鍏埛', '鍏帀', '鍏华',
+ '姊佷笜', '鍏徊', '鍏笂', '鍏棬', '鍏北', '鍏潥', '宸︿笜', '鍏集', '瑗块棬', '鍏',
+ '绗簲', '鍏箻', '璐笜', '鍏殭', '鍗楄崳', '涓滈噷', '涓滃', '浠查暱', '瀛愪功', '瀛愭',
+ '鍗冲ⅷ', '杈惧', '瑜氬笀'];
+ let hyset = new Set(hyphenated);
+ let vLength = fullname.length;
+ // 鍓嶄负濮�,鍚庝负鍚�
+ let lastname = '', firstname = '';
+ if (vLength > 2){
+ var preTwoWords = fullname.substr(0, 2);
+ // 鍙栧懡鍚嶇殑鍓嶄袱涓瓧,鐪嬫槸鍚﹀湪澶嶅搴撲腑
+ if (hyset.has(preTwoWords)){
+ lastname = preTwoWords;
+ firstname = fullname.substr(2);
+ }else{
+ lastname = fullname.substr(0, 1);
+ firstname = fullname.substr(1);
+ }
+ }else if (vLength === 2){
+ // 鍏ㄥ悕鍙湁涓や釜瀛楁椂,浠ュ墠涓�涓负濮�,鍚庝竴涓嬩负鍚�
+ lastname = fullname.substr(0, 1);
+ firstname = fullname.substr(1);
+ }else{
+ lastname = fullname;
+ }
+ return lastname;
+ },
+ setGreeting() {
+ const currentTime = new Date();
+ const currentHour = currentTime.getHours();
+ console.log(this.$store.state.user)
+ let name = this.$store.state.user.name
+ //alert(this.$store.state.user.userName)
+ let userName = this.$store.state.user.userName
+ let lnm = this.getLastName(name)
+ if(this.xm[lnm]!=null)
+ this.ximg = require("@/assets/images/"+this.xm[lnm])
+ else
+ this.ximg = require("@/assets/images/login_logo.png")
+ if (currentHour < 12) {
+ this.greeting = "鏃╀笂濂�,"+userName;
+ } else if (currentHour < 14) {
+ this.greeting = "涓崍濂�,"+userName;
+ } else if (currentHour < 18) {
+ this.greeting = "涓嬪崍濂�,"+userName;
+ } else {
+ this.greeting = "鏅氫笂濂�,"+userName;
+ }
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
- 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;
- }
- },
+
async logout() {
this.$confirm('纭畾娉ㄩ攢骞堕��鍑虹郴缁熷悧锛�', '鎻愮ず', {
confirmButtonText: '纭畾',
--
Gitblit v1.9.1