From e2b4d17ee9722975c4da55964b63f9fa0c5ae5ba Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 29 Dec 2022 17:16:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AF=BC=E5=87=BA=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=AE=A1=E7=90=86--=E9=80=82=E7=94=A8=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E6=B2=A1=E6=9C=89=E8=A1=A8=E5=A4=B4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=20=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=9C=89=E4=B8=A4=E4=B8=AA=E9=80=82=E7=94=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/parameter/ParameterTemplate/index.vue | 13 ++++++++++---
 .../src/views/parameter/parameterexport/index.vue   |  3 +++
 .../projectManagement/dialog/parametercolumn.vue    |  5 +++++
 3 files changed, 18 insertions(+), 3 deletions(-)

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
           }