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 a901673..a566879 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 @@ -2,10 +2,73 @@ - + + + +
주기 : {{favoriteSeason}} 초
+ + + {{season}} 초 + + +
-
+ + + + +
+ IP : 192.168.1.209 +
+
+ MAC : 1111111111 +
+
+ OS : Windows 7 +
+
+ WMI Crawler +
+ +
+
+ +
+ + + + CPU Total Usage + (%) + wmi.cpu.usage.total + [Add Notification] + + + + + + +     + + + +     + local push +     + email +     + sms + + + + + CPU Free Usage + (kb) + wmi.cpu.usage.free + [Add Notification] + + +
\ No newline at end of file diff --git a/src/app/packages/sensor/component/setting-result/setting-result.component.scss b/src/app/packages/sensor/component/setting-result/setting-result.component.scss index e69de29..25396dd 100644 --- a/src/app/packages/sensor/component/setting-result/setting-result.component.scss +++ b/src/app/packages/sensor/component/setting-result/setting-result.component.scss @@ -0,0 +1,25 @@ +.example-card { + width: 400px; +} + +.example-card2 { + width: 600px; +} + + +.example-radio-group { + display: inline-flex; + flex-direction: column; +} + +.example-radio-button { + margin: 5px; +} + +.example-selected-value { + margin: 15px 0; +} + +.example-full-width22 { + width: 10%; +} \ 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 6778c9e..5cbc988 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,4 +1,6 @@ import { Component, OnInit } from '@angular/core'; +import { FormGroup , FormControl } from '@angular/forms'; + @Component({ selector: 'of-sensor-setting-result', @@ -7,9 +9,25 @@ import { Component, OnInit } from '@angular/core'; }) export class SettingResultComponent implements OnInit { + favoriteSeason: string; + + selectedStatus: number ; + eventEditForm: FormGroup; + public toggleForm: boolean; + constructor() { } + seasons = [ + '600', + '400', + '200', + ]; + ngOnInit() { + this.eventEditForm = new FormGroup({ + 'completed': new FormControl() + }); + this.selectedStatus = 2; } } diff --git a/src/app/packages/sensor/sensor.module.ts b/src/app/packages/sensor/sensor.module.ts index c7dbf53..88f07b2 100644 --- a/src/app/packages/sensor/sensor.module.ts +++ b/src/app/packages/sensor/sensor.module.ts @@ -5,11 +5,13 @@ import { MaterialModule } from 'app/commons/ui/material/material.module'; import { SettingComponent } from 'app/packages/sensor/component/setting/setting.component'; import { SettingResultComponent } from 'app/packages/sensor/component/setting-result/setting-result.component'; +import {FormsModule} from '@angular/forms'; @NgModule({ imports: [ CommonModule, - MaterialModule + MaterialModule, + FormsModule ], declarations: [ SettingComponent, diff --git a/src/app/pages/sensor-setting/sensor-setting-page.component.html b/src/app/pages/sensor-setting/sensor-setting-page.component.html index be6aafc..a390a96 100644 --- a/src/app/pages/sensor-setting/sensor-setting-page.component.html +++ b/src/app/pages/sensor-setting/sensor-setting-page.component.html @@ -1,14 +1,14 @@
-
+
-
+
- +스텝 순서를 바꿨으니 나중에 바꾸잡