From 755ad9df3090877e926d8b1d990929bac89463a8 Mon Sep 17 00:00:00 2001
From: fanzhiqin <12345678@qq.com>
Date: Fri, 22 Sep 2023 17:20:53 +0530
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=89=87=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/monitoring/downloadLog.vue | 10 ++++-----
src/views/modules/monitoring/unloadDetail.vue | 21 ++++++++++---------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/modules/monitoring/downloadLog.vue b/src/views/modules/monitoring/downloadLog.vue
index 71ea4d1..2064dbe 100644
--- a/src/views/modules/monitoring/downloadLog.vue
+++ b/src/views/modules/monitoring/downloadLog.vue
@@ -45,7 +45,7 @@
- {{ $t('query') }}
+ {{ $t('query') }}
@@ -64,7 +64,7 @@
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
- layout="total"
+ layout="total, sizes, prev, pager, next, jumper"
>
@@ -135,7 +135,7 @@ export default {
eqList: [],
lineList: [],
pageIndex: 1,
- pageSize: 10,
+ pageSize: 20,
totalPage: 0,
dataListLoading: false,
dataListSelections: [],
@@ -228,8 +228,8 @@ export default {
url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'),
method: 'POST',
data: {
- // page: this.pageIndex,
- // limit: this.pageSize,
+ page: this.pageIndex,
+ limit: this.pageSize,
// lineId: this.dataForm.lineId,
'startTime': this.startTime,
'endTime': this.endTime
diff --git a/src/views/modules/monitoring/unloadDetail.vue b/src/views/modules/monitoring/unloadDetail.vue
index da768b7..72541ea 100644
--- a/src/views/modules/monitoring/unloadDetail.vue
+++ b/src/views/modules/monitoring/unloadDetail.vue
@@ -36,7 +36,7 @@
- {{ $t('query') }}
+ {{ $t('query') }}
@@ -152,11 +152,11 @@ export default {
this.dataListLoading = true
this.$http({
// url: this.$http.adornUrl(`/monitoring/downloadLog/getTimeDet/${this.$route.params.id}`),
- url: this.$http.adornUrl('/monitoring/downloadLog/getTimeCount'),
+ url: this.$http.adornUrl('/monitoring/downloadLog/getTimeDet'),
method: 'POST',
data: {
- // page: this.pageIndex,
- // limit: this.pageSize,
+ page: this.pageIndex,
+ limit: this.pageSize,
// lineId: this.dataForm.lineId,
equId: this.$route.params.id,
'startTime': this.startTime,
@@ -168,12 +168,13 @@ export default {
// return t.lineId == this.dataForm.lineId
// })
// this.dataList = fileterLineList
- this.dataList = data.data
- this.totalPage = this.dataList.length
- // console.log('this.totalPage',this.totalPage)
+ this.dataList = data.data.list
+ // this.totalPage = this.dataList.length
+ this.totalPage = data.data.total
+ console.log('data',data)
} else if (this.dataForm.lineId == '') {
- this.dataList = data.data
- this.totalPage = data.data.length
+ this.dataList = data.data.list
+ this.totalPage = data.data.total
// console.log('this.dataList',this.dataList);
}
else {