From 5f1547152614f5bcabbb7d39001d9e6b1acfa7b5 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 29 Dec 2022 10:57:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=97=AE=E9=A2=98=20=E5=8F=82=E8=80=83=E5=88=97?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/tableCollection/index.vue  | 13 ++++++++++---
 jero-web/src/components/tableCollection/index1.vue |  5 +++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index 1e4a4b3a7..65d228516 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -479,7 +479,13 @@
         this.areaVisibleView = true
         let url = ''
         if (this.$route.query.it === undefined) {
-          url = `/jero-boot/params/config/getById?id=${val.db_field_name}`
+          console.log(val)
+          console.log(val.db_field_name)
+          if(val.db_field_name == 'referencesCol') {
+            url = `/jero-boot/params/report/queryParamsReportConfigById?id=${val.db_field_id}`
+          }else{
+            url = `/jero-boot/params/config/getById?id=${val.db_field_name}`
+          }
         } else {
           // 历史版本
           url = `/jero-boot/params/collectManifestHistory/getConfigById?id=${val.db_field_name}`
@@ -673,12 +679,11 @@
         this.bussLogList(val)
       },
       onChangehistory(page, pageSize) {
-        console.log(1)
         this.pageNohistory = page
         this.bussLogList()
       },
       SizeChangehistory(page, pageSize) {
-        this.pageNo = 1
+        this.pageNohistory = 1
         this.pageSizehistory = pageSize
         this.bussLogList()
       },
@@ -701,9 +706,11 @@
         })
       },
       handleOk() {
+        this.pageNohistory = 1
         this.visible = false
       },
       handleCancel() {
+        this.pageNohistory = 1
         this.visible = false
       },
       getAndUserId(result) {
diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue
index 45c857161..838b448d1 100644
--- a/jero-web/src/components/tableCollection/index1.vue
+++ b/jero-web/src/components/tableCollection/index1.vue
@@ -813,18 +813,19 @@
         })
       },
       handleOk() {
+        this.pageNohistory = 1
         this.visible = false
       },
       handleCancel() {
+        this.pageNohistory = 1
         this.visible = false
       },
       onChangehistory(page, pageSize) {
-        console.log(1)
         this.pageNohistory = page
         this.bussLogList()
       },
       SizeChangehistory(page, pageSize) {
-        this.pageNo = 1
+        this.pageNohistory = 1
         this.pageSizehistory = pageSize
         this.bussLogList()
       },