diff --git a/web/src/layout/navMenu/horizontal.vue b/web/src/layout/navMenu/horizontal.vue index e7fcfca..192db7f 100644 --- a/web/src/layout/navMenu/horizontal.vue +++ b/web/src/layout/navMenu/horizontal.vue @@ -93,7 +93,7 @@ const initElMenuOffsetLeft = () => { nextTick(() => { let els = document.querySelector('.el-menu.el-menu--horizontal li.is-active'); if (!els) return false; - elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = els.offsetLeft; + // elMenuHorizontalScrollRef.value.$refs.wrapRef.scrollLeft = els.offsetLeft; }); }; // 路由过滤递归函数 diff --git a/web/src/stores/interface/index.ts b/web/src/stores/interface/index.ts index aeb8420..145375a 100644 --- a/web/src/stores/interface/index.ts +++ b/web/src/stores/interface/index.ts @@ -6,6 +6,7 @@ import {useFrontendMenuStore} from "/@/stores/frontendMenu"; // 用户信息 export interface UserInfosState { + id:'', avatar: string; username: string; name: string; diff --git a/web/src/stores/userInfo.ts b/web/src/stores/userInfo.ts index 01aea20..9250f93 100644 --- a/web/src/stores/userInfo.ts +++ b/web/src/stores/userInfo.ts @@ -12,6 +12,7 @@ import headerImage from '/@/assets/img/headerImage.png'; export const useUserInfo = defineStore('userInfo', { state: (): UserInfosStates => ({ userInfos: { + id:'', avatar: '', username: '', name: '', @@ -37,6 +38,7 @@ export const useUserInfo = defineStore('userInfo', { this.userInfos.pwd_change_count = count; }, async updateUserInfos(userInfos:any) { + this.userInfos.id = userInfos.id; this.userInfos.username = userInfos.name; this.userInfos.avatar = userInfos.avatar; this.userInfos.name = userInfos.name; @@ -54,6 +56,7 @@ export const useUserInfo = defineStore('userInfo', { this.userInfos = Session.get('userInfo'); } else { let userInfos: any = await this.getApiUserInfo(); + this.userInfos.id = userInfos.id; this.userInfos.username = userInfos.data.name; this.userInfos.avatar = userInfos.data.avatar; this.userInfos.name = userInfos.data.name; @@ -74,6 +77,7 @@ export const useUserInfo = defineStore('userInfo', { url: '/api/system/user/user_info/', method: 'get', }).then((res:any)=>{ + this.userInfos.id = res.data.id; this.userInfos.username = res.data.name; this.userInfos.avatar = (res.data.avatar && getBaseURL(res.data.avatar)) || headerImage; this.userInfos.name = res.data.name;