From 44e258acff991838ad7f10276556b596b6b0b25b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 05 Jul 2018 16:03:34 +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 | 8 ++++----
1 files changed, 4 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 e7555b9..e8b6eff 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,7 +15,7 @@
</div>
<div nz-form-control nz-col [nzSpan]="6" nzHasFeedback>
<nz-select formControlName="organizationId" [nzPlaceHolder]="'������ ������(������������������)'"
- nzAllowClear [nzFilter]="false" nzShowSearch (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>
@@ -26,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>
--
Gitblit v1.8.0