From 36fff14de9bb4808d8dbf5c586baf331986e53a3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 22:56:22 +0800
Subject: [PATCH] 修改可输可选新增方法，完善部分漏改按钮code

---
 Source/UBCS-WEB/src/store/modules/user.js |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/store/modules/user.js b/Source/UBCS-WEB/src/store/modules/user.js
index 1647416..e8fc9c2 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 {ssoLogin} from "@/api/system/user.js"
 import {getTopMenu, getRoutes} from '@/api/system/menu'
 import md5 from 'js-md5'
 
@@ -43,7 +44,10 @@
     menuAll: getStore({name: 'menuAll'}) || [],
     token: getStore({name: 'token'}) || '',
     refreshToken: getStore({name: 'refreshToken'}) || '',
-    upadatastatus:[]
+    upadatastatus:[],
+    updataid:{
+      id:""
+    }
   },
   actions: {
     //鏍规嵁鐢ㄦ埛鍚嶇櫥褰�
@@ -106,9 +110,9 @@
       })
     },
     //鏍规嵁鍗曠偣淇℃伅鐧诲綍
-    LoginBySso({commit}, userInfo) {
+    LoginBySso({commit},{PathString}) {
       return new Promise((resolve) => {
-        loginBySso(userInfo.state,).then(res => {
+        ssoLogin(PathString).then(res => {
           const data = res.data;
           if (data.error_description) {
             Message({
@@ -141,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,
@@ -221,13 +225,17 @@
       return new Promise((resolve) => {
         getButtons().then(res => {
           const data = res.data.data;
+          // console.log(data);
           commit('SET_PERMISSION', data);
-          resolve();
+          resolve()
         })
       })
     },
   },
   mutations: {
+    byid:(state,id)=>{
+      state.updataid=id
+    },
     SET_TOKEN: (state, token) => {
       setToken(token);
       state.token = token;
@@ -264,8 +272,8 @@
       setStore({name: 'tenantId', content: state.tenantId})
     },
     SET_USER_INFO: (state, userInfo) => {
-      console.log('hahahha',userInfo)
       state.upadatastatus=userInfo
+      // console.log(state.upadatastatus)
       if (validatenull(userInfo.avatar)) {
         userInfo.avatar = "/img/bg/img-logo.png";
       }
@@ -275,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