From 8be3182372eb774dce8f9c97a0b51c03bda165c7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 15:33:11 +0800
Subject: [PATCH] UI展示
---
Source/ProjectWeb/src/store/modules/user.js | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/Source/ProjectWeb/src/store/modules/user.js b/Source/ProjectWeb/src/store/modules/user.js
index 1a65fee..a5bf964 100644
--- a/Source/ProjectWeb/src/store/modules/user.js
+++ b/Source/ProjectWeb/src/store/modules/user.js
@@ -2,7 +2,7 @@
import {Message} from 'element-ui'
import {setStore, getStore} from '@/util/store'
import {isURL, validatenull} from '@/util/validate'
-import {deepClone} from '@/util/util'
+import {deepClone,queryStringToObject} from '@/util/util'
import website from '@/config/website'
import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
import {getTopMenu, getRoutes} from '@/api/system/menu'
@@ -27,9 +27,21 @@
} else {
ele[propsDefault.children].forEach(child => {
addPath(child);
- })
- }
+ });
+ }
+}
+
+function updateCode(items) {
+ items.forEach(item => {
+ item.pathValue = item.path;
+ item.path = '/' + item.code;
+ item.query = {}; // 鍒濆鍖� item.query
+ item.query = queryStringToObject(item.pathValue)
+ if (item.children && item.children.length > 0) {
+ updateCode(item.children);
+ }
+ });
}
const user = {
@@ -48,17 +60,16 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
LoginByUsername({commit}, userInfo) {
return new Promise((resolve, reject) => {
- loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, ).then(res => {
+ loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key,).then(res => {
const data = res.data;
- if(data.success){
- debugger;
+ if (data.success) {
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.obj.sessionInfo);
commit('DEL_ALL_TAG');
commit('CLEAR_LOCK');
- }else {
+ } else {
Message({
message: data.msg,
type: 'error'
@@ -86,7 +97,7 @@
//鏍规嵁绗笁鏂逛俊鎭櫥褰�
LoginBySocial({commit}, userInfo) {
return new Promise((resolve) => {
- loginBySocial(userInfo.tenantId, userInfo.source, userInfo.state).then(res => {
+ loginBySocial(userInfo.tenantId, userInfo.source, userInfo.state).then(res => {
const data = res.data;
if (data.error_description) {
Message({
@@ -208,10 +219,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)
})
})
@@ -229,7 +242,6 @@
},
mutations: {
SET_TOKEN: (state, token) => {
- debugger;
setToken(token);
state.token = token;
setStore({name: 'token', content: state.token})
@@ -245,15 +257,15 @@
}
})
state.menuAll = menu
- setStore({ name: 'menuAll', content: state.menuAll })
+ setStore({name: 'menuAll', content: state.menuAll})
},
SET_MENU_ALL_NULL: (state) => {
state.menuAll = []
- setStore({ name: 'menuAll', content: state.menuAll })
+ setStore({name: 'menuAll', content: state.menuAll})
},
SET_MENU: (state, menu) => {
state.menu = menu
- setStore({ name: 'menu', content: state.menu })
+ setStore({name: 'menu', content: state.menu})
},
SET_REFRESH_TOKEN: (state, refreshToken) => {
setRefreshToken(refreshToken)
--
Gitblit v1.9.3