Skip to content

S
smart
Commit 5953ebe4 authored by wangqinghua's avatar wangqinghua
Browse files
Options

update

parent fdd27234
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 46 deletions
src/main/webapp/app/app.main.module.ts
View file @ 5953ebe4
...@@ -69,6 +69,7 @@ import {TopologyImgComponent} from './netTopology/topology-img/topology-img.comp ...@@ -69,6 +69,7 @@ import {TopologyImgComponent} from './netTopology/topology-img/topology-img.comp
import {DeviceComponent} from './netTopology/model/device/device.component'; import {DeviceComponent} from './netTopology/model/device/device.component';
import {IconComponent} from './netTopology/model/icon/icon.component'; import {IconComponent} from './netTopology/model/icon/icon.component';
import {ToUtilPipe} from './shared/common/toUtil.pipe'; import {ToUtilPipe} from './shared/common/toUtil.pipe';
import {JhiTranslateComponent} from 'ng-jhipster';
@NgModule({ @NgModule({
imports: [ imports: [
...@@ -138,7 +139,7 @@ import {ToUtilPipe} from './shared/common/toUtil.pipe'; ...@@ -138,7 +139,7 @@ import {ToUtilPipe} from './shared/common/toUtil.pipe';
TopologyImgComponent, TopologyImgComponent,
DeviceComponent, DeviceComponent,
IconComponent, IconComponent,
ToUtilPipe ToUtilPipe,
], ],
providers:[ providers:[
OverAllService, OverAllService,
......
src/main/webapp/app/modal/basi-check/basi-check.component.ts
View file @ 5953ebe4
...@@ -271,7 +271,10 @@ export class BasiCheckComponent implements OnInit { ...@@ -271,7 +271,10 @@ export class BasiCheckComponent implements OnInit {
} }
getKey(keyValue): void { getKey(keyValue): void {
this.validateForm.value.key_ = keyValue; const d = {
key_:keyValue
}
this.validateForm.patchValue(d);
} }
//阈值--start //阈值--start
......
src/main/webapp/app/modal/basic-edit/basic-edit.component.html
View file @ 5953ebe4
...@@ -19,15 +19,15 @@ ...@@ -19,15 +19,15 @@
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="12"> <!--<div nz-col [nzSpan]="12">-->
<nz-form-item nzFlex> <!--<nz-form-item nzFlex>-->
<nz-form-label [nzSpan]="6" nzFor="invertoryname">品牌</nz-form-label> <!--<nz-form-label [nzSpan]="6" nzFor="invertoryname">品牌</nz-form-label>-->
<nz-form-control [nzSpan]="14"> <!--<nz-form-control [nzSpan]="14">-->
<input id="invertoryname" nz-input placeholder="品牌" name="invertoryname" <!--<input id="invertoryname" nz-input placeholder="品牌" name="invertoryname"-->
[(ngModel)]="validateForm.inventoryExtend.invertoryname"> <!--[(ngModel)]="validateForm.inventoryExtend.invertoryname">-->
</nz-form-control> <!--</nz-form-control>-->
</nz-form-item> <!--</nz-form-item>-->
</div> <!--</div>-->
</div> </div>
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
...@@ -45,15 +45,15 @@ ...@@ -45,15 +45,15 @@
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="12"> <!--<div nz-col [nzSpan]="12">-->
<nz-form-item nzFlex> <!--<nz-form-item nzFlex>-->
<nz-form-label [nzSpan]="6" nzFor="serialnoA">型号</nz-form-label> <!--<nz-form-label [nzSpan]="6" nzFor="serialnoA">型号</nz-form-label>-->
<nz-form-control [nzSpan]="14"> <!--<nz-form-control [nzSpan]="14">-->
<input id="serialnoA" nz-input placeholder="型号" name="serialnoA" <!--<input id="serialnoA" nz-input placeholder="型号" name="serialnoA"-->
[(ngModel)]="validateForm.inventoryExtend.serialnoA"> <!--[(ngModel)]="validateForm.inventoryExtend.serialnoA">-->
</nz-form-control> <!--</nz-form-control>-->
</nz-form-item> <!--</nz-form-item>-->
</div> <!--</div>-->
</div> </div>
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
...@@ -66,36 +66,36 @@ ...@@ -66,36 +66,36 @@
</nz-form-item> </nz-form-item>
</div> </div>
<div nz-col [nzSpan]="12"> <!--<div nz-col [nzSpan]="12">-->
<nz-form-item nzFlex> <!--<nz-form-item nzFlex>-->
<nz-form-label [nzSpan]="6" nzFor="mac">MAC地址</nz-form-label> <!--<nz-form-label [nzSpan]="6" nzFor="mac">MAC地址</nz-form-label>-->
<nz-form-control [nzSpan]="14"> <!--<nz-form-control [nzSpan]="14">-->
<input id="mac" nz-input placeholder="MAC地址" name="mac" <!--<input id="mac" nz-input placeholder="MAC地址" name="mac"-->
[(ngModel)]="validateForm.inventoryExtend.mac"> <!--[(ngModel)]="validateForm.inventoryExtend.mac">-->
</nz-form-control> <!--</nz-form-control>-->
</nz-form-item> <!--</nz-form-item>-->
</div> <!--</div>-->
</div> </div>
<div nz-row [nzGutter]="24"> <div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12"> <!--<div nz-col [nzSpan]="12">-->
<nz-form-item nzFlex> <!--<nz-form-item nzFlex>-->
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="storageLocation">存放地点</nz-form-label> <!--<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="storageLocation">存放地点</nz-form-label>-->
<nz-form-control [nzSpan]="14"> <!--<nz-form-control [nzSpan]="14">-->
<input id="storageLocation" nz-input placeholder="存放地点" name="storageLocation" [(ngModel)]="validateForm.inventoryExtend.storageLocation"> <!--<input id="storageLocation" nz-input placeholder="存放地点" name="storageLocation" [(ngModel)]="validateForm.inventoryExtend.storageLocation">-->
</nz-form-control> <!--</nz-form-control>-->
</nz-form-item> <!--</nz-form-item>-->
</div> <!--</div>-->
<div nz-col [nzSpan]="12"> <!--<div nz-col [nzSpan]="12">-->
<nz-form-item nzFlex> <!--<nz-form-item nzFlex>-->
<nz-form-label [nzSpan]="6" nzFor="maintenanceExpiration">维保到期</nz-form-label> <!--<nz-form-label [nzSpan]="6" nzFor="maintenanceExpiration">维保到期</nz-form-label>-->
<nz-form-control [nzSpan]="14"> <!--<nz-form-control [nzSpan]="14">-->
<input id="maintenanceExpiration" nz-input placeholder="维保到期" name="maintenanceExpiration" <!--<input id="maintenanceExpiration" nz-input placeholder="维保到期" name="maintenanceExpiration"-->
[(ngModel)]="validateForm.inventoryExtend.maintenanceExpiration"> <!--[(ngModel)]="validateForm.inventoryExtend.maintenanceExpiration">-->
</nz-form-control> <!--</nz-form-control>-->
</nz-form-item> <!--</nz-form-item>-->
</div> <!--</div>-->
</div> </div>
<nz-form-item> <nz-form-item>
...@@ -344,6 +344,7 @@ ...@@ -344,6 +344,7 @@
<div class="modal-footer-btn"> <div class="modal-footer-btn">
<button nz-button (click)="handleEditCancel()" nzType="primary">取消</button> <button nz-button (click)="handleEditCancel()" nzType="primary">取消</button>
<button nz-button (click)="tabsChange(0)" nzType="primary">上一步</button> <button nz-button (click)="tabsChange(0)" nzType="primary">上一步</button>
<button nz-button (click)="tabsChange(2)" nzType="primary">下一步</button>
<button nz-button (click)="handEditleOk()" nzType="primary">完成</button> <button nz-button (click)="handEditleOk()" nzType="primary">完成</button>
</div> </div>
</nz-tab> </nz-tab>
...@@ -409,5 +410,146 @@ ...@@ -409,5 +410,146 @@
<!--<button nz-button (click)="handEditleOk()" nzType="primary">完成</button>--> <!--<button nz-button (click)="handEditleOk()" nzType="primary">完成</button>-->
<!--</div>--> <!--</div>-->
<!--</nz-tab>--> <!--</nz-tab>-->
<nz-tab nzTitle="资产备件">
<div nz-form class="ant-advanced-search-form form-select">
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="equipmentTypeid">资产名称
</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="资产名称" name="serialnoA">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">负责人</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="负责人">
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="secondLevelType">资产数量
</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="资产数量">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" nzFor="serialnoA">品牌</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="品牌">
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >库存</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="库存">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >型号</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="型号">
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired>使用</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="使用" >
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6" >MAC地址</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="MAC地址">
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >借出</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="借出">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">维保到期</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="维保到期" >
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired>维修</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="维修">
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzSpan]="6">存放地点</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="存放地点">
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<nz-form-item nzFlex>
<nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired >报废</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input placeholder="报废" >
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
<div class="modal-footer-btn">
<button nz-button (click)="handleEditCancel()" nzType="primary">取消</button>
<button nz-button (click)="tabsChange(1)" nzType="primary">上一步</button>
<button nz-button (click)="handleEditCancel(1)" nzType="primary">完成</button>
</div>
</nz-tab>
</nz-tabset> </nz-tabset>
</nz-modal> </nz-modal>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment