From a217326e9aa1185d900e289c4d6c217b08d045df Mon Sep 17 00:00:00 2001 From: water_xu Date: Thu, 20 Jun 2024 19:29:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=87=BA=E6=83=85=E5=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=AE=A1=E7=90=86=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gaterecord/carrecord/components/carRecordList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue b/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue index b8542d8..f073e1b 100644 --- a/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue +++ b/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue @@ -158,7 +158,7 @@ export default { ).then((data) => { this.listLoading = false this.varList = data.varList - this.total = data.page.totalResult + this.total = data.total this.hasButton() }).catch((e) => { this.listLoading = false From 607155e24ca8b1a55f1de461012cf94499e8bd85 Mon Sep 17 00:00:00 2001 From: water_xu Date: Thu, 20 Jun 2024 19:32:29 +0800 Subject: [PATCH 2/3] revert a217326e9aa1185d900e289c4d6c217b08d045df MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert 门口门禁-修复进出情况分析管理分页错误 --- .../gaterecord/carrecord/components/carRecordList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue b/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue index f073e1b..b8542d8 100644 --- a/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue +++ b/src/views/gatemachine/primarygatemanager/gaterecord/carrecord/components/carRecordList.vue @@ -158,7 +158,7 @@ export default { ).then((data) => { this.listLoading = false this.varList = data.varList - this.total = data.total + this.total = data.page.totalResult this.hasButton() }).catch((e) => { this.listLoading = false From 0d6b60b24567fe5bcd230ad7300e06169b30cb00 Mon Sep 17 00:00:00 2001 From: water_xu Date: Thu, 20 Jun 2024 19:44:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=9B=E5=87=BA=E6=83=85=E5=86=B5=E5=88=86?= =?UTF-8?q?=E6=9E=90=E7=AE=A1=E7=90=86=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gatestatistics/components/areaStatistics.vue | 2 +- .../gatestatistics/components/passageStatistics.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue b/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue index 42958d6..9c87815 100644 --- a/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue +++ b/src/views/gatemachine/primarygatemanager/gatestatistics/components/areaStatistics.vue @@ -100,7 +100,7 @@ export default { ).then((data) => { this.listLoading = false this.varList = data.varList - this.total = data.page.totalResult + this.total = data.total this.hasButton() }).catch((e) => { this.listLoading = false diff --git a/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue b/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue index a29ac11..95c1d81 100644 --- a/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue +++ b/src/views/gatemachine/primarygatemanager/gatestatistics/components/passageStatistics.vue @@ -107,7 +107,7 @@ export default { ).then((data) => { this.listLoading = false this.varList = data.varList - this.total = data.page.totalResult + this.total = data.total this.hasButton() }).catch((e) => { this.listLoading = false