From cf4ca56254d06aba24296c8c6f1e4752a49684f0 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Mon, 25 Apr 2022 09:53:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main.js | 6 ++++++
src/pages/login/index.vue | 1 +
2 files changed, 7 insertions(+)
diff --git a/src/main.js b/src/main.js
index aeddc2492..b47ce92ac 100644
--- a/src/main.js
+++ b/src/main.js
@@ -189,6 +189,12 @@ router.beforeEach(function (to, from, next) {
}
}
} else {
+ if ((token === null || token === '' ) && toName === 'OtherStandardDetails') {
+ if (localStorage.getItem('hrefToken')) {
+ 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..1db7e9003 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -156,6 +156,7 @@
let userInfoStr = Base64.decode(res.data)
let userInfo2 = decodeURIComponent(userInfoStr)
let userInfoObj = JSON.parse(userInfo2)
+ localStorage.setItem('hrefToken', userInfoObj.token)
userInfoObj.userId = userInfoObj.usid
window.sessionStorage.setItem('userInfoObj', userInfoObj); // del
this.setToken(userInfoObj.token) // vuex存储token
From 21a543dfba1c749ec560ce09bef25bec72c3bbcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 25 Apr 2022 10:23:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main.js | 2 +-
src/pages/login/index.vue | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main.js b/src/main.js
index b47ce92ac..4498a4365 100644
--- a/src/main.js
+++ b/src/main.js
@@ -190,7 +190,7 @@ router.beforeEach(function (to, from, next) {
}
} else {
if ((token === null || token === '' ) && toName === 'OtherStandardDetails') {
- if (localStorage.getItem('hrefToken')) {
+ if (document.cookie) {
next()
return
}
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 1db7e9003..0860cfe83 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -156,7 +156,8 @@
let userInfoStr = Base64.decode(res.data)
let userInfo2 = decodeURIComponent(userInfoStr)
let userInfoObj = JSON.parse(userInfo2)
- localStorage.setItem('hrefToken', userInfoObj.token)
+ 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
From 751d7192d048f9cfaab0486bd7a0836d37b90cfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 25 Apr 2022 11:23:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?52673=20=E3=80=90=E7=BA=BF=E4=B8=8A?=
=?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?=
=?UTF-8?q?=EF=BC=8C=E6=B5=81=E7=A8=8B=E8=B5=B0=E5=AE=8C=E5=90=8E=20?=
=?UTF-8?q?=E7=9B=91=E6=8E=A7=E6=B5=81=E7=A8=8B=E8=BF=9B=E5=85=A5=E5=88=A0?=
=?UTF-8?q?=E9=99=A4=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzpg/step8-1.vue | 14 --------------
1 file changed, 14 deletions(-)
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="评估人"
/>
-
-
-
-
-
-
-
-
-