From 4d0fd6e3bb6c3dcd48763338255075e2662622e6 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 13:15:01 +0800
Subject: [PATCH] 监控点 区域可选

---
 src/app/routes/devices/monitor-point/monitor-point-edit/monitor-point-edit.component.html |   11 +++++------
 1 files changed, 5 insertions(+), 6 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..c120cc2 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
@@ -1,5 +1,5 @@
 <div class="modal-header">
-  <div class="modal-title">{{ data.id != null ? '������' : '������'}} - ������</div>
+  <div class="modal-title">{{ data.id != null ? '������' : '������'}} - ������������</div>
 </div>
 <form [formGroup]="validateForm" (ngSubmit)="save($event,validateForm.value,validateForm.valid)" nz-form [nzType]="'horizontal'">
   <div nz-form-item nz-row class="mb-sm">
@@ -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>
@@ -27,7 +26,7 @@
       <label nz-form-item-required>���/���/���</label>
     </div>
     <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
-      <nz-cascader [class.class123]="true" (nzChange)="setAreaCodes($event)" formControlName="_areas" (nzLoad)="areaLazyLoad($event)"
+      <nz-cascader [class.class123]="true" (nzChange)="setAreaCodes($event)" formControlName="_areas" (nzLoad)="areaLazyLoad($event)" [nzChangeOnSelect]="true"
       [nzPlaceHolder]="'������ ���/���/���'" >
       </nz-cascader>
     </div>
@@ -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