From a1b034c9073e61e674c89a73a58c7e6b68e320dc Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Sat, 31 Jul 2021 16:53:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 report-ui/src/api/report.js                    | 6 +++---
 report-ui/src/views/report/resultset/index.vue | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/report-ui/src/api/report.js b/report-ui/src/api/report.js
index c881efdf..ad6fb66a 100644
--- a/report-ui/src/api/report.js
+++ b/report-ui/src/api/report.js
@@ -122,10 +122,10 @@ export function editReportExcel (data) {
   })
 }
 // /dataSet/pageList
-export function dataSetPageList (data) {
+export function dataSetPageList (params) {
   return request({
-    url: '/dataSet/pageList?page=' + data.page + '&size=' + data.size + '&sort=' + data.sort + '&order=' + data.order + '&pageNumber=' + data.pageNumber + '&pageSize=' + data.pageSize,
+    url: '/dataSet/pageList',
     method: 'GET',
-    data,
+    params,
   })
 }
diff --git a/report-ui/src/views/report/resultset/index.vue b/report-ui/src/views/report/resultset/index.vue
index fda3f78c..c7376ca4 100644
--- a/report-ui/src/views/report/resultset/index.vue
+++ b/report-ui/src/views/report/resultset/index.vue
@@ -657,13 +657,13 @@ export default {
     },
     async queryByPage() {
       let params = {
-        page: this.params.pageNumber,
-        size: this.params.pageSize,
         sort: "update_time",
         order: "DESC",
         pageNumber: this.params.pageNumber,
-        pageSize: this.params.pageSize
-      };
+        pageSize: this.params.pageSize,
+        setCode:this.query.setCode,
+        setName: this.query.setName
+      }
       const res = await dataSetPageList(params);
       if (res.code != "200") return;
       this.listLoading = true;