From 177510643da3f6b22d197c851b7b0ae39c879cfc Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 23 Dec 2024 18:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=A7=92=E8=89=B2=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/toggleRole/index.vue | 12 ++++++++---- src/store/getters.js | 1 + src/store/modules/permission.js | 1 + src/store/modules/user.js | 20 ++++++++++++++------ src/views/login/index.vue | 14 +++++++++++--- 5 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/components/toggleRole/index.vue b/src/components/toggleRole/index.vue index c928068a..b792865b 100644 --- a/src/components/toggleRole/index.vue +++ b/src/components/toggleRole/index.vue @@ -8,14 +8,15 @@ append-to-body :title="$t('toggleRole:tip:title')" center + top="30vh" :show-close="false" @close="cancel" > @@ -37,7 +38,11 @@ export default { props: { visible: { type: Boolean, - default: true, + default: false, + }, + loading: { + type: Boolean, + default: false, }, }, data() { @@ -45,7 +50,6 @@ export default { form: { UserTypeId: null, }, - loading: false, } }, computed: { diff --git a/src/store/getters.js b/src/store/getters.js index 9f5c1c33..30e43422 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -7,6 +7,7 @@ const getters = { tree: state => state.user.tree, userName: state => state.user.userName, userId: state => state.user.userId, + userRoleId: state => state.user.userRoleId, routes: state => state.permission.routes, asyncRoutes: state => state.permission.addRoutes, visitedViews: state => state.tagsView.visitedViews, diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index aef32a5b..5afee253 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -118,6 +118,7 @@ const actions = { return new Promise(resolve => { var newTree = JSON.parse(zzSessionStorage.getItem('newTree')) const sidebarRoutes = filterAsyncRouter(newTree || []) + console.log(sidebarRoutes, 'sidebarRoutes') commit('SET_ROUTES', sidebarRoutes) resolve(sidebarRoutes) }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5b57f3fc..196f0186 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -9,6 +9,7 @@ const getDefaultState = () => { name: '', userName: '', userId: '', + userRoleId: '', avatar: '', permissions: [], tree: [], @@ -53,6 +54,9 @@ const mutations = { SET_USERID: (state, id) => { state.userId = id }, + SET_USEROLEID: (state, id) => { + state.userRoleId = id + }, SET_ISTESTUSER: (state, isTestUser) => { state.isTestUser = eval(isTestUser) }, @@ -127,13 +131,13 @@ const actions = { zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser) commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser) commit('SET_USERNAME', data.BasicInfo.UserName) - commit('SET_USERID', data.BasicInfo.Id) + commit('SET_USERID', data.BasicInfo.IdentityUserId) setToken(data.JWTStr) setName(data.BasicInfo.RealName) const userString = decodeURIComponent(escape(window.atob(data.JWTStr.split('.')[1].replace(/-/g, '+').replace(/_/g, '/')))) const user = JSON.parse(userString) zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName) - zzSessionStorage.setItem('userId', user.id) + zzSessionStorage.setItem('userId', user.identityUserId) zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt) // var permissions = await getUserPermissions() // var menuTree = await getUserMenuTree() @@ -155,9 +159,9 @@ const actions = { }) }, loginByRole({ commit }, userInfo) { - const { UserTypeId } = userInfo + const { userRoleId } = userInfo let params = { - UserTypeId + userRoleId } return new Promise((resolve, reject) => { @@ -166,6 +170,8 @@ const actions = { const data = response.Result try { + commit('SET_USEROLEID', userRoleId) + zzSessionStorage.setItem('userRoleId', userRoleId) commit('SET_TOKEN', data) setToken(data) var permissions = await getUserPermissions() @@ -212,14 +218,16 @@ const actions = { commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser')) const user = JSON.parse(userString) commit('SET_NAME', zzSessionStorage.getItem('realName')) - commit('SET_USERID', user.id) + commit('SET_USEROLEID', user.userRoleId) + commit('SET_USERID', user.identityUserId) commit('SET_USERNAME', zzSessionStorage.getItem('userName')) commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))) commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))) console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')) console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')) zzSessionStorage.setItem('userName', user.name) - zzSessionStorage.setItem('userId', user.id) + zzSessionStorage.setItem('userId', user.identityUserId) + zzSessionStorage.setItem('userRoleId', user.userRoleId) zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName) zzSessionStorage.setItem('userTypeEnumInt', user.userTypeEnumInt) return user diff --git a/src/views/login/index.vue b/src/views/login/index.vue index a069c363..cbc18c50 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -243,7 +243,11 @@ - + @@ -301,6 +305,7 @@ export default { showCode: false, Img1, toggleRoleVisible: false, + toggleRoleLoading: false, } }, computed: { @@ -426,10 +431,12 @@ export default { this.loading = false }) }, - loginByRole(UserTypeId) { + loginByRole(userRoleId) { + this.toggleRoleLoading = true this.$store - .dispatch('user/loginByRole', { UserTypeId }) + .dispatch('user/loginByRole', { userRoleId }) .then((res) => { + this.toggleRoleLoading = false if (res) { this.$store.dispatch('permission/generateRoutes').then((res) => { this.loading = false @@ -466,6 +473,7 @@ export default { .catch(() => { this.showCode = true this.loading = false + this.toggleRoleLoading = false }) }, onSuccess() {