From 083f3042f0a1bc628adfd9c91a7756af9cb0709c Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 四月 2024 10:27:20 +0800
Subject: [PATCH] getDataForTree接口修改
---
Source/ProjectWeb/src/store/modules/user.js | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/Source/ProjectWeb/src/store/modules/user.js b/Source/ProjectWeb/src/store/modules/user.js
index 1bcbe7b..3878f5f 100644
--- a/Source/ProjectWeb/src/store/modules/user.js
+++ b/Source/ProjectWeb/src/store/modules/user.js
@@ -27,10 +27,22 @@
} else {
ele[propsDefault.children].forEach(child => {
addPath(child);
- })
- }
+ });
+ }
}
+
+function updateCode(items) {
+ items.forEach(item => {
+ item.pathValue = item.path;
+ item.path = '/' + item.code;
+ if (item.children && item.children.length > 0) {
+ updateCode(item.children);
+ }
+ });
+}
+
+
const user = {
state: {
@@ -50,18 +62,19 @@
return new Promise((resolve, reject) => {
loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, ).then(res => {
const data = res.data;
- if (data.error_description) {
- Message({
- message: data.error_description,
- type: 'error'
- })
- } else {
- commit('SET_TOKEN', data.access_token);
- commit('SET_REFRESH_TOKEN', data.refresh_token);
+ if(data.success){
+ debugger;
+ commit('SET_TOKEN', data.obj.sessionInfo.token);
+ commit('SET_REFRESH_TOKEN', data.obj.sessionInfo.token);
commit('SET_TENANT_ID', data.tenant_id);
- commit('SET_USER_INFO', data);
+ commit('SET_USER_INFO', data.obj.sessionInfo);
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
+ }else {
+ Message({
+ message: data.msg,
+ type: 'error'
+ })
}
resolve();
}).catch(error => {
@@ -207,10 +220,12 @@
let menu = deepClone(data);
menu.forEach(ele => {
addPath(ele, true);
+ updateCode([ele]);
});
+
commit('SET_MENU_ALL', menu)
commit('SET_MENU', menu)
- dispatch('GetButtons');
+ //dispatch('GetButtons');s
resolve(menu)
})
})
@@ -228,6 +243,7 @@
},
mutations: {
SET_TOKEN: (state, token) => {
+ debugger;
setToken(token);
state.token = token;
setStore({name: 'token', content: state.token})
--
Gitblit v1.9.3