From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/store/modules/user.js | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/store/modules/user.js b/Source/UBCS-WEB/src/store/modules/user.js
index f1c8eb1..8227677 100644
--- a/Source/UBCS-WEB/src/store/modules/user.js
+++ b/Source/UBCS-WEB/src/store/modules/user.js
@@ -5,6 +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 {getTopMenu, getRoutes} from '@/api/system/menu'
import md5 from 'js-md5'
@@ -43,6 +44,10 @@
menuAll: getStore({name: 'menuAll'}) || [],
token: getStore({name: 'token'}) || '',
refreshToken: getStore({name: 'refreshToken'}) || '',
+ upadatastatus:[],
+ updataid:{
+ id:""
+ }
},
actions: {
//鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
@@ -105,9 +110,9 @@
})
},
//鏍规嵁鍗曠偣淇℃伅鐧诲綍
- LoginBySso({commit}, userInfo) {
+ LoginBySso({commit}) {
return new Promise((resolve) => {
- loginBySso(userInfo.state,).then(res => {
+ oaSsos().then(res => {
const data = res.data;
if (data.error_description) {
Message({
@@ -220,6 +225,7 @@
return new Promise((resolve) => {
getButtons().then(res => {
const data = res.data.data;
+ // console.log(data);
commit('SET_PERMISSION', data);
resolve();
})
@@ -227,6 +233,9 @@
},
},
mutations: {
+ byid:(state,id)=>{
+ state.updataid=id
+ },
SET_TOKEN: (state, token) => {
setToken(token);
state.token = token;
@@ -263,6 +272,8 @@
setStore({name: 'tenantId', content: state.tenantId})
},
SET_USER_INFO: (state, userInfo) => {
+ state.upadatastatus=userInfo
+ console.log(state.upadatastatus)
if (validatenull(userInfo.avatar)) {
userInfo.avatar = "/img/bg/img-logo.png";
}
--
Gitblit v1.9.3