summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app/alarm
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2018-11-06 11:56:50 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2018-11-06 11:57:44 +0800
commit3aa2334e116c1e7921ed46958ff5fed1c70fad7e (patch)
tree4987e4597df4f0ff6fd3d99d911a808ac9102995 /usecaseui-portal/src/app/alarm
parentee80382f7574fa459808da8e7f9ad410b5e8de22 (diff)
Dashboard finish
Change-Id: Ib9a4b70260beb971b27e82288ef2546c43535569 Issue-ID: USECASEUI-164 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/alarm')
-rw-r--r--usecaseui-portal/src/app/alarm/alarm.component.ts39
1 files changed, 24 insertions, 15 deletions
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) => {