diff --git a/.env.dev b/.env.dev index 6d22ec2d..edf72a5b 100644 --- a/.env.dev +++ b/.env.dev @@ -17,7 +17,7 @@ VUE_APP_TITLE = 洛玻集团驾驶舱 # VUE_APP_BASE_API = 'http://192.168.0.35:8080' # 闫阳 # VUE_APP_BASE_API = 'http://172.16.19.131:7070' -VUE_APP_BASE_API = 'http://172.16.20.187:7070' +VUE_APP_BASE_API = 'http://dashboard.kszny.picaiba.com' # 路由懒加载 diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 72fb52a9..4343ef2c 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -11,20 +11,14 @@
{{ nickname }} - +
- - - + @@ -180,7 +174,7 @@ export default { position: relative; .user-avatar { - cursor: pointer; + // cursor: pointer; width: 35px; height: 35px; border-radius: 50%; diff --git a/src/permission.js b/src/permission.js index a7376444..5d3e97a4 100644 --- a/src/permission.js +++ b/src/permission.js @@ -56,11 +56,15 @@ const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/regi router.beforeEach((to, from, next) => { NProgress.start() // === MES SSO 跳转:URL 参数中携带 token,自动存储并登录 === + // 本地 token 与 URL token 不一致(换用户或首次跳转)时,覆盖并强制重新登录 const searchParams = new URLSearchParams(window.location.search) const urlAccessToken = searchParams.get('accessToken') || searchParams.get('access_token') const urlRefreshToken = searchParams.get('refreshToken') || searchParams.get('refresh_token') - if (urlAccessToken && urlRefreshToken && !getAccessToken()) { + if (urlAccessToken && urlRefreshToken && urlAccessToken !== getAccessToken()) { setToken({ accessToken: urlAccessToken, refreshToken: urlRefreshToken }) + // 清空已加载的用户状态,否则 roles 已存在时守卫不会重新 GetInfo,导致显示旧用户 + store.commit('SET_ROLES', []) + store.commit('SET_PERMISSIONS', []) next({ path: '/', replace: true }) return } diff --git a/src/views/home/components/Header.vue b/src/views/home/components/Header.vue index 59d6309a..80c105ad 100644 --- a/src/views/home/components/Header.vue +++ b/src/views/home/components/Header.vue @@ -12,14 +12,14 @@
{{ nickname }} - +
- + @@ -389,7 +389,7 @@ export default { position: relative; .user-avatar { - cursor: pointer; + // cursor: pointer; width: 32px; height: 32px; border-radius: 50%; diff --git a/src/views/home/components/budgetHeader.vue b/src/views/home/components/budgetHeader.vue index 467cdd5d..ca33b055 100644 --- a/src/views/home/components/budgetHeader.vue +++ b/src/views/home/components/budgetHeader.vue @@ -11,14 +11,14 @@
{{ nickname }} - +
- + - + @@ -408,7 +408,7 @@ export default { position: relative; .user-avatar { - cursor: pointer; + // cursor: pointer; width: 32px; height: 32px; border-radius: 50%; diff --git a/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue b/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue index d4a78ca9..0c330cbc 100644 --- a/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue +++ b/src/views/home/productionCostAnalysisComponents/noRouterHeader.vue @@ -11,14 +11,14 @@
{{ nickname }} - +
- + @@ -476,7 +476,7 @@ export default { position: relative; .user-avatar { - cursor: pointer; + // cursor: pointer; width: 32px; height: 32px; border-radius: 50%;