From e57e645d24a89adb3391be16f6948b292183fa04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 14:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/store/modules/user.js | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 63e6ba2..3a8f745 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,5 @@
import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
-import { isHttp, isEmpty } from "@/utils/validate"
-import defAva from '@/assets/images/profile.jpg'
const user = {
state: {
@@ -9,7 +7,10 @@
id: '',
name: '',
avatar: '',
+ deptId: null,
+ deptName: '',
roles: [],
+ roleIds: [],
permissions: []
},
@@ -28,6 +29,15 @@
},
SET_ROLES: (state, roles) => {
state.roles = roles
+ },
+ SET_ROLE_IDS: (state, roleIds) => {
+ state.roleIds = roleIds
+ },
+ SET_DEPT: (state, deptId) => {
+ state.deptId = deptId
+ },
+ SET_DEPT_NAME: (state, deptName) => {
+ state.deptName = deptName
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
@@ -57,10 +67,7 @@
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- let avatar = user.avatar || ""
- if (!isHttp(avatar)) {
- avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
- }
+ const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
@@ -68,8 +75,12 @@
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_ID', user.userId)
+ commit('SET_ROLE_IDS', user.roles.map(role => role.roleId))
commit('SET_NAME', user.userName)
+ commit('SET_DEPT', user.deptId)
+ commit('SET_DEPT_NAME', user.dept ? user.dept.deptName : '')
commit('SET_AVATAR', avatar)
+
resolve(res)
}).catch(error => {
reject(error)
--
Gitblit v1.8.0