From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/store/modules/user.js | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 359f37f..2514f88 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -18,11 +18,13 @@
refreshToken,
getButtons,
registerUser,
+ getParentDeptInfo
} from '@/api/user';
import { getRoutes, getTopMenu } from '@/api/system/menu';
import { formatPath } from '@/router/avue-router';
import { ElMessage } from 'element-plus';
import { encrypt } from '@/utils/sm2';
+import md5 from 'js-md5';
const user = {
state: {
@@ -35,6 +37,7 @@
menuAll: getStore({ name: 'menuAll' }) || [],
token: getStore({ name: 'token' }) || '',
refreshToken: getStore({ name: 'refreshToken' }) || '',
+ parentDeptInfo: getStore({ name: 'parentDeptInfo' }) || '',
},
actions: {
//根据用户名登录
@@ -45,7 +48,7 @@
userInfo.deptId,
userInfo.roleId,
userInfo.username,
- encrypt(userInfo.password),
+ md5(userInfo.password),
userInfo.type,
userInfo.key,
userInfo.code
@@ -62,6 +65,7 @@
commit('SET_REFRESH_TOKEN', data.refresh_token);
commit('SET_TENANT_ID', data.tenant_id);
commit('SET_USER_INFO', data);
+ commit('SET_PARENT_DEPT_INFO', data.dept_id);
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
}
@@ -232,7 +236,6 @@
commit('CLEAR_LOCK');
removeToken();
removeRefreshToken();
- removeToken();
resolve();
})
.catch(error => {
@@ -287,6 +290,13 @@
},
},
mutations: {
+ SET_PARENT_DEPT_INFO(state, deptId){
+ getParentDeptInfo({deptId:deptId}).then(res=>{
+ const data = res.data.data;
+ state.parentDeptInfo = data;
+ setStore({ name: 'parentDeptInfo', content: data });
+ })
+ },
SET_TOKEN: (state, token) => {
setToken(token);
state.token = token;
--
Gitblit v1.9.3