From c8c21840034a5ea652650455e98fd8309b01d2cb Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Wed, 6 Apr 2022 11:21:56 +0800
Subject: [PATCH 1/3] fix bug

---
 .../customtable/customindex/customindex.component.html          | 2 +-
 .../components/customtable/driver/driver.component.html         | 2 +-
 .../datatable/components/customtable/owner/owner.component.html | 2 +-
 .../customtable/partnertable/partnertable.component.html        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html
index 8816fdf1..4583cab7 100644
--- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html
+++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html
@@ -39,7 +39,7 @@
   <st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listOperationalReportPage"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
+    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st>
 </nz-card>
 <nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate">
   <ng-template #extraTemplate01>
diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.html b/src/app/routes/datatable/components/customtable/driver/driver.component.html
index 9deaefbd..383fe343 100644
--- a/src/app/routes/datatable/components/customtable/driver/driver.component.html
+++ b/src/app/routes/datatable/components/customtable/driver/driver.component.html
@@ -41,6 +41,6 @@
   <st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listDriverReportPage"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
+    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">
   </st>
 </nz-card>
\ No newline at end of file
diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.html b/src/app/routes/datatable/components/customtable/owner/owner.component.html
index 9777a490..e805efd9 100644
--- a/src/app/routes/datatable/components/customtable/owner/owner.component.html
+++ b/src/app/routes/datatable/components/customtable/owner/owner.component.html
@@ -41,6 +41,6 @@
   <st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listShipperReportPage"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">>
+    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">
   </st>
 </nz-card>
\ No newline at end of file
diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
index 4a9e9f95..4d75b400 100644
--- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
+++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
@@ -37,7 +37,7 @@
   <st #st multiSort bordered [data]="service.$api_listOperationalReportPage" [columns]="columns" [ps]="20"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
+    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">
   </st>
 
 </nz-card>
\ No newline at end of file

From be16c04fc6ac6401e818490d8be05ab4c2778944 Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Wed, 6 Apr 2022 13:20:20 +0800
Subject: [PATCH 2/3] fix bug

---
 .../components/operationtable/curve/curve.component.ts      | 4 ++--
 .../components/operationtable/pillar/pillar.component.ts    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/datatable/components/operationtable/curve/curve.component.ts b/src/app/routes/datatable/components/operationtable/curve/curve.component.ts
index ce105bbc..8f163963 100644
--- a/src/app/routes/datatable/components/operationtable/curve/curve.component.ts
+++ b/src/app/routes/datatable/components/operationtable/curve/curve.component.ts
@@ -33,9 +33,9 @@ export class OperationCurveComponent implements OnInit, OnChanges {
   }
   render(el: ElementRef<HTMLDivElement>): void {
     this.el = el.nativeElement
-    if(!this.service.http.loading){
+    setTimeout(() => {
       this.ngZone.runOutsideAngular(() => this.init(this.el));
-    }
+      },500)
   }
 
   private init(el: HTMLElement): void {
diff --git a/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts b/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts
index 3f056a81..b78f500f 100644
--- a/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts
+++ b/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts
@@ -33,9 +33,9 @@ export class OperationPillarComponent implements OnInit, OnChanges {
   }
   render(el: ElementRef<HTMLDivElement>): void {
     this.el = el.nativeElement
-    if(!this.service.http.loading){
-      this.ngZone.runOutsideAngular(() => this.init(this.el));
-    }
+    setTimeout(() => {
+    this.ngZone.runOutsideAngular(() => this.init(this.el));
+    }, 500)
   }
 
   private init(el: HTMLElement): void {

From 83bba86b56081d0a254732ed5ec7d3d7783773e1 Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Wed, 6 Apr 2022 13:22:54 +0800
Subject: [PATCH 3/3] fix bug

---
 .../components/busitable/busiindex/curve/curve.component.ts   | 4 +++-
 .../datatable/components/busitable/pillar/pillar.component.ts | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
index 118cd472..00d9e8b5 100644
--- a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
+++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
@@ -31,7 +31,9 @@ export class BusitableCurveComponent implements OnInit, OnChanges {
   }
   render(el: ElementRef<HTMLDivElement>): void {
     this.el = el.nativeElement
-    this.ngZone.runOutsideAngular(() => this.init(this.el));
+    setTimeout(() => {
+      this.ngZone.runOutsideAngular(() => this.init(this.el));
+      }, 500)
   }
 
   private init(el: HTMLElement): void {
diff --git a/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts b/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts
index 602edc17..ddb0569b 100644
--- a/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts
+++ b/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts
@@ -31,7 +31,9 @@ export class BusitablePillarComponent implements OnInit, OnChanges {
   }
   render(el: ElementRef<HTMLDivElement>): void {
     this.el = el.nativeElement
-    this.ngZone.runOutsideAngular(() => this.init(this.el));
+    setTimeout(() => {
+      this.ngZone.runOutsideAngular(() => this.init(this.el));
+      }, 500)
   }
 
   private init(el: HTMLElement): void {