From 03511b1399623486c36cfae711d1c93f36a8dcb1 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Tue, 14 Dec 2021 10:43:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E5=AE=9E=E6=96=BD=E6=97=B6=E9=97=B4=E5=BA=94=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/page/listTracking.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index a9ab0e1b7..ccc1957fe 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -203,7 +203,8 @@ > From 1b466894e0b85780ec1815b5e3cdcfeb6418bb86 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 14 Dec 2021 11:12:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 28 +++++++++++++++++-- .../pages/details.vue | 14 ++++++++-- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index f0beb6e21..08270569f 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3177,7 +3177,6 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter(item => item.label === '过程稿件'); - console.log() if (location.label === '基础信息' && list && list.length > 0) { if (!list[0].child) { location['child1'] = [] @@ -3207,7 +3206,6 @@ export default { } } } - const child = location.child || [] const one = [] const half = [] @@ -3232,7 +3230,6 @@ export default { location.showAll = false }) console.log(displayLocation) - this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { id: this.$route.params.id }, { @@ -3240,6 +3237,31 @@ export default { }, res => { displayLocation.map(item => { if (item.value === '2URVBGR2Y4UG77KZ5YPL') { + item.child.forEach(items =>{ + let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); + if (accessCountry.country === undefined) { + accessCountry.country = '文本' + } + if (accessCountry.ssrq === undefined) { + accessCountry.ssrq = '-' + } + if (accessCountry.zccssrqgj === undefined) { + accessCountry.zccssrqgj = '-' + } + if (accessCountry.xcxssrqgj === undefined) { + accessCountry.xcxssrqgj = '-' + } + if(items.attrField === 'SSRQ') { + items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' + item.value = accessCountry.ssrq + } else if (items.attrField === 'ZCCSSRQ') { + items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' + item.value = accessCountry.zccssrqgj + } else if(items.attrField === 'XCXSSRQ') { + items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' + item.value = accessCountry.xcxssrqgj + } + }) for (let key in res.data) { item.one.push({ attrName: key, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 57b044f8d..d8a57b247 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -418,7 +418,8 @@ export default { dialogColor: false, dialogType: "", color: "", - isShow: false + isShow: false, + countryAreaShow: '' }; }, methods: { @@ -654,11 +655,19 @@ export default { }, // 点击查看 handlePreview(data) { + console.log(this.countryAreaShow) + let item = { + country: this.countryAreaShow, + ssrq: data.ssrq, + xcxssrqgj: data.xcxssrqgj, + zccssrqgj: data.zccssrqgj + } + sessionStorage.setItem("accessCountry", JSON.stringify(item)); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { id: data.id, - pageType: data.standType + pageType: data.standType, } }); window.open(routeUrl.href, "_blank"); @@ -773,6 +782,7 @@ export default { let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); this.pageId = accessRow.id; this.sarAccessEO = accessRow; + this.countryAreaShow = accessRow.countryAreaShow this.selectInfobyAccid(); this.getOrgTreeSource(); this.getFileInfo(); From 298321a44de8f8a466db59d46db67eaa6c12f7d1 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 14 Dec 2021 13:23:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 22 +++++++++---------- .../pages/details.vue | 1 - 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 08270569f..84fe82c79 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3242,24 +3242,22 @@ export default { if (accessCountry.country === undefined) { accessCountry.country = '文本' } - if (accessCountry.ssrq === undefined) { - accessCountry.ssrq = '-' - } - if (accessCountry.zccssrqgj === undefined) { - accessCountry.zccssrqgj = '-' - } - if (accessCountry.xcxssrqgj === undefined) { - accessCountry.xcxssrqgj = '-' - } if(items.attrField === 'SSRQ') { items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' - item.value = accessCountry.ssrq + if (accessCountry.ssrq !== undefined) { + item.value = accessCountry.ssrq + } } else if (items.attrField === 'ZCCSSRQ') { items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' - item.value = accessCountry.zccssrqgj + if (accessCountry.zccssrqgj !== undefined) { + item.value = accessCountry.zccssrqgj + } } else if(items.attrField === 'XCXSSRQ') { items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' - item.value = accessCountry.xcxssrqgj + if (accessCountry.xcxssrqgj !== undefined) { + item.value = accessCountry.xcxssrqgj + } + } }) for (let key in res.data) { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index d8a57b247..afb29ac50 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -655,7 +655,6 @@ export default { }, // 点击查看 handlePreview(data) { - console.log(this.countryAreaShow) let item = { country: this.countryAreaShow, ssrq: data.ssrq,