From 3aa2334e116c1e7921ed46958ff5fed1c70fad7e Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Tue, 6 Nov 2018 11:56:50 +0800 Subject: Dashboard finish Change-Id: Ib9a4b70260beb971b27e82288ef2546c43535569 Issue-ID: USECASEUI-164 Signed-off-by: guochuyicmri --- usecaseui-portal/src/app/alarm/alarm.component.ts | 39 ++++++++++++++--------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'usecaseui-portal/src/app/alarm') diff --git a/usecaseui-portal/src/app/alarm/alarm.component.ts b/usecaseui-portal/src/app/alarm/alarm.component.ts index 3f563b6e..58c75e7b 100644 --- a/usecaseui-portal/src/app/alarm/alarm.component.ts +++ b/usecaseui-portal/src/app/alarm/alarm.component.ts @@ -132,13 +132,16 @@ export class AlarmComponent implements OnInit { startTime: this.startTime, endTime: this.endTime } - this.myhttp.getHomePerformanceChartData(paramsObj) + this.myhttp.getHomeAlarmChartData(paramsObj) .subscribe((data) => { this.alarmChartData = { - series: [ - { data: data.CPU }, - { data: data.CPU }, - { data: data.Memory } + xAxis:{ + data:data.dataList + }, + series:[ + {data:data.allList}, + {data:data.ActiveList}, + {data:data.closedList} ] } }, (err) => { @@ -151,13 +154,16 @@ export class AlarmComponent implements OnInit { alarmSourceName: this.sourceName, day:"day" } - this.myhttp.getHomePerformanceChartData(paramsObj) + this.myhttp.getHomeAlarmChartData(paramsObj) .subscribe((data) => { this.alarmChartData = { - series: [ - { data: data.CPU }, - { data: data.CPU }, - { data: data.Memory } + xAxis:{ + data:data.dataList + }, + series:[ + {data:data.allList}, + {data:data.ActiveList}, + {data:data.closedList} ] } }, (err) => { @@ -169,13 +175,16 @@ export class AlarmComponent implements OnInit { alarmSourceName: this.sourceName, day:"month" } - this.myhttp.getHomePerformanceChartData(paramsObj) + this.myhttp.getHomeAlarmChartData(paramsObj) .subscribe((data) => { this.alarmChartData = { - series: [ - { data: data.CPU }, - { data: data.CPU }, - { data: data.Memory } + xAxis:{ + data:data.dataList + }, + series:[ + {data:data.allList}, + {data:data.ActiveList}, + {data:data.closedList} ] } }, (err) => { -- cgit 1.2.3-korg