From 5a32098cb881d47e71e9faa717f7983bb21812da Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 12 Jul 2024 11:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/UserInfo/src/UserInfo.vue | 10 +++++++---
 src/store/modules/permission.ts                 | 14 +++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/UserInfo/src/UserInfo.vue b/src/layout/components/UserInfo/src/UserInfo.vue
index 9e7f89c23..2603b979c 100644
--- a/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/src/layout/components/UserInfo/src/UserInfo.vue
@@ -6,6 +6,7 @@ import { useDesign } from '@/hooks/web/useDesign'
 import avatarImg from '@/assets/imgs/avatar.gif'
 import { useUserStore } from '@/store/modules/user'
 import { useTagsViewStore } from '@/store/modules/tagsView'
+import {  getTenantId } from '@/utils/auth'
 
 defineOptions({ name: 'UserInfo' })
 
@@ -28,6 +29,8 @@ const user = wsCache.get(CACHE_KEY.USER)
 const avatar = user.user.avatar ? user.user.avatar : avatarImg
 
 const userName = user.user.nickname ? user.user.nickname : 'Admin'
+const names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
+const tenant = names.find(item=>item.value == getTenantId())
 
 const loginOut = () => {
   ElMessageBox.confirm(t('common.loginOutMessage'), t('common.reminder'), {
@@ -54,9 +57,10 @@ const toDocument = () => {
   <ElDropdown class="custom-hover custom-hover1" :class="prefixCls" trigger="click">
     <div class="flex items-center">
       <ElAvatar :src="avatar" alt="" class="w-[calc(var(--logo-height)-25px)] rounded-[50%]" />
-      <span class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden" style="color:#ffffff">
-        {{ userName }}
-      </span>
+      <div class="pl-[5px] text-14px text-[var(--top-header-text-color)] <lg:hidden"  style="display: flex; flex-direction: column;color:#ffffff">
+        <span> {{ userName }} </span>
+        <span style="margin-top: 5px;text-align:center">{{ tenant.text }}</span>
+      </div>
     </div>
     <template #dropdown>
       <ElDropdownMenu>
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 19a8bcb38..84402e817 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -34,17 +34,17 @@ export const usePermissionStore = defineStore('permission', {
   actions: {
     async generateRoutes(): Promise<unknown> {
       return new Promise<void>(async (resolve) => {
-        let names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
-        let tenant = names.find(item=>item.value == getTenantId())
+        // let names =[{"text":"长春1379","value":1},{"text":"成都1397","value":2},{"text":"长春2379","value":3}]
+        // let tenant = names.find(item=>item.value == getTenantId())
         // 获得菜单列表，它在登录的时候，setUserInfoAction 方法中已经进行获取
         let res: AppCustomRouteRecordRaw[] = []
         if (wsCache.get(CACHE_KEY.ROLE_ROUTERS)) {
           res = wsCache.get(CACHE_KEY.ROLE_ROUTERS) as AppCustomRouteRecordRaw[]
-          res.forEach(item=>{
-            if(item.name == '富维海拉供应商系统'&&tenant){
-              item.name = item.name + tenant['text']
-            }
-          })
+          // res.forEach(item=>{
+          //   if(item.name == '富维海拉供应商系统'&&tenant){
+          //     item.name = item.name + tenant['text']
+          //   }
+          // })
         }
         console.log('菜单res',res)
         const routerMap: AppRouteRecordRaw[] = generateRoute(res)