From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/systems/organization/organization-config/organization-config.component.html | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/systems/organization/organization-config/organization-config.component.html b/src/app/routes/systems/organization/organization-config/organization-config.component.html
index e5b43b0..a313c29 100644
--- a/src/app/routes/systems/organization/organization-config/organization-config.component.html
+++ b/src/app/routes/systems/organization/organization-config/organization-config.component.html
@@ -46,12 +46,12 @@
</td>
<td nz-td formArrayName="increment" *ngFor="let in of validateForm.get('alarmLevels.'+row.sensorKey+'.increment').controls; index as i">
<div nz-form-item>
- <div nz-form-control nzHasFeedback>
- <nz-input [formControlName]="i" maxlength="20" nzDisabled="{{ !f.value['alarmLevels'][row.sensorKey]['enable'] }}"></nz-input>
+ <div style="width:100px;" nz-form-control nzHasFeedback>
+ <nz-input-number style="width: 100%;" [formControlName]="i" maxlength="20" nzDisabled="{{ !f.value['alarmLevels'][row.sensorKey]['enable'] }}"></nz-input-number>
</div>
</div>
</td>
- <td nz-td style="padding-top:0px;">
+ <td nz-td style="padding-top: 0;">
<div nz-form-control>
<nz-switch formControlName="degressEnable" (click)="refreshHasDegression(f.value['alarmLevels'][row.sensorKey]['degressEnable'])"
nzDisabled="{{ !f.value['alarmLevels'][row.sensorKey]['enable'] }}"></nz-switch>
@@ -59,8 +59,8 @@
</td>
<td nz-td formArrayName="degression" *ngFor="let in of validateForm.get('alarmLevels.'+row.sensorKey+'.degression').controls; index as i">
<div *ngIf="f.value['alarmLevels'][row.sensorKey]['degressEnable']" nz-form-item>
- <div nz-form-control nzHasFeedback>
- <nz-input [formControlName]="i" maxlength="20" nzDisabled="{{ !f.value['alarmLevels'][row.sensorKey]['enable'] }}"></nz-input>
+ <div style="width:100px;" nz-form-control nzHasFeedback>
+ <nz-input-number style="width: 100%;" [formControlName]="i" maxlength="20" nzDisabled="{{ !f.value['alarmLevels'][row.sensorKey]['enable'] }}"></nz-input-number>
</div>
</div>
</td>
--
Gitblit v1.8.0