From 27cd36be226ca2434f06b1ae9e4d43f1fea639ab Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 25 Jun 2018 16:40:28 +0800
Subject: [PATCH] 组织配置单位和页面显示
---
src/app/routes/devices/basic-info/device-edit/device-edit.component.html | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
index 840dbd7..b3b6f4b 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
@@ -11,7 +11,7 @@
</nz-input>
</div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
- <label>mac</label>
+ <label nz-form-item-required>mac</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
<nz-input formControlName="mac" maxlength="20" [nzPlaceHolder]="'mac������'">
@@ -57,42 +57,54 @@
</nz-option>
</nz-select>
</div>
- </div>
+ </div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
- <label>���������</label>
+ <label>������������</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
- <nz-select formControlName="monitorPointId" [nzPlaceHolder]="'������ ���������(������������������)'"
+ <nz-datepicker nzSize="large" style="width: 100%;" formControlName="createTime" nzShowTime [nzPlaceHolder]="'������������'"
+ [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
+ </div>
+ <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+ <label>������������</label>
+ </div>
+ <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+ <nz-datepicker nzSize="large" style="width: 100%;" formControlName="installTime" nzShowTime [nzPlaceHolder]="'������������'"
+ [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
+ </div>
+ </div>
+ <div nz-form-item nz-row class="mb-sm">
+ <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+ <label>������������</label>
+ </div>
+ <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+ <nz-select formControlName="monitorPointId" [nzPlaceHolder]="'������ ������������(������������������)'"
nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
<nz-option *ngFor="let option of monitorPoints" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
</nz-option>
</nz-select>
</div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
- <label>������������</label>
+ <label>������</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+ <nz-select formControlName="professionId" [nzPlaceHolder]="'������ ������������'"
+ nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
+ <nz-option *ngFor="let option of professions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+ </nz-option>
+ </nz-select>
+ </div>
+ </div>
+ <div nz-form-item nz-row class="mb-sm">
+ <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+ <label>������������</label>
+ </div>
+ <div nz-form-control nz-col [nzSpan]="10" nzHasFeedback>
<nz-input formControlName="address" maxlength="20" [nzPlaceHolder]="'���������������������������'">
</nz-input>
</div>
- </div>
- <div nz-form-item nz-row class="mb-sm">
- <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
- <label>������������</label>
- </div>
- <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
- <nz-datepicker nzSize="large" style="width: 100%;" formControlName="createTime" nzShowTime [nzPlaceHolder]="'������������'"
- [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
- </div>
- <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
- <label>������������</label>
- </div>
- <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
- <nz-datepicker nzSize="large" style="width: 100%;" formControlName="installTime" nzShowTime [nzPlaceHolder]="'������������'"
- [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
- </div>
- </div>
+ </div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">������</button>
<button nz-button [nzType]="'primary'" [nzLoading]="isSaving">
@@ -102,4 +114,4 @@
</span>
</button>
</div>
- </form>
\ No newline at end of file
+ </form>
--
Gitblit v1.8.0