diff --git a/src/main.js b/src/main.js index 0fcaa19db..9a21d14e2 100644 --- a/src/main.js +++ b/src/main.js @@ -76,10 +76,18 @@ router.beforeEach(function (to, from, next) { next({path:"bzqdfbStep1-4"+param}) }else if (prcType === '5'){ //标准项目合规评估 标准维度 - next({path:"xmpgStep1-2"+param}) + if(path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2"){ + next({path:"xmpgStep1-2"+param}) + }else { + next({path:"xmpgStep1-7"+param}) + } }else if(prcType === '6'){ //标准项目合规评估 项目维度 - next({path:"xmpg2Step1-2"+param}) + if(path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2"){ + next({path:"xmpg2Step1-2"+param}) + }else { + next({path:"xmpg2Step1-12"+param}) + } } else if (prcType === '8') { // 未符合项整改 next({path:"wfhxzgStep5-1"+param}) @@ -93,7 +101,7 @@ router.beforeEach(function (to, from, next) { next({path:"bzzqyjStep1-9"+param}) }else if(prcType === '10'){ //项目清单确认 - next({path:"xmqdqrStep1-2"+param}) + next({path:"xmqdqrStep1-3"+param}) } } console.log("res : res =>", res); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 8a2829bbf..559b588d5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -374,18 +374,15 @@ export default { }); } }, - created() { - this.searchSarAccess(); - }, mounted() { // 分页查询数据 - this.searchSarAccess(); // 从数据库中查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { _this: this }, res => { this.countryOptions = res.data.COUNTRY; this.setMap(this.countryOptions); + this.searchSarAccess(); }, e => { }); } diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index a11b88d1f..741a5976c 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -389,7 +389,7 @@ export default { }) }, handleQueryPdf(file){ - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.id)) + window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId)) } }, mounted() { diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f2e3f566c..0285c1bb9 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -243,7 +243,7 @@
- 更多 + 详情