From bc82f9629635985aa765ef0a7b4c30133aa38da3 Mon Sep 17 00:00:00 2001 From: zhaodengke Date: Thu, 31 Oct 2024 11:05:06 +0800 Subject: [PATCH] =?UTF-8?q?Bug=20=E9=94=99=E8=AF=AF=E6=97=B6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=A0=E9=99=90=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/PagedList.vue | 9 +++++++++ .../homestead/arbitration/arbitrationHandlerList.vue | 2 ++ .../onlineHome/homestead/arbitration/arbitrationList.vue | 2 ++ .../homestead/arbitration/arbitrationProcessList.vue | 2 ++ .../onlineHome/homestead/certificate/certificateList.vue | 2 ++ .../homestead/homeApplication/applicationList.vue | 2 ++ .../onlineHome/homestead/reporting/taskReportingList.vue | 2 ++ src/views/onlineHome/publicity.vue | 2 ++ .../sunVillage_info/arbitration/arbitrationList.vue | 2 ++ .../sunVillage_info/entityReport/reportLineList.vue | 2 ++ src/views/sunVillage_info/entityReport/reportList.vue | 2 ++ .../sunVillage_info/homeApplication/applicationList.vue | 2 ++ .../homeApplication/applicationNewList.vue | 2 ++ src/views/sunVillage_info/list_tourists_ranking_lite.vue | 2 ++ .../homestead/homeApplication/applicationGsList.vue | 2 ++ .../homestead/homeApplication/applicationList.vue | 2 ++ 16 files changed, 39 insertions(+) diff --git a/src/components/common/PagedList.vue b/src/components/common/PagedList.vue index 9c467bb6..b0b49bfc 100644 --- a/src/components/common/PagedList.vue +++ b/src/components/common/PagedList.vue @@ -123,6 +123,8 @@ export default { { this.setupFinished(true); } + }).catch((err) => { + this.setupError(err); }).finally(() => { this.setupLoading(false); this.setupRefreshing(false); @@ -157,6 +159,13 @@ export default { if(ok) this.$emit('finished', this.stateTotal); }, + setupError(err) { + this.log(`error -> ${ok}`); + this.stateFinished = true; + if(this.stateFinished != this.finished) + this.$emit('update:finished', this.stateFinished); + this.$emit('error', err); + }, setupRefreshing(ok) { this.log(`refreshing -> ${ok}`); this.stateRefreshing = ok; diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue index 4b481105..4aaaf893 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue @@ -131,6 +131,8 @@ export default { }); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue index c9951ddc..e2a2df22 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue @@ -137,6 +137,8 @@ export default { }); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue index fa1675f1..e3e6eb18 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue @@ -131,6 +131,8 @@ export default { }); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/certificate/certificateList.vue b/src/views/onlineHome/homestead/certificate/certificateList.vue index c3130acc..5c19a185 100644 --- a/src/views/onlineHome/homestead/certificate/certificateList.vue +++ b/src/views/onlineHome/homestead/certificate/certificateList.vue @@ -142,6 +142,8 @@ export default { }); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue index a69cb86d..45bab70b 100644 --- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue +++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue @@ -146,6 +146,8 @@ export default { } this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/homestead/reporting/taskReportingList.vue b/src/views/onlineHome/homestead/reporting/taskReportingList.vue index aff69961..aa0e3932 100644 --- a/src/views/onlineHome/homestead/reporting/taskReportingList.vue +++ b/src/views/onlineHome/homestead/reporting/taskReportingList.vue @@ -133,6 +133,8 @@ export default { }); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/onlineHome/publicity.vue b/src/views/onlineHome/publicity.vue index 11616a42..78e8230b 100644 --- a/src/views/onlineHome/publicity.vue +++ b/src/views/onlineHome/publicity.vue @@ -90,6 +90,8 @@ import { getList } from "@/api/onlineHome/homestead/information"; }); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/sunVillage_info/arbitration/arbitrationList.vue b/src/views/sunVillage_info/arbitration/arbitrationList.vue index 30d187d9..8dc7a79c 100644 --- a/src/views/sunVillage_info/arbitration/arbitrationList.vue +++ b/src/views/sunVillage_info/arbitration/arbitrationList.vue @@ -180,6 +180,8 @@ export default { }); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/sunVillage_info/entityReport/reportLineList.vue b/src/views/sunVillage_info/entityReport/reportLineList.vue index 1cd582df..bf9d602d 100644 --- a/src/views/sunVillage_info/entityReport/reportLineList.vue +++ b/src/views/sunVillage_info/entityReport/reportLineList.vue @@ -113,6 +113,8 @@ export default { this.list.push(...response.rows); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/sunVillage_info/entityReport/reportList.vue b/src/views/sunVillage_info/entityReport/reportList.vue index 94101080..fa7d3f08 100644 --- a/src/views/sunVillage_info/entityReport/reportList.vue +++ b/src/views/sunVillage_info/entityReport/reportList.vue @@ -129,6 +129,8 @@ export default { this.list.push(...response.rows); this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/sunVillage_info/homeApplication/applicationList.vue b/src/views/sunVillage_info/homeApplication/applicationList.vue index b8431ca1..e4c807d4 100644 --- a/src/views/sunVillage_info/homeApplication/applicationList.vue +++ b/src/views/sunVillage_info/homeApplication/applicationList.vue @@ -160,6 +160,8 @@ export default { } this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/sunVillage_info/homeApplication/applicationNewList.vue b/src/views/sunVillage_info/homeApplication/applicationNewList.vue index ceb71c36..bb1eb03d 100644 --- a/src/views/sunVillage_info/homeApplication/applicationNewList.vue +++ b/src/views/sunVillage_info/homeApplication/applicationNewList.vue @@ -160,6 +160,8 @@ export default { } this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/sunVillage_info/list_tourists_ranking_lite.vue b/src/views/sunVillage_info/list_tourists_ranking_lite.vue index 6dbb7a22..e92f5500 100644 --- a/src/views/sunVillage_info/list_tourists_ranking_lite.vue +++ b/src/views/sunVillage_info/list_tourists_ranking_lite.vue @@ -115,6 +115,8 @@ import {registrationList} from "@/api/sunVillage_info/subcontract"; } this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue index 60e0b048..f55ae03e 100644 --- a/src/views/yinnong/homestead/homeApplication/applicationGsList.vue +++ b/src/views/yinnong/homestead/homeApplication/applicationGsList.vue @@ -143,6 +143,8 @@ } this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false; diff --git a/src/views/yinnong/homestead/homeApplication/applicationList.vue b/src/views/yinnong/homestead/homeApplication/applicationList.vue index 8bcc46f2..f89883d0 100644 --- a/src/views/yinnong/homestead/homeApplication/applicationList.vue +++ b/src/views/yinnong/homestead/homeApplication/applicationList.vue @@ -158,6 +158,8 @@ export default { } this.total += response.rows.length; this.finished = this.total >= response.total; + }).catch(() => { + this.finished = true; }).finally(() => { this.loading = false; this.refreshing = false;