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;