From 016ff79d3b516309aaa8a5e1ef3114a431d7e86e Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 22 Nov 2023 16:50:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20idm=E7=99=BB=E5=BD=95=E4=B8=8D?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main.js b/src/main.js index 48bd5fee0..d07690061 100644 --- a/src/main.js +++ b/src/main.js @@ -67,13 +67,6 @@ import { Loading } from 'element-ui'; // 路由拦截 router.beforeEach(function (to, from, next) { - // const currentURL = window.location.href - // if (currentURL.indexOf('#/') > 0) { - // const index = currentURL.indexOf('#/') - // const startUrl = currentURL.slice(0, index) - // const endUrl = currentURL.slice(index + 2) - // window.location.href = startUrl + endUrl - // } closeLoading() if (isMobile()){ var loading = Loading.service({ @@ -93,8 +86,6 @@ router.beforeEach(function (to, from, next) { if(fromName === undefined || fromName === null){ window.sessionStorage.clear() } - console.log(to) - console.log(from) let toName = to.name if (toName === 'CheckPage' || toName === 'loginStandDetails' || toName === 'error' || toName === 'LoginVerifyPhone') { @@ -110,6 +101,7 @@ router.beforeEach(function (to, from, next) { let token = store.state.token let path = to.path; let userName = "" + /* if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName=") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined))){ if((path.indexOf("/standardSearch/All") !== -1 && to.query.userName !== undefined)){ userName = to.query.userName @@ -118,10 +110,13 @@ router.beforeEach(function (to, from, next) { } window.sessionStorage.clear() }else { + */ if(fromName === 'Home2'){ localStorage.removeItem("external") } + /* } + */ let requireAuth = to.meta.requireAuth; let taskId = to.query.taskIds; let prcId = to.query.prcId; @@ -315,25 +310,33 @@ router.beforeEach(function (to, from, next) { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { extractedVerify(token) }else { + /* if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))){ extractedLocalStorage("standardSearch/All",userName) localStorage.setItem('external', "external") next('/LoginVerifyNoEncryption') closeLoading() }else { + */ if (toName === 'LoginVerifyNoEncryption') { next() closeLoading() }else { + /* if(path === '/standardSearch/All'){ extractedLocalStorage('standardSearch/All',''); }else { + */ extractedLocalStorage('home2',''); + /* } + */ // ssoLoginUrlDev 默认sso 地址 window.location.href = ssoLoginUrlDev } + /* } + */ } } }else if(webLoginType != null && webLoginType === 'dev'){ @@ -487,15 +490,19 @@ router.beforeEach(function (to, from, next) { closeLoading() } }else { + /* if((fromName === undefined || fromName === null) && (path.indexOf("/standardSearch/All&userName") !== -1 || (path.indexOf("/standardSearch/All") !== -1 && userName !== undefined))) { extractedLocalStorage("standardSearch/All",userName) localStorage.setItem('external', "external") next('/LoginVerifyNoEncryption') closeLoading() }else { + */ next() closeLoading() + /* } + */ } } }) From dc7f98234740a27a7f780617e676c855bde0cff5 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Thu, 23 Nov 2023 11:46:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug:=20=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E5=90=8E=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=90=8E=E6=9C=AA=E7=94=9F=E6=95=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index cadd864ca..61b441f56 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -1084,7 +1084,7 @@ export default { }, listSubmit (item) { return new Promise((resolve, reject) => { - let newForm = Object.assign(this.roleForm, item,this.qblx_pageData); + let newForm = Object.assign(this.roleForm, this.qblx_pageData,item); newForm.startUserName = this.$store.getters.userInfo.userName newForm.startUser = this.$store.getters.userInfo.userId newForm.dockUser = item.drafter From 8c69fe5cd92afbe4f0facdeab68cd269216e3a2d Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 23 Nov 2023 14:48:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=89=8B=E6=9C=BA=E7=AB=AF-?= =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=E8=AF=A6=E6=83=85-?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/phone/zlzxDetails.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/phone/zlzxDetails.vue b/src/pages/phone/zlzxDetails.vue index 3c35528f6..924a2a74c 100644 --- a/src/pages/phone/zlzxDetails.vue +++ b/src/pages/phone/zlzxDetails.vue @@ -25,12 +25,14 @@

{{ item.name }} +