diff --git a/src/main.js b/src/main.js index aeddc2492..26cb746cb 100644 --- a/src/main.js +++ b/src/main.js @@ -65,6 +65,12 @@ import VConsole from 'vuex' import isMobile from "./store/isMobile"; // 路由拦截 router.beforeEach(function (to, from, next) { + + let fromName = from.name + if(fromName === undefined || fromName === null){ + window.sessionStorage.clear() + } + let toName = to.name if (toName === 'CheckPage') { next() @@ -75,7 +81,6 @@ router.beforeEach(function (to, from, next) { window.location.href = ssoLoginUrlDev } - let fromName = from.name let token = store.state.token let path = to.path; let userName = "" @@ -189,6 +194,12 @@ router.beforeEach(function (to, from, next) { } } } else { + if ((token === null || token === '' ) && toName === 'OtherStandardDetails') { + if (document.cookie) { + next() + return + } + } if ((token === null || token === '' ) && toName !== 'Login') { if(webLoginType != null && webLoginType === 'idm' ){ if(code){ diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 062f1ac58..0860cfe83 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -156,6 +156,8 @@ let userInfoStr = Base64.decode(res.data) let userInfo2 = decodeURIComponent(userInfoStr) let userInfoObj = JSON.parse(userInfo2) + document.cookie = 'hrefToken' + userInfoObj.token + //localStorage.setItem('hrefToken', userInfoObj.token) userInfoObj.userId = userInfoObj.usid window.sessionStorage.setItem('userInfoObj', userInfoObj); // del this.setToken(userInfoObj.token) // vuex存储token diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index b467c212d..c6fd73059 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -103,19 +103,6 @@ - - -
- - -
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue index d8f886a62..4a5a19040 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue @@ -266,23 +266,9 @@ label="评估人" /> - - -
- - -
-
-
-