From 58a1f5571e0c826086c3e890cff235901465bc42 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 11 Aug 2022 16:57:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collectionOfRegulatoryOpinions/index.vue | 1 + .../technologyAssessment/index.vue | 1 + .../ParameterItemCollectionList.vue | 4 ++- .../components/TaskParameterCollection.vue | 3 +- .../regulationsKanban/components/addModel.vue | 8 +++-- .../src/views/regulationsKanban/index.vue | 29 ++++++++++++++----- 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue index 173a0f4e2..0a13a4202 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue @@ -255,6 +255,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', + gatherResult: this.$route.query.gatherResult ? this.$route.query.gatherResult : '', ...queryParam } this.loading = true diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index c47a86d66..c2c5935ac 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -324,6 +324,7 @@ pageNo: this.pageNo, pageSize: this.pageSize, serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '', + flowStatus: this.$route.query.flowStatus ? this.$route.query.flowStatus : '', ...queryParam } this.loading = true diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index a19b42892..4aec2ab8d 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -675,7 +675,9 @@ this.handlePreservation() } }, 10000) - this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) + // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest')) + this.paramsManifest = this.$route.query + // document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList') }, methods: { diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 7b980f74e..97dcd2cda 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -252,12 +252,11 @@ // 先调取接口判断是否有配置信息 getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => { if (res.result) { - localStorage.setItem('paramsManifest', JSON.stringify(item)) + // localStorage.setItem('paramsManifest', JSON.stringify(item)) let newUrl = _this.$router.resolve({ path: '/ParameterItemCollection', query: item // projectName:this.$route.query.projectName - }) window.open(newUrl.href, '_blank') } else { diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 56b430397..608c4c436 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -211,7 +211,8 @@ export default { this.$router.push({ path: '/collectionOfRegulatoryOpinions', query:{ - serialNumber:this.item.serialNumber + serialNumber:this.item.serialNumber, + gatherResult:'Completed' } }) }, @@ -228,7 +229,8 @@ export default { this.$router.push({ path: '/technologyAssessment', query:{ - serialNumber:this.item.serialNumber + serialNumber:this.item.serialNumber, + flowStatus:'Completed' } }) }, @@ -257,7 +259,7 @@ export default { id:this.paramsManifestId, ...this.formData } - downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect) + downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber +'.xls', query, this.Deselect) }, searchQuery() { this.loadData() diff --git a/jero-web/src/views/regulationsKanban/index.vue b/jero-web/src/views/regulationsKanban/index.vue index 27c048950..3165a3bfd 100644 --- a/jero-web/src/views/regulationsKanban/index.vue +++ b/jero-web/src/views/regulationsKanban/index.vue @@ -72,22 +72,29 @@
+ {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }} + + {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + + + + {{$t('ViewConformanceResults')}} @@ -161,13 +168,15 @@ export default { title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', - width: 180 + width: 180, + scopedSlots: { customRender: 'standard' } }, { title: this.$t('title'), align: 'center', dataIndex: 'title', - width: 180 + width: 180, + scopedSlots: { customRender: 'standard' } }, { title: this.$t('status'), @@ -256,7 +265,11 @@ export default { this.toggleSearchStatus = !this.toggleSearchStatus }, onSelectChange(value) { + this.selectedRowKeys = value this.selectedRowKeysArray = this.selectedRowKeys.join(',') + console.log(this.selectedRowKeysArray) + }, + tableOnChange(val) { }, deriveconformanceresults(){ let query = {