From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/devices/basic-info/device-edit/device-edit.component.html | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 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..fa89a42 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������'">
@@ -38,7 +38,7 @@
</div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
- <label>������������</label>
+ <label nz-form-item-required>������������</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
<nz-select formControlName="deviceVersionId" [nzPlaceHolder]="'������ ������(������������������)'"
@@ -57,49 +57,70 @@
</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]="'������ ���������(������������������)'"
- nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
+ <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 nz-form-item-required>������������</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>
+ </form>
<div class="modal-footer">
+ <span style="padding: 5px 10px;">
+ ������:
+ </span>
+ <nz-select style="width: 240px;" [(ngModel)]="configMap.orgId" (ngModelChange)="setOrgId($event)" [nzPlaceHolder]="'������ ������(������������������)'"
+ nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="orgSelectChange($event)" [nzNotFoundContent]="'������������'" >
+ <nz-option *ngFor="let option of orgOptions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+ </nz-option>
+ </nz-select>
+
<button nz-button type="button" (click)="close()">������</button>
- <button nz-button [nzType]="'primary'" [nzLoading]="isSaving">
+ <button nz-button [nzType]="'primary'" (click)="save(null,validateForm.value,validateForm.valid)" [nzLoading]="isSaving">
<span>
������
<span *ngIf="isSaving">���</span>
</span>
</button>
</div>
- </form>
\ No newline at end of file
+
--
Gitblit v1.8.0