Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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 {

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 {

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>

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>

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>

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>

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 {

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){
+    setTimeout(() => {
-      this.ngZone.runOutsideAngular(() => this.init(this.el));
+    this.ngZone.runOutsideAngular(() => this.init(this.el));
-    }
+    }, 500)
   }
 
   private init(el: HTMLElement): void {