diff --git a/src/packages/probe/component/detail/detail.component.html b/src/packages/probe/component/detail/detail.component.html index 7f5340f..97f1f5a 100644 --- a/src/packages/probe/component/detail/detail.component.html +++ b/src/packages/probe/component/detail/detail.component.html @@ -3,46 +3,33 @@
+
- - - - +
- - - - +
- - - - +
- - - - +
- - - - +
- - - - + +
+
+
- +
\ No newline at end of file diff --git a/src/packages/probe/component/detail/detail.component.ts b/src/packages/probe/component/detail/detail.component.ts index 8023624..b5899ce 100644 --- a/src/packages/probe/component/detail/detail.component.ts +++ b/src/packages/probe/component/detail/detail.component.ts @@ -19,8 +19,7 @@ export class DetailComponent implements OnInit, AfterContentInit { probe$ = this.detailStore.pipe(select(DetailSelector.select('probe'))); probe: Probe = null; - startIP: string; - endIP: string; + IPRange: string; display = false; constructor( @@ -56,13 +55,12 @@ export class DetailComponent implements OnInit, AfterContentInit { arrangeInfo() { const cidr = new CIDR(this.probe.cidr); if (!cidr.isValid()) { + return; } - this.startIP = cidr.addressStart.address; - this.endIP = cidr.addressEnd.address; + this.IPRange = cidr.addressStart.address + ' ~ ' + cidr.addressEnd.address; } onDiscoveryClick() { - // alert('Discovery를 열거라 대훈'); this.display = true; } diff --git a/src/packages/probe/probe.module.ts b/src/packages/probe/probe.module.ts index e3a0c06..327ca7f 100644 --- a/src/packages/probe/probe.module.ts +++ b/src/packages/probe/probe.module.ts @@ -6,9 +6,8 @@ import { ProbeStoreModule } from './probe-store.module'; import { SERVICES } from './service'; import { PrimeNGModules } from '../commons/prime-ng/prime-ng.module'; import { FormsModule } from '@angular/forms'; -// import { SettingComponent as DiscoverySettingComponent } from 'packages/discovery/component/setting/setting.component'; -// import { DiscoveryModule } from '../discovery/discovery.module'; import { DiscoveryModule } from 'packages/discovery/discovery.module'; +import { KeyValueModule } from 'app/commons/component/key-value/key-value.module'; @NgModule({ imports: [ @@ -16,7 +15,8 @@ import { DiscoveryModule } from 'packages/discovery/discovery.module'; PrimeNGModules, ProbeStoreModule, FormsModule, - DiscoveryModule + DiscoveryModule, + KeyValueModule ], declarations: [ COMPONENTS,