diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index c69c42ab4..1354f3e89 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -81,6 +81,20 @@ + +
+
+ {{$t('zoneOfApplication')}} +
+ + + +
+
diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index b60c0964e..720c7d695 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -12,6 +12,17 @@ v-model="queryParam.templateName"> + +
+
+ {{$t('zoneOfApplication')}} +
+ +
+
{{$t('query')}} @@ -162,6 +173,13 @@ export default { width: 300, scopedSlots: { customRender: 'projectName' } }, + { + title: this.$t('zoneOfApplication'), + align: 'center', + dataIndex: 'region_dictText', + ellipsis: true, + width: 200 + }, { title: this.$t('status'), align: 'center', diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 1fd293f24..b69a2871f 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -989,6 +989,7 @@ detailedSuccessList: [], detailedWarningList: [], rowKeysSuccessList: [], + selectedRowKeysList: [], rowKeysWarningList: [] } }, @@ -1121,7 +1122,8 @@ } else if (selectedRowKeys.length > 1) { this.$message.warning(this.$t('OnlyOneSelected')) } else { - downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('ExportReport') + '.docx', { id: selectedRowKeys.join(',') }) + let serialNumber = this.selectedRowKeysList[0].serialNumber + downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('ExportReport') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') }) } }, handleExport() { @@ -1140,9 +1142,10 @@ ids: selectedRowKeys.join(','), ...this.queryParamQuery, roleCode: roleCodeIndex, + excelName:this.$route.query.projectName, projectLibraryId: this.$route.query.id } - downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect) + downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect) }, //复制 copyClick() { @@ -1454,8 +1457,9 @@ } }) }, - onSelectChange(value) { + onSelectChange(value,rows) { this.selectedRowKeys = value + this.selectedRowKeysList = rows }, searchQuery() { this.selectedRowKeys = []