diff --git a/src/app/packages/sensor/component/setting-result/setting-result.component.html b/src/app/packages/sensor/component/setting-result/setting-result.component.html
index a566879..6cd7cdb 100644
--- a/src/app/packages/sensor/component/setting-result/setting-result.component.html
+++ b/src/app/packages/sensor/component/setting-result/setting-result.component.html
@@ -39,11 +39,19 @@
-
+
+
+ {{sir.sensorItemName}}
+ {{sir.sensorItemUnit}}
+ {{sir.sensorItemKey}}
+
+
+
+
\ No newline at end of file
diff --git a/src/app/packages/sensor/component/setting-result/setting-result.component.ts b/src/app/packages/sensor/component/setting-result/setting-result.component.ts
index 5cbc988..24bf14c 100644
--- a/src/app/packages/sensor/component/setting-result/setting-result.component.ts
+++ b/src/app/packages/sensor/component/setting-result/setting-result.component.ts
@@ -1,5 +1,12 @@
import { Component, OnInit } from '@angular/core';
-import { FormGroup , FormControl } from '@angular/forms';
+import { AfterContentInit } from '@angular/core/src/metadata/lifecycle_hooks';
+import {FormsModule} from '@angular/forms';
+
+export class SensorItemResult {
+ sensorItemName?: String;
+ sensorItemUnit?: String;
+ sensorKeyName?: String;
+}
@Component({
@@ -7,13 +14,10 @@ import { FormGroup , FormControl } from '@angular/forms';
templateUrl: './setting-result.component.html',
styleUrls: ['./setting-result.component.scss']
})
-export class SettingResultComponent implements OnInit {
+export class SettingResultComponent implements OnInit, AfterContentInit {
favoriteSeason: string;
-
- selectedStatus: number ;
- eventEditForm: FormGroup;
- public toggleForm: boolean;
+ sensorItemResultList: Array;
constructor() { }
@@ -23,11 +27,35 @@ export class SettingResultComponent implements OnInit {
'200',
];
+ ngAfterContentInit() {
+
+ this.sensorItemResultList = new Array();
+
+ const ctu: SensorItemResult = {
+ sensorItemName: 'CPU Total Usage',
+ sensorItemUnit: '%',
+ sensorKeyName: 'wmi.cpu.usage.total'
+ };
+
+ const cfu: SensorItemResult = {
+ sensorItemName: 'CPU Free Usage',
+ sensorItemUnit: 'kb',
+ sensorKeyName: 'wmi.cpu.usage.free'
+ };
+
+ const mtu: SensorItemResult = {
+ sensorItemName: 'Mem Total Usage',
+ sensorItemUnit: '%',
+ sensorKeyName: 'wmi.mem.usage.total'
+ };
+
+ this.sensorItemResultList.push(ctu);
+ this.sensorItemResultList.push(cfu);
+ this.sensorItemResultList.push(mtu);
+
+ }
+
ngOnInit() {
- this.eventEditForm = new FormGroup({
- 'completed': new FormControl()
- });
- this.selectedStatus = 2;
}
}