diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 5b6095701..d600f3f63 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -181,12 +181,19 @@ export default { dataIndex: 'description', // scopedSlots: { customRender: 'titleName' } }, + // { + // title: this.$t('zoneOfApplication'), + // align: 'center', + // width: 160, + // ellipsis: true, + // dataIndex: 'region_dictText', + // }, { - title: this.$t('zoneOfApplication'), + title: this.$t('creater'), align: 'center', - width: 160, + width: 120, ellipsis: true, - dataIndex: 'region_dictText', + dataIndex: 'createBy' }, { title: this.$t('created'), diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 7a85044bb..db433fcd2 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -182,6 +182,7 @@ export default { align: 'center', dataIndex: 'region_dictText', ellipsis: true, + sorter:true, width: 200 }, { @@ -363,6 +364,8 @@ export default { this.orderByField = 'template_name' } else if(sorter.columnKey == 'updateTime') { this.orderByField = 'update_time' + } else if(sorter.columnKey == 'region_dictText') { + this.orderByField = 'region' } else{ this.orderByField = sorter.columnKey } diff --git a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue index 0b64361e6..d363e5eef 100644 --- a/jero-web/src/views/projectManagement/dialog/parametercolumn.vue +++ b/jero-web/src/views/projectManagement/dialog/parametercolumn.vue @@ -237,6 +237,11 @@ } getAction(`params/report/pageForManifest`, params).then(res => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.loadData() + return + } this.areaTable = [...res.result.records] this.total = res.result.total }