fixed home , ing discovery

This commit is contained in:
snoop 2018-04-16 15:04:10 +09:00
parent 0d17ff7db8
commit 788062a14f
5 changed files with 34 additions and 40 deletions

View File

@ -3,12 +3,6 @@
<div class="ui-g-12"> <div class="ui-g-12">
<div class="card no-margin"> <div class="card no-margin">
<h1>Home works</h1> <h1>Home works</h1>
<p-dialog header="Discovery" [style]="{width: '400px'}" [(visible)]="display">
<of-discovery-setting></of-discovery-setting>
</p-dialog>
<button pButton type="button" class="ui-button-large" icon="ui-icon-play-arrow" label="Discovery" style="width:auto" (click)="showDialog()"></button>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {DialogModule} from 'primeng/dialog';
import { SettingComponent as DiscoverySettingComponent } from 'packages/discovery/component/setting/setting.component';
@Component({ @Component({
@ -9,7 +8,6 @@ import { SettingComponent as DiscoverySettingComponent } from 'packages/discover
}) })
export class HomePageComponent implements OnInit { export class HomePageComponent implements OnInit {
display = false;
constructor() { } constructor() { }
@ -18,8 +16,4 @@ export class HomePageComponent implements OnInit {
showDialog() {
this.display = true;
}
} }

View File

@ -5,17 +5,13 @@ import { HomePageComponent } from './home-page.component';
import { HomePageRoutingModule } from './home-page-routing.module'; import { HomePageRoutingModule } from './home-page-routing.module';
import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module'; import { PrimeNGModules } from 'packages/commons/prime-ng/prime-ng.module';
import { SettingComponent as DiscoverySettingComponent } from 'packages/discovery/component/setting/setting.component';
import { DiscoveryModule } from 'packages/discovery/discovery.module';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
HomePageRoutingModule, HomePageRoutingModule,
PrimeNGModules, PrimeNGModules,
DiscoveryModule
], ],
entryComponents: [ entryComponents: [
DiscoverySettingComponent
], ],
declarations: [HomePageComponent] declarations: [HomePageComponent]
}) })

View File

@ -17,36 +17,46 @@
</div> </div>
</div> </div>
<div style="margin-top: 8px"> <div class="ui-g form-group">
<span class="ui-float-label"> <div class="ui-g-12 ui-md-4">
<input id="float-input" type="text" size="30" pInputText> <span class="ui-float-label">
<label for="float-input">Start Ip</label> <input id="float-input" type="text" size="30" pInputText>
</span> <label for="float-input">Start Ip</label>
</span>
<span class="ui-float-label">
<input id="float-input" type="text" size="30" pInputText> </div>
<label for="float-input">End Ip</label> <div class="ui-g-12 ui-md-4">
</span> <span class="ui-float-label">
<input id="float-input" type="text" size="30" pInputText>
<label for="float-input">End Ip</label>
</span>
</div>
</div> </div>
<div class="ui-g" style="width:250px;margin-bottom:10px"> <div class="ui-g" style="width:250px;margin-bottom:10px">
<div class="ui-g-12"> <div class="ui-g-12">
<p-checkbox name="group1" value="port" label="Port" [(ngModel)]="selectedCities" inputId="la"></p-checkbox> <p-checkbox name="group1" value="port" label="Port" [(ngModel)]="selectedCities" inputId="la"></p-checkbox>
</div> </div>
</div> </div>
<div style="margin-top: 8px">
<span class="ui-float-label">
<input id="float-input" type="text" size="30" pInputText>
<label for="float-input">Start Port</label>
</span>
<span class="ui-float-label">
<input id="float-input" type="text" size="30" pInputText>
<label for="float-input">End Port</label>
</span>
</div>
<div class="ui-g form-group">
<div class="ui-g-12 ui-md-4">
<span class="ui-float-label">
<input id="float-input" type="text" size="30" pInputText>
<label for="float-input">Start Port</label>
</span>
</div>
<div class="ui-g-12 ui-md-4">
<span class="ui-float-label">
<input id="float-input" type="text" size="30" pInputText>
<label for="float-input">End Port</label>
</span>
</div>
</div>
<!-- <p-listbox [options]="cities" [(ngModel)]="selectedCities" multiple="multiple" checkbox="checkbox" filter="filter" optionLabel="name"> <!-- <p-listbox [options]="cities" [(ngModel)]="selectedCities" multiple="multiple" checkbox="checkbox" filter="filter" optionLabel="name">
<p-header> <p-header>
<i class="fa fa-car"></i> <i class="fa fa-car"></i>

View File

@ -1,6 +1,6 @@
<div class="ui-g"> <div class="ui-g">
<h1>Map</h1> <h1>Map</h1>
<p-dialog header="Discovery" [width]="400" [(visible)]="display"> <p-dialog header="Discovery" [width]="800" [(visible)]="display">
<of-discovery-setting (close)="closeDialog()"></of-discovery-setting> <of-discovery-setting (close)="closeDialog()"></of-discovery-setting>
</p-dialog> </p-dialog>
<div class="ui-g-12 ui-g-nopad"> <div class="ui-g-12 ui-g-nopad">