From a4049c3e38fb32249c1eb9e83c0fd270ded1ad9a Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Mon, 19 Jul 2021 15:58:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E6=B8=85=E7=A9=BA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=97=A0=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/standInvolveProjectDetail.vue | 1 + .../pages/technologyInvolveProject.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index 887a57d07..38125f7aa 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -293,6 +293,7 @@ export default { this.sarProject.country = '' this.sarProject.standCode='' this.sarProject.standName = '' + this.sarProject.standNumber='' this.queryStandAndLaws() }, // 外层清空条件查询 handleProjectCompliance (row) { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue index daf87f17a..cbdf615b8 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue @@ -264,6 +264,7 @@ name: "technologyInvolveProject", this.sarProject.country = '' this.sarProject.standCode='' this.sarProject.standName = '' + this.sarProject.standNumber='' this.queryStandAndLaws() }, // 外层清空条件查询 handleProjectCompliance (row) { From b4581b973392bfc9dc11c44e82f6ba48c280401d Mon Sep 17 00:00:00 2001 From: zqx0221 <2119066161@qq.com> Date: Mon, 19 Jul 2021 16:34:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=95=B0=E9=87=8F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/mechanismManage/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index a5be0b950..beb4d7667 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -264,6 +264,7 @@ export default { item.NameList = NameList }) this.data = res.data + this.total = res.data.length }) }, pageChange (page) { From cabe3cf6c1f9b5e6b5a155de2b88ad3b44fc2fee Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 20 Jul 2021 10:20:44 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=96=AD=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/pages/projectAddEit.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 567cf4556..214ba8390 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1151,7 +1151,6 @@ export default { }, // 提交按钮 事件 saveSarAccess () { - alert() this.$refs['sarAccessForm'].validate((valid) => { if (valid) { let rowlist = [] From c3eb45833725b923b2898b151124b6b884166e97 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Tue, 20 Jul 2021 11:17:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E4=B8=8B=E8=BD=BD=E5=9B=9E=E6=98=BE=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../page/listOfCountries.vue | 3 ++- .../accessStandardsAndRegulations/pages/addEdit.vue | 13 ++++--------- .../accessStandardsAndRegulations/pages/details.vue | 8 ++++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue index 901e6f816..3b853fd65 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue @@ -345,7 +345,8 @@ export default { this.$router.push({ name: "ListOfStandardsAndRegulationsDetails", query: { - id: item.id + id: item.id, + fileIds: item.fileIds } }); } diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index b077e7fbe..cd0df1460 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -532,6 +532,7 @@ export default { id: '', sortKey: 1, countryArea: '', + fileIds: '', detailedListName: '', energyKind: '', type: '', @@ -846,7 +847,6 @@ export default { uploadBackSuccess (res, file, fileList) { if (res.ok) { this.fileInfoList = fileList - console.log(this.fileInfoList) this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.$message.success('上传成功') } else { @@ -1186,8 +1186,7 @@ export default { this.fileInfoList.map(item => { relateFile.push(item.id) }) - sarAccessEO.relateFile = relateFile.join(',') - console.log(sarAccessEO.relateFile) + sarAccessEO.fileIds = relateFile.join(',') } if (!sarAccessEO.id) { // 新增 @@ -1201,12 +1200,8 @@ export default { this.$message.success('新增成功') this.isNext = true this.$router.push({ - name: 'AccessStandardsAndRegulations', - query: { - relateFile: sarAccessEO.relateFile - } + name: 'AccessStandardsAndRegulations' }) - console.log(sarAccessEO) } }, e => { }) @@ -1604,7 +1599,7 @@ export default { // 请求上传的文件信息 getFileInfo () { this.$http.get('att/attFile/getMultiFileInfos', { - fileIds: this.sarAccessEO.relateFile + fileIds: this.$route.query.fileIds }, { _this: this }, res => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index ff7774729..fbc1048fe 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -21,7 +21,7 @@

+ :key="item.id"> {{ item.name }} import { interfaceUrl } from "@/sysConfig"; +import { exportFile } from '@/api/unqualProcess' export default { name: "AccessStandardDetails", @@ -452,9 +453,8 @@ export default { }, // 请求上传的文件信息 getFileInfo() { - console.log(this.sarAccessEO) this.$http.get("att/attFile/getMultiFileInfos", { - fileIds: this.sarAccessEO.relateFile + fileIds: this.sarAccessEO.fileIds }, { _this: this }, res => { @@ -474,7 +474,7 @@ export default { }, // 附件下载事件 fileDownLoad(attId) { - window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId; + window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId }, // 点击查看 handlePreview(item) {