ZQ/laws-sinotruk-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[update] OA单点登录后跳转待办页面

Browse Source
This commit is contained in:
lideqin
2024-02-27 18:15:48 +08:00
parent 1afaa02a8a
commit 41e0fac134
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/permission.js
+8 -4
View File
@@ -127,10 +127,12 @@ router.beforeEach(async (to, from, next) => {
if (to.path === '/user/login' && isOAuth2AppEnv()) { if (to.path === '/user/login' && isOAuth2AppEnv()) {
next({ path: OAUTH2_LOGIN_PAGE_PATH }) next({ path: OAUTH2_LOGIN_PAGE_PATH })
} else { } else {
let path = to.path const path = to.fullPath
// 在免登录白名单，直接进入 // 在免登录白名单，直接进入
if (to.path === '/user/login' && to.path !== process.env.VUE_APP_LOGIN_PAGE) { if (to.path === '/user/login' && to.path !== process.env.VUE_APP_LOGIN_PAGE) {
window.location.replace(process.env.VUE_APP_LOGIN_PAGE) const toPage = process.env.VUE_APP_LOGIN_PAGE.replace('/dashboard/analysis', path.replaceAll('&', '%26'))
console.log(toPage)
// window.location.replace(toPage)
return return
} }
next() next()
@@ -139,8 +141,10 @@ router.beforeEach(async (to, from, next) => {
} else { } else {
// 如果当前是在OAuth2APP环境，就跳转到OAuth2登录页面 // 如果当前是在OAuth2APP环境，就跳转到OAuth2登录页面
const path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : '/user/login' const path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : '/user/login'
if (path === '/user/login' && path !== process.env.VUE_APP_LOGIN_PAGE) { if (path === '/user/login' && to.path !== process.env.VUE_APP_LOGIN_PAGE) {
window.location.replace(process.env.VUE_APP_LOGIN_PAGE) const toPage = process.env.VUE_APP_LOGIN_PAGE.replace('/dashboard/analysis', to.fullPath.replaceAll('&', '%26'))
console.log(toPage)
// window.location.replace(toPage)
return return
} }
next({ path: path, query: { redirect: to.fullPath } }) next({ path: path, query: { redirect: to.fullPath } })