From 7882c9b631efc11a60fbd8f824a3dd85e57d941b Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 26 Dec 2024 11:02:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A6=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/email-recompose/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue index ba74eceb..21c1ce7b 100644 --- a/src/views/email-recompose/index.vue +++ b/src/views/email-recompose/index.vue @@ -29,9 +29,9 @@ - + From 9cd540d1ecce4d33ea68ab7f0624c46a3f9e1cf2 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 26 Dec 2024 12:29:55 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 2 ++ src/store/getters.js | 1 + src/store/modules/user.js | 6 ++++++ .../trials-layout/components/trialsNavbar.vue | 19 +++++++++++++++---- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/permission.js b/src/permission.js index 185ace75..a5bb41b2 100644 --- a/src/permission.js +++ b/src/permission.js @@ -1,4 +1,5 @@ import router from './router' +import { resetRouter } from '@/router' import store from './store' // import { Message } from 'element-ui' import NProgress from 'nprogress' @@ -80,6 +81,7 @@ router.beforeEach(async (to, from, next) => { await store.dispatch('user/getInfo') await store.dispatch('user/getUserInfo') const accessRoutes = await store.dispatch('permission/generateRoutes') + resetRouter() router.addRoutes(accessRoutes) next({ ...to, replace: true }) } catch (error) { diff --git a/src/store/getters.js b/src/store/getters.js index 6ab90e66..eb877042 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -3,6 +3,7 @@ const getters = { device: state => state.app.device, token: state => state.user.token, name: state => state.user.name, + userTypeShortName: state => state.user.userTypeShortName, permissions: state => state.user.permissions, tree: state => state.user.tree, userName: state => state.user.userName, diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5d725e21..b99d4dcb 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -8,6 +8,7 @@ const getDefaultState = () => { return { token: getToken(), name: '', + userTypeShortName: "", userName: '', userId: '', identityUserId: '', @@ -40,6 +41,9 @@ const mutations = { SET_NAME: (state, name) => { state.name = name }, + SET_USERTYPESHORTNAME: (state, userTypeShortName) => { + state.userTypeShortName = userTypeShortName + }, SET_USERNAME: (state, name) => { state.userName = name }, @@ -176,6 +180,7 @@ const actions = { const userString = decodeURIComponent(escape(window.atob(data.split('.')[1].replace(/-/g, '+').replace(/_/g, '/')))) const user = JSON.parse(userString) zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName) + commit('SET_USERTYPESHORTNAME', user.userTypeShortName) commit('SET_NAME', user.fullName) setName(user.fullName) var permissions = await getUserPermissions() @@ -222,6 +227,7 @@ const actions = { commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser')) const user = JSON.parse(userString) commit('SET_NAME', zzSessionStorage.getItem('Name')) + commit('SET_USERTYPESHORTNAME', user.userTypeShortName) commit('SET_IDENTITYUSERID', user.identityUserId) commit('SET_USERID', user.userRoleId) commit('SET_USERNAME', zzSessionStorage.getItem('userName')) diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index e8404a87..44b1e9b1 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -116,6 +116,7 @@ import { mapGetters, mapMutations } from 'vuex' import TopLang from './topLang' import NoticeMarquee from './noticeMarquee' +import { resetRouter } from '@/router' import toggleRole from '@/components/toggleRole' export default { components: { TopLang, NoticeMarquee, toggleRole }, @@ -123,7 +124,7 @@ export default { return { activeIndex: '2', isReviewer: false, - userTypeShortName: zzSessionStorage.getItem('userTypeShortName'), + // userTypeShortName: zzSessionStorage.getItem('userTypeShortName'), notice: '', VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION, NODE_ENV: process.env.NODE_ENV, @@ -139,6 +140,7 @@ export default { 'device', 'TotalNeedSignSystemDocCount', 'language', + 'userTypeShortName', ]), roles() { return this.$store.state.user.roles @@ -244,6 +246,7 @@ export default { .dispatch('permission/generateRoutes') .then(async (res) => { if (res && res.length > 0) { + resetRouter() await this.$store.dispatch('global/getNoticeList') this.$router.addRoutes(res) this.toggleRoleLoading = false @@ -263,11 +266,19 @@ export default { 'role:rir', ]) ) { - this.$router.replace({ path: '/trials/trials-list' }) + history.replaceState(null, null, '/trials/trials-list') + history.go(0) + // this.$router.replace({ path: '/trials/trials-list' }) } else { - this.$router.replace({ path: '/trials' }) + history.replaceState(null, null, '/trials') + history.go(0) + // this.$router.replace({ path: '/trials/trials-workbench' }) } - window.location.reload() + this.toggleRoleVisible = false + this.toggleRoleLoading = false + this.$nextTick(() => { + window.location.reload() + }) } else { // 此账户暂未配置菜单权限，请联系管理员处理后再登录。 this.toggleRoleLoading = false From 940a860352df4e0c8d4e7f56db9a947a6c78850d Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 26 Dec 2024 13:29:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E=E5=8F=82=E6=95=B0IdentityU?= =?UTF-8?q?serId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b99d4dcb..dae8780b 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -261,7 +261,8 @@ const actions = { try { removeToken() // must remove token first await loginOut({ - Userd: zzSessionStorage.getItem('userId') + UserRoleId: zzSessionStorage.getItem('userId'), + IdentityUserId: zzSessionStorage.getItem('identityUserId'), }) resetRouter() removeName() From 5dedcbc2efecbda52590153a3f8a8f8831d8cc2b Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 26 Dec 2024 13:53:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-panel/visit/crc-upload/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue index b04baaec..a0ed9df3 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/index.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue @@ -742,10 +742,10 @@ - +