This commit is contained in:
Lingzi
2022-04-06 10:57:58 +08:00
parent a2becf2105
commit 5a2a668168
8 changed files with 13 additions and 20 deletions

View File

@ -25,10 +25,9 @@ export class DatatableBusiindexComponent implements OnInit {
dateNext: any = null; dateNext: any = null;
modeNext = 'year'; modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00'] timeNext: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd'; dateFormat = 'yyyy';
today = new Date(); today = new Date();
chartData: any = {} chartData: any = {}
flag = false;
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, { title: '运营主体', index: 'networkTransporterName', className: 'text-center' },
@ -67,7 +66,7 @@ export class DatatableBusiindexComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.initData() this.initData()
} }
initData(){ initData(flag?: boolean){
let type = 1 let type = 1
if(this.mode === 'year') { if(this.mode === 'year') {
type = 1 type = 1
@ -81,7 +80,7 @@ export class DatatableBusiindexComponent implements OnInit {
this.service.request(this.service.$api_performanceReportHistogram, params).subscribe(res => { this.service.request(this.service.$api_performanceReportHistogram, params).subscribe(res => {
if (res) { if (res) {
this.chartData = res this.chartData = res
if(this.flag) { if(flag) {
this.pillar.reRender() this.pillar.reRender()
this.curve.reRender() this.curve.reRender()
} }
@ -126,10 +125,7 @@ export class DatatableBusiindexComponent implements OnInit {
} else if(this.mode === 'month') { } else if(this.mode === 'month') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00']
} }
this.initData(true)
this.flag = true
this.initData()
} }
disabledDate = (current: Date): boolean => disabledDate = (current: Date): boolean =>
// Can not select days before today and today // Can not select days before today and today

View File

@ -33,10 +33,8 @@ export class BusitableCurveComponent implements OnInit, OnChanges {
} }
render(el: ElementRef<HTMLDivElement>): void { render(el: ElementRef<HTMLDivElement>): void {
this.el = el.nativeElement 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 { private init(el: HTMLElement): void {
this.chart = new Chart({ this.chart = new Chart({

View File

@ -20,7 +20,7 @@ export class DatatableMantableComponent implements OnInit {
date: any = null; date: any = null;
defineDate = []; defineDate = [];
time: any = ['2022-01-01 00:00:00'] time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd'; dateFormat = 'yyyy';
today = new Date(); today = new Date();
dateNext: any = null; dateNext: any = null;
modeNext = 'year'; modeNext = 'year';

View File

@ -20,7 +20,7 @@ export class DatatableCustomindexComponent implements OnInit {
date: any = null; date: any = null;
defineDate = []; defineDate = [];
time: any = ['2022-01-01 00:00:00'] time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd'; dateFormat = 'yyyy';
today = new Date(); today = new Date();
dateNext: any = null; dateNext: any = null;
modeNext = 'year'; modeNext = 'year';

View File

@ -20,7 +20,7 @@ export class DatatableDriverComponent implements OnInit {
date: any = null; date: any = null;
defineDate = []; defineDate = [];
queryTime: any = '' queryTime: any = ''
dateFormat = 'yyyy-MM-dd'; dateFormat = 'yyyy';
today = new Date(); today = new Date();
ui: SFUISchema = {}; ui: SFUISchema = {};
schema: SFSchema = {}; schema: SFSchema = {};

View File

@ -20,7 +20,7 @@ export class DatatableOwnerComponent implements OnInit {
date: any = null; date: any = null;
defineDate = []; defineDate = [];
time: any = ['2022-01-01 00:00:00'] time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd'; dateFormat = 'yyyy';
today = new Date(); today = new Date();
ui: SFUISchema = {}; ui: SFUISchema = {};
schema: SFSchema = {}; schema: SFSchema = {};

View File

@ -24,7 +24,7 @@ export class DatatableFinancetableComponent implements OnInit {
date: any = null; date: any = null;
defineDate = []; defineDate = [];
time: any = ['2022-01-01 00:00:00'] time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd'; dateFormat = 'yyyy';
dateNext: any = null; dateNext: any = null;
modeNext = 'year'; modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00'] timeNext: any = ['2022-01-01 00:00:00']

View File

@ -22,7 +22,7 @@ export class DatatableOperationtableComponent implements OnInit {
date: any = null; date: any = null;
defineDate = []; defineDate = [];
time: any = ['2022-01-01 00:00:00'] time: any = ['2022-01-01 00:00:00']
dateFormat = 'yyyy-MM-dd'; dateFormat = 'yyyy';
dateNext: any = null; dateNext: any = null;
modeNext = 'year'; modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00'] timeNext: any = ['2022-01-01 00:00:00']
@ -31,7 +31,6 @@ export class DatatableOperationtableComponent implements OnInit {
interManlist: any = [] interManlist: any = []
chartData: any = {} chartData: any = {}
flag: boolean = false;
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, { title: '运营主体', index: 'networkTransporterName', className: 'text-center' },
{ title: '订单数', index: 'zsl', className: 'text-center' }, { title: '订单数', index: 'zsl', className: 'text-center' },
@ -84,11 +83,10 @@ export class DatatableOperationtableComponent implements OnInit {
type, type,
enterpriseInfoId: this.enterpriseInfoId enterpriseInfoId: this.enterpriseInfoId
}; };
this.flag = flag ? flag : false
this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => {
if (res) { if (res) {
this.chartData = res this.chartData = res
if(this.flag) { if(flag) { // 除第一次加载外
this.pillar.reRender() this.pillar.reRender()
this.curve.reRender() this.curve.reRender()
} }
@ -152,5 +150,6 @@ export class DatatableOperationtableComponent implements OnInit {
} else if(this.mode === 'month') { } else if(this.mode === 'month') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00']
} }
this.initPillarData(true)
} }
} }