From 13d969a4a7464da910bd6e907ffdc099e13138c5 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sat, 7 Aug 2021 11:23:13 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84id=E4=B8=AD=E5=B8=A6=E6=9C=89','=E5=AD=97=E7=AC=A6,?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=97=B6=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step3.vue | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 26187ebbd..352131b8a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -836,29 +836,26 @@ export default { methods: { downloadFile (fileType) { if(fileType === 'fbgbjbd'){ - if(this.fbgbjbdFileId.search(',')){ - this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",",""); - console.log(this.fbgbjbdFileId); - } - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId.replace(",",""); }else if(fileType === 'xgd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId + + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId.replace(",",""); }else if(fileType === 'bpg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId.replace(",",""); }else if(fileType === 'ssg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId.replace(",",""); }else if(fileType === 'zqyjg'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId.replace(",",""); }else if(fileType === 'jdwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId.replace(",",""); }else if(fileType === 'kwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId.replace(",",""); }else if(fileType === 'glwj'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId.replace(",",""); }else if(fileType === 'ca'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId.replace(",",""); }else if(fileType === 'zbjbd'){ - window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId + window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId.replace(",",""); } }, popoverHide (checkedIds, checkedData) { From d43546fc3ce30b7a63c53634722882f964faf89b Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:46:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=AF=94=E5=AF=B9--?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BA=94=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/details.vue | 1 - .../pages/standInvolveProjectDetail.vue | 18 ++++++++++++++- .../pags/consultationDetails.vue | 23 +++++++++++++++---- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index c5488eaf5..bb19c111f 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -646,7 +646,6 @@ export default { }, // 点击查看 handlePreview(data) { - debugger let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index e881b4ce8..04bb340e5 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -60,13 +60,18 @@ width="180" > +

- {{ this.$route.query.item.cid }} + {{ $route.query.item.cid }}

- {{ this.$route.query.item.cname || '-' }} + {{ $route.query.item.cname || '-' }}

- {{ this.$route.query.item.endTime || '-' }} + {{ $route.query.item.endTime || '-' }}

- {{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}} + {{ $route.query.item.startTime + ' ~ ' + $route.query.item.endTime}} -

@@ -166,6 +166,21 @@ } }) }, + + //点击查看 + handlePreview(data) { + console.log(data); + return + let routeUrl = this.$router.resolve({ + name: "OtherStandardDetails", + params: { + id: data.id, + pageType: data.standType + } + }); + window.open(routeUrl.href, "_blank"); + }, + // 获取详情信息列表 getList() { this.spinShow = true From 5e68c10d498659f09a8883ae2439ef409390fafb Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Sun, 8 Aug 2021 09:51:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navMenu/index.vue | 4 ++-- .../accessStandardsAndRegulations/index.vue | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 5f429c122..8f5a892f1 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -300,11 +300,11 @@ export default { // path: '/convertDocView', // menuId: '3F52K25546' // }, - { + /*{ title: '菜单管理', path: '/menuManage', menuId: '87b8b4f5817a7829696e63185c744d52' - }, + },*/ { title: '链接管理', path: '/linkManage', diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 5fae96a98..686e52b43 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -9,9 +9,9 @@
-
+
@@ -68,13 +68,13 @@ export default { name: "listProject" }); continue; - } else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") { + }/* else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") { list.push({ label: "重点标准跟踪清单", name: "listTracking" }); continue; - } else if (entity.id === "5a75523729b04102a565167004d640e9") { + }*/ else if (entity.id === "5a75523729b04102a565167004d640e9") { list.push({ label: "其他清单", name: "listOther" From 9c30db39761ce9f934b078572b022ef04ba04b57 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:51:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E6=AF=94=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 7ae835bc2..9ea5ba731 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -65,14 +65,19 @@ label="标准/政策号" width="180" > - + + {}) - }, // 分页查询 + }, + //点击查看详情 + handlePreview(item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.standId, + pageType: 'INLAND_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, + // 分页查询 resetSelect () { this.sarProject.country = '' this.sarProject.standCode='' From dd4cf4a36c0259645e39de639681272c3073fc81 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Sun, 8 Aug 2021 09:54:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C--=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab=E9=A1=B5=E5=92=8C?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9Ctab?= =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E6=AF=94=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E6=A0=87=E5=87=86=E5=90=8D=E7=A7=B0=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=87=B3=E8=AF=A5=E6=A0=87=E5=87=86=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/technologyInvolveProject.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index 9ea5ba731..53b6bf83e 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -271,7 +271,7 @@ name: "technologyInvolveProject", name: 'OtherStandardDetails', params: { id: item.standId, - pageType: 'INLAND_STAND' + pageType: item.standType + '_STAND' } }) window.open(routeUrl.href, '_blank') From 79dacb01de27a85951128280c00990be10ab570a Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sun, 8 Aug 2021 11:46:38 +0800 Subject: [PATCH 6/6] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 4 ++-- .../pages/creatProcess/bzjd/step1.vue | 4 ++-- .../pages/creatProcess/bzjd/step2.vue | 4 ++-- .../pages/creatProcess/bzjd/step3.vue | 14 +++++++------- .../pages/creatProcess/bzjd/step4.vue | 4 ++-- .../pages/creatProcess/bzjd/step5.vue | 4 ++-- .../pages/creatProcess/bzjd/step6.vue | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 2bd84c26a..edcdc36b2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -103,13 +103,13 @@ + + - - - - - -