diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index b413661d..1dbf859b 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -25,10 +25,9 @@ export class DatatableBusiindexComponent implements OnInit { dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); chartData: any = {} - flag = false; columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, @@ -67,7 +66,7 @@ export class DatatableBusiindexComponent implements OnInit { ngOnInit(): void { this.initData() } - initData(){ + initData(flag?: boolean){ let type = 1 if(this.mode === 'year') { type = 1 @@ -81,7 +80,7 @@ export class DatatableBusiindexComponent implements OnInit { this.service.request(this.service.$api_performanceReportHistogram, params).subscribe(res => { if (res) { this.chartData = res - if(this.flag) { + if(flag) { this.pillar.reRender() this.curve.reRender() } @@ -126,10 +125,7 @@ export class DatatableBusiindexComponent implements OnInit { } else if(this.mode === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } - - - this.flag = true - this.initData() + this.initData(true) } disabledDate = (current: Date): boolean => // Can not select days before today and today 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 62220b3d..70fd0aad 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 @@ -33,9 +33,7 @@ export class BusitableCurveComponent implements OnInit, OnChanges { } render(el: ElementRef): void { this.el = el.nativeElement - if(!this.service.http.loading){ - this.ngZone.runOutsideAngular(() => this.init(this.el)); - } + this.ngZone.runOutsideAngular(() => this.init(this.el)); } private init(el: HTMLElement): void { diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts index 6e847a3d..c1f60ff0 100644 --- a/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts @@ -20,7 +20,7 @@ export class DatatableMantableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); dateNext: any = null; modeNext = 'year'; diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts index 8c2cccab..e290bb54 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts @@ -20,7 +20,7 @@ export class DatatableCustomindexComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); dateNext: any = null; modeNext = 'year'; diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.ts b/src/app/routes/datatable/components/customtable/driver/driver.component.ts index 330ac567..3050a847 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts @@ -20,7 +20,7 @@ export class DatatableDriverComponent implements OnInit { date: any = null; defineDate = []; queryTime: any = '' - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); ui: SFUISchema = {}; schema: SFSchema = {}; diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index 73833dff..f3a81454 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -20,7 +20,7 @@ export class DatatableOwnerComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); ui: SFUISchema = {}; schema: SFSchema = {}; diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index a5eb59de..6a109564 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -24,7 +24,7 @@ export class DatatableFinancetableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index bce8f525..891ee8e1 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -22,7 +22,7 @@ export class DatatableOperationtableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] @@ -31,7 +31,6 @@ export class DatatableOperationtableComponent implements OnInit { interManlist: any = [] chartData: any = {} - flag: boolean = false; columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, { title: '订单数', index: 'zsl', className: 'text-center' }, @@ -84,11 +83,10 @@ export class DatatableOperationtableComponent implements OnInit { type, enterpriseInfoId: this.enterpriseInfoId }; - this.flag = flag ? flag : false this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { if (res) { this.chartData = res - if(this.flag) { + if(flag) { // 除第一次加载外 this.pillar.reRender() this.curve.reRender() } @@ -152,5 +150,6 @@ export class DatatableOperationtableComponent implements OnInit { } else if(this.mode === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } + this.initPillarData(true) } }