From e405b861b9521f5ea38c5402203a5b05988f9de2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 04 十二月 2024 10:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/store/modules/user.js | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js
index d4a78eb..e6e7fba 100644
--- a/Source/plt-web/plt-web-ui/src/store/modules/user.js
+++ b/Source/plt-web/plt-web-ui/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,queryStringToObject} 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'
@@ -38,7 +38,7 @@
item.pathValue = item.path;
item.path = '/' + item.code;
item.query = {}; // 鍒濆鍖� item.query
- if(item.pathValue.indexOf('?')!=-1) {
+ if (item.pathValue.indexOf('?') != -1) {
item.query = queryStringToObject(item.pathValue)
}
if (item.children && item.children.length > 0) {
@@ -63,8 +63,8 @@
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
LoginByUsername({commit}, userInfo) {
return new Promise((resolve, reject) => {
- let passwordDes = func.encryptData(userInfo.password,'daliantan0v0vcip')
- loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username,passwordDes, userInfo.type, userInfo.key,).then(res => {
+ let passwordDes = func.encryptData(userInfo.password, 'daliantan0v0vcip')
+ loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username, passwordDes, userInfo.type, userInfo.key,).then(res => {
const data = res.data;
if (data.obj.failCode === 'loginSuccess') {
commit('SET_TOKEN', data.obj.tokenVO.accessToken);
@@ -210,7 +210,7 @@
return new Promise((resolve, reject) => {
getUserInfo().then((res) => {
const data = res.data.data;
- console.log('user',res)
+ console.log('user', res)
// commit('SET_USER_INFO', data.roles);
resolve(data);
}).catch(err => {
@@ -296,8 +296,20 @@
SET_ROLES: (state, roles) => {
state.roles = roles;
},
-
+ SET_PERMISSION: (state, permission) => {
+ let permission_new = {};
+ permission.forEach(item => {
+ let children = {};
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(child => {
+ Vue.set(children, child.code, true);
+ });
+ }
+ Vue.set(permission_new, item.code, children);
+ });
+ state.permission = permission_new;
+ setStore({name: "permission", content: permission_new});
+ },
}
-
}
export default user
--
Gitblit v1.9.3