From 371098805b90e3eebbaff181703a0e4e79e795bc Mon Sep 17 00:00:00 2001 From: cyuamber Date: Fri, 20 Sep 2019 17:51:54 +0800 Subject: bug: fix problems caused by switching routes Change-Id: I9558b3fd6b8df089a5da47a08ee89c069b4fcb34 Issue-ID: USECASEUI-306 Signed-off-by: cyuamber --- .../src/app/shared/components/charts/pie/pie.component.ts | 4 ++-- usecaseui-portal/src/app/views/home/home.component.ts | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/usecaseui-portal/src/app/shared/components/charts/pie/pie.component.ts b/usecaseui-portal/src/app/shared/components/charts/pie/pie.component.ts index d22ffb02..85cf72ee 100644 --- a/usecaseui-portal/src/app/shared/components/charts/pie/pie.component.ts +++ b/usecaseui-portal/src/app/shared/components/charts/pie/pie.component.ts @@ -110,9 +110,9 @@ export class PieComponent implements OnInit { }) } - resize(size: number){ + resize(parentHeight: number, size: number){ this.chartIntance.resize( { - height: size - 250 + height: parentHeight - size }) } diff --git a/usecaseui-portal/src/app/views/home/home.component.ts b/usecaseui-portal/src/app/views/home/home.component.ts index 92e7e881..a7f312e6 100644 --- a/usecaseui-portal/src/app/views/home/home.component.ts +++ b/usecaseui-portal/src/app/views/home/home.component.ts @@ -31,7 +31,7 @@ export class HomeComponent implements OnInit { @HostBinding('@routerAnimate') routerAnimateState; @ViewChild('seriverChart') seriverChart; @ViewChild('services') services: ElementRef; - + resizeMark constructor( private myhttp: HomesService, @@ -49,18 +49,19 @@ export class HomeComponent implements OnInit { this.getHomeServiceBarNsData(); this.getHomeServiceBarVnfData(); this.getHomeServiceBarPnfData(); - Observable.fromEvent(window,'resize') + this.resizeMark = Observable.fromEvent(window,'resize') .subscribe((event) => { - this.seriverChart.resize(this.services.nativeElement.offsetHeight) + this.seriverChart.resize(this.services.nativeElement.offsetHeight,250) }) } ngAfterViewInit(){ - this.seriverChart.resize(this.services.nativeElement.offsetHeight) - - + this.seriverChart.resize(this.services.nativeElement.offsetHeight,250) } + ngOnDestroy(){ + this.resizeMark.unsubscribe() + } // services serviceNumber: number = 0; -- cgit 1.2.3-korg