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.$ = $ diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue index d61f2b528..872f0da42 100644 --- a/src/pages/home1/components/release/index.vue +++ b/src/pages/home1/components/release/index.vue @@ -3,86 +3,102 @@
+ diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 6a371a151..85c93ef7a 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -109,7 +109,7 @@ @@ -172,7 +172,7 @@ @@ -237,7 +237,7 @@ @@ -301,7 +301,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 3a5c40337..a95f5bfff 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -100,6 +100,12 @@ + + + @@ -392,6 +398,7 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + console.log(data); this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue index 3d1c61169..3a02b3ed5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue @@ -71,10 +71,6 @@ width="55" align="center"> - - diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 9d2296c0b..5c67efa1b 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -71,10 +71,6 @@ width="55" align="center"> - - 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 a15fe6b6b..a29c0a152 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -203,10 +203,8 @@ width="110px" label="发布日期"> @@ -217,7 +215,7 @@ label="实施日期"> @@ -227,7 +225,7 @@ width="150px" label="新车型实施日期"> --> @@ -4738,7 +4736,7 @@ export default { .el-card { min-width: min-content; } - + height: 95%; width: calc(~'100% - 15px'); position: absolute; left: 0; diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue index 6b4009dc0..da065c8d0 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue @@ -163,7 +163,7 @@