From 76d0dbda65988cf3605a9709cbb28c0d5211adad Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 16 Sep 2021 11:15:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                   | 1 +
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index bf92cb8d4..6d304d8dd 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -4157,6 +4157,7 @@ export default {
         .el-card{
           min-width: min-content;
         }
+        height: 95%;
         width: 95%;
         position: absolute;
         left: 0;
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c156c9622..a29c0a152 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -4736,7 +4736,7 @@ export default {
       .el-card {
         min-width: min-content;
       }
-
+      height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;
       left: 0;

From 053c6d50b42473d386e5d4d60f6969d82961ac79 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 16 Sep 2021 15:07:32 +0800
Subject: [PATCH 2/2] feat: There is no way the router beforeEach

---
 src/api/process.js |  8 ++++++
 src/main.js        | 63 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/api/process.js b/src/api/process.js
index d14dbba20..c6bbdfcaf 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -415,6 +415,14 @@ export function isEnd (data) {
   })
 }
 
+export function get_verify_by_instance (data) {
+  return axios({
+    url: '/api/lawss/activiti/get_verify_by_instance',
+    method: 'get',
+    params: data
+  })
+}
+
 // 流程委托接口
 export function changeAssigneeNew (data) {
   return axios({
diff --git a/src/main.js b/src/main.js
index 98e9de1ae..0fcaa19db 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,6 @@ require('es6-promise').polyfill();
 require('es6-promise/auto');
 import Vue from 'vue'
 import App from './App'
-import router from './router'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // jQuery
@@ -42,6 +41,68 @@ import Contextmenu from 'vue-contextmenujs'
 
 import animate from 'animate.css'
 
+// 引入路由器
+import router from './router'
+// 路由解析器
+import Re from 'path-to-regexp'
+
+import { get_verify_by_instance } from 'api/process'
+
+
+// 路由拦截
+router.beforeEach(function (to, from, next) {
+  let path = to.path;
+  console.log("auth : to =>", to);
+  console.log("auth : path =>" + path);
+  let taskId = to.query.taskIds;
+  let prcId = to.query.prcId;
+  let prcNum = to.query.prcNum;
+  let prcName = to.query.prcName;
+  let prcType = to.query.prcType;
+  if(taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null){
+    get_verify_by_instance({
+      taskId: taskId, // 任务id
+      pId: prcId // 流程实例
+    }).then(res => {
+      if(res && res > 0){
+        let param = "?taskIds="+taskId+"&prcId="+prcId
+        +"&prcNum="+prcNum+"&prcName="+prcName+"&prcType="+prcType;
+        // 根据type判断跳转具体流程页面
+        if (prcType === '1') {
+          // 标准入库流程数据
+          next({path:"bzrkStep5"+param})
+        }else if(prcType === '4'){
+          //标准清单发布流程数据
+          next({path:"bzqdfbStep1-4"+param})
+        }else if (prcType === '5'){
+          //标准项目合规评估 标准维度
+          next({path:"xmpgStep1-2"+param})
+        }else if(prcType === '6'){
+          //标准项目合规评估 项目维度
+          next({path:"xmpg2Step1-2"+param})
+        } else if (prcType === '8') {
+          // 未符合项整改
+          next({path:"wfhxzgStep5-1"+param})
+        } else if(prcType === '9'){
+          next({path:"bzjdStep1-6"+param})
+          //标准调研流程
+        }else if(prcType === '2'){
+          next({path:"bzdyStep1-9"+param})
+        }else if(prcType === '3'){
+          //标准征求意见
+          next({path:"bzzqyjStep1-9"+param})
+        }else if(prcType === '10'){
+          //项目清单确认
+          next({path:"xmqdqrStep1-2"+param})
+        }
+      }
+      console.log("res : res =>", res);
+    })
+  }
+  next()
+})
+
+
 Vue.config.productionTip = false
 // jquery
 Vue.prototype.$ = $