From f78853d4c5ee88da1b0bc2861c27062152a08663 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 22 Dec 2021 15:20:28 +0800 Subject: [PATCH] feat: There is no way the,iphone config --- src/App.vue | 2 +- src/main.js | 112 ++++++++++++++++++------------ src/pages/processedPage/index.vue | 30 ++++++++ src/router/index.js | 9 +++ 4 files changed, 109 insertions(+), 44 deletions(-) create mode 100644 src/pages/processedPage/index.vue diff --git a/src/App.vue b/src/App.vue index 77b537dbb..610b62e0c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -215,7 +215,7 @@ export default { && this.$route.name !== 'beeEnergyLogin' && this.$route.name !== 'mdLawLogin' && this.$route.name !== 'nuoBLogin' && this.$route.name !== 'sTLogin' && this.$route.name !== 'StandardSearch' && this.$route.name !== 'phoneIndex' - && this.$route.name !== 'blankPage') { + && this.$route.name !== 'blankPage' && this.$route.name !== 'processedPage' ) { this.isBoolean = true } else { this.isBoolean = false diff --git a/src/main.js b/src/main.js index dd100ae16..e05c9b850 100644 --- a/src/main.js +++ b/src/main.js @@ -107,6 +107,9 @@ router.beforeEach(function (to, from, next) { // 返回值为登录状态 /** 判断是不是在手机端操作 */ if (isMobile()) { + if(toName === 'processCenter'){ + window.close(); + } if ((token === null || token === '' ) && toName !== 'Login') { if(toName !== 'phoneIndex'){ sessionStorage.removeItem("param"); @@ -117,13 +120,18 @@ router.beforeEach(function (to, from, next) { } } else { if (toName.slice(0,5) !== 'phone') { - let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + - '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType - let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) - next({path: phoneRouter + '?' + paramPhone}) + if(toName === 'LoginVerify'){ + next('/blankPage') + }else { + if(toName === 'blankPage' || toName === 'processedPage') { + next() + }else { + extractedVerify() + } + } }else { if(toName !== 'blankPage'){ - if(to.matched.length == 0){ + if(to.matched.length === 0){ next('/blankPage') }else { next() @@ -174,48 +182,54 @@ router.beforeEach(function (to, from, next) { let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus; let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished; - if (hisCount && hisCount > 0) { // 业务系统 当前节点已完成 - // 根据type判断跳转具体流程页面 - if (prcType === '1') { - // 标准入库流程数据 - extracted("bzrkStep5"); - } else if (prcType === '4') { - //标准清单发布流程数据 - extracted("bzqdfbStep1-4"); - } else if (prcType === '5') { - //标准项目合规评估 标准维度 - if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { - extracted("xmpgStep1-2"); - } else { - extracted("xmpgStep1-7"); + if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成 + if(isMobile()){ + next('/processedPage') + }else { + // 根据type判断跳转具体流程页面 + if (prcType === '1') { + // 标准入库流程数据 + extracted("bzrkStep5"); + } else if (prcType === '4') { + //标准清单发布流程数据 + extracted("bzqdfbStep1-4"); + } else if (prcType === '5') { + //标准项目合规评估 标准维度 + if (path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2") { + extracted("xmpgStep1-2"); + } else { + extracted("xmpgStep1-7"); + } + } else if (prcType === '6') { + //标准项目合规评估 项目维度 + if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { + extracted("xmpg2Step1-2"); + } else { + extracted("xmpg2Step1-12"); + } + } else if (prcType === '8') { + // 未符合项整改 + extracted("wfhxzgStep5-1"); + } else if (prcType === '9') { + extracted("bzjdStep1-6"); + //标准调研流程 + } else if (prcType === '2') { + extracted("bzdyStep1-9"); + } else if (prcType === '3') { + //标准征求意见 + extracted("bzzqyjStep1-9"); + } else if (prcType === '10') { + //项目清单确认 + extracted("xmqdqrStep1-3"); + } } - } else if (prcType === '6') { - //标准项目合规评估 项目维度 - if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") { - extracted("xmpg2Step1-2"); - } else { - extracted("xmpg2Step1-12"); - } - } else if (prcType === '8') { - // 未符合项整改 - extracted("wfhxzgStep5-1"); - } else if (prcType === '9') { - extracted("bzjdStep1-6"); - //标准调研流程 - } else if (prcType === '2') { - extracted("bzdyStep1-9"); - } else if (prcType === '3') { - //标准征求意见 - extracted("bzzqyjStep1-9"); - } else if (prcType === '10') { - //项目清单确认 - extracted("xmqdqrStep1-3"); - } } else { // 业务系统 当前节点未完成 // commitStatus 大于0 表示当前节点存在未完成干活流程 // isNotFinished OA 系统显示接受任务 已置为已办 if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) { - if (prcType === '3') { + if(isMobile()) { + extractedIphone() + }else if (prcType === '3') { //标准征求意见 接受节点 未完成 oa已办 跳转详情页面 if (path === '/bzzqyjStep3') { extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess"); @@ -246,7 +260,12 @@ router.beforeEach(function (to, from, next) { } } } else { - extracted3() + if(isMobile()) { + extractedIphone() + }else{ + extracted3() + } + } } function extracted(routerPath) { @@ -268,6 +287,13 @@ router.beforeEach(function (to, from, next) { next() } } + + function extractedIphone() { + let paramPhone = 'taskIds=' + taskId + '&prcId=' + prcId + '&prcNum=' + prcNum + + '&taskAssignee=' + toName + '&prcName=' + prcName + '&prcType=' + prcType + let phoneRouter = 'phone' + toName.charAt(0).toUpperCase() + toName.slice(1) + next({path: phoneRouter + '?' + paramPhone}) + } function extracted2(routerPath,param2) { if (token === null || token === '') { extractedLocalStorage(routerPath,param2); diff --git a/src/pages/processedPage/index.vue b/src/pages/processedPage/index.vue new file mode 100644 index 000000000..efd7a6d63 --- /dev/null +++ b/src/pages/processedPage/index.vue @@ -0,0 +1,30 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 4d6bc0a6d..d8bdd59cb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,6 +23,15 @@ const routes = [ title: '手机提示页面', } }, + { + path: '/processedPage', + name: 'processedPage', + component: resolve => require(['@/pages/processedPage/index.vue'], resolve), + meta: { + requireAuth: true, + title: '手机提示页面', + } + }, { path: '*', redirect: '/loginVerify'