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 | 7 +++----
1 files changed, 3 insertions(+), 4 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 e9400e4..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
@@ -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]="'������ ������(������������������)'"
@@ -76,11 +76,10 @@
</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="monitorPointId" [nzPlaceHolder]="'������ ������������(������������������)'"
- nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
+ <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>
--
Gitblit v1.8.0