This commit is contained in:
insanity
2018-02-27 18:32:11 +09:00
parent a066ffbfbe
commit 0ceb57af47
6 changed files with 140 additions and 26 deletions

View File

@@ -1,29 +1,36 @@
<div fxLayout="row" fxLayoutAlign="space-between stretch" fxFlexFil fxFill fxLayoutGap="1px">
<div fxFlex="70" fxLayout="column" class="mat-elevation-z2 activity-list-container">
<perfect-scrollbar>
<div fxLayout="row" fxLayoutAlign="space-between center">
<of-host-summary-card></of-host-summary-card>
<of-app-summary-card></of-app-summary-card>
</div>
<!-- <div fxLayoutAlign="start center" fxLayout="row">
<div *ngFor="let dash of dashCard" fxFlex.lt-sm="70">
<of-dashboard-card [dashData]="dash"></of-dashboard-card>
<div fxLayoutAlign="start center" fxLayout="row">
<div *ngFor="let dash of dashCard" fxFlex.lt-sm="70">
<of-dashboard-card [dashData]="dash"></of-dashboard-card>
</div>
</div>
</div> -->
<div fxLayout="row" fxLayoutWrap [style.margin]="'20px 0px'">
<of-sensor-summary fxFlex="40" fxFlex.lt-sm="100" fxFlex.sm="100" fxFlex.md="70"></of-sensor-summary>
<of-sensor-item-filter fxFlex="60"></of-sensor-item-filter>
</div>
<div fxLayout="row" fxLayoutAlign="space-between center">
<of-host-summary-card></of-host-summary-card>
<of-app-summary-card></of-app-summary-card>
</div>
<div fxLayout="row" fxLayoutWrap fxLayoutAlign="end">
<!-- <of-sensor-item-table></of-sensor-item-table> -->
<div fxLayout="row" fxLayoutWrap [style.margin]="'20px 0px'">
<of-sensor-summary fxFlex="40" fxFlex.lt-sm="100" fxFlex.sm="100" fxFlex.md="70"></of-sensor-summary>
<of-sensor-item-filter fxFlex="60"></of-sensor-item-filter>
</div>
<div fxLayout="row" [style.margin]="'20px 0px'">
<of-sensor-item-list fxFlex="100"></of-sensor-item-list>
</div>
<div fxLayout="row" fxLayoutWrap fxLayoutAlign="end">
<button mat-raised-button (click)="openDialog()">대시보드에 추가</button>
</div>
</div>
</perfect-scrollbar>
</div>
<div fxFlex="30" fxLayout="column" class="mat-elevation-z2 activity-add">
<div fxFlex="10" fxLayout="row" fxLayoutAlign="space-between center">
<h3 class="mat-headline" fxFlex="80">Activities</h3>
@@ -43,6 +50,4 @@
</div>
</perfect-scrollbar>
</div>
</div>
<div>
</div>

View File

@@ -13,6 +13,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
import { HostSummaryCardComponent } from '../../commons/component/host-summary-card/host-summary-card.component';
import { AppSummaryCardComponent } from '../../commons/component/app-summary-card/app-summary-card.component';
import { FormsModule } from '@angular/forms';
import { SensorItemModule } from '../../packages/sensor-item/sensor-item.module';
@NgModule({
imports: [
@@ -22,7 +23,8 @@ import { FormsModule } from '@angular/forms';
MaterialModule,
PerfectScrollbarModule,
NgxChartsModule,
FormsModule
FormsModule,
SensorItemModule,
],
declarations: [
OverviewPageComponent,