From 584ae5476c319cd1551a97b64c01ee1e5e5ff5a6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 25 十月 2023 15:46:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/store/modules/user.js | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS-WEB/src/store/modules/user.js b/Source/UBCS-WEB/src/store/modules/user.js
index 8227677..e8fc9c2 100644
--- a/Source/UBCS-WEB/src/store/modules/user.js
+++ b/Source/UBCS-WEB/src/store/modules/user.js
@@ -5,7 +5,7 @@
import {deepClone} from '@/util/util'
import website from '@/config/website'
import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user'
-import {oaSsos} from "@/api/system/user.js"
+import {ssoLogin} from "@/api/system/user.js"
import {getTopMenu, getRoutes} from '@/api/system/menu'
import md5 from 'js-md5'
@@ -110,9 +110,9 @@
})
},
//鏍规嵁鍗曠偣淇℃伅鐧诲綍
- LoginBySso({commit}) {
+ LoginBySso({commit},{PathString}) {
return new Promise((resolve) => {
- oaSsos().then(res => {
+ ssoLogin(PathString).then(res => {
const data = res.data;
if (data.error_description) {
Message({
@@ -145,7 +145,7 @@
},
//鍒锋柊token
refreshToken({state, commit}, userInfo) {
- window.console.log('handle refresh token');
+ // window.console.log('handle refresh token');
return new Promise((resolve, reject) => {
refreshToken(state.refreshToken, state.tenantId,
!validatenull(userInfo) ? userInfo.deptId : state.userInfo.dept_id,
@@ -227,7 +227,7 @@
const data = res.data.data;
// console.log(data);
commit('SET_PERMISSION', data);
- resolve();
+ resolve()
})
})
},
@@ -273,7 +273,7 @@
},
SET_USER_INFO: (state, userInfo) => {
state.upadatastatus=userInfo
- console.log(state.upadatastatus)
+ // console.log(state.upadatastatus)
if (validatenull(userInfo.avatar)) {
userInfo.avatar = "/img/bg/img-logo.png";
}
@@ -283,6 +283,22 @@
SET_ROLES: (state, roles) => {
state.roles = roles;
},
+ SET_PERMISSION: (state, permission) => {
+ let permission_new = {};
+ permission.forEach(item => {
+ //console.log(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);
+ });
+ //console.log(permission_new)
+ state.permission = permission_new;
+ setStore({name: "permission", content: permission_new});
+ },
}
--
Gitblit v1.9.3