From 0fedf4949561e5eece7dc55c2dfc4963a5cbb6b2 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:45:15 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html
index e01c902..c081da4 100644
--- a/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html
+++ b/src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html
@@ -7,7 +7,7 @@
<label nz-form-item-required>������</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
- <nz-input formControlName="name" maxlength="20" [nzPlaceHolder]="'���������������'">
+ <nz-input formControlName="name" maxlength="20" [nzPlaceHolder]="'������������������'">
</nz-input>
</div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
@@ -15,8 +15,7 @@
</div>
<div nz-form-control nz-col [nzSpan]="6" nzHasFeedback>
<nz-select formControlName="organizationId" [nzPlaceHolder]="'������ ������(������������������)'"
- nzAllowClear [nzFilter]="false" nzShowSearch
- formControlName="organizationId" (nzSearchChange)="OrgSelectChange($event)" [nzNotFoundContent]="'������������'" >
+ 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>
@@ -46,7 +45,7 @@
</div>
<div nz-form-control nz-col [nzSpan]="5" nzHasFeedback>
<nz-input-number [ngStyle]="{'width': '100%' }" formControlName="longitude" [nzMin]="-180" [nzMax]="180" [nzStep]="0.000001">
- </nz-input-number>
+ </nz-input-number>
</div>
<div nz-form-control nz-col [nzSpan]="2" nzHasFeedback></div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
--
Gitblit v1.8.0