From 565f5b26ee306966f0b4b9447b7a8f9b04a9fe00 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 15 Jun 2018 09:21:00 +0800
Subject: [PATCH] 改变暂存
---
src/app/routes/systems/organization/organization-config/organization-config.component.html | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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..a88f3cd 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
@@ -34,7 +34,7 @@
</tr>
</thead>
<tbody formGroupName="alarmLevels" nz-tbody>
- <tr nz-tbody-tr *ngFor="let row of nzTable.data" formGroupName="{{row.sensorKey}}">
+ <tr nz-tbody-tr style="height:50px;" *ngFor="let row of nzTable.data" formGroupName="{{row.sensorKey}}">
<td nz-td [nzCheckbox]="true">
<label nz-checkbox formControlName="enable"></label>
@@ -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>
@@ -78,7 +78,7 @@
<br/>
<br/>
<div *ngFor="let i of [1,2,3]" nz-form-item nz-row class="mb-sm">
- <div nz-form-label nz-col [nzSm]="3" [nzXs]="24">
+ <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
<span [ngSwitch]="i">
<label *ngSwitchCase="1">������������������:</label>
<label *ngSwitchCase="2">������������������:</label>
@@ -96,6 +96,17 @@
<br/>
<br/>
</div>
+ <br/>
+ <div nz-form-item nz-row class="mb-sm">
+ <div nz-form-label nz-col [nzSm]="5" [nzXs]="24">
+ <span>
+ <label>������������������<small>(������������)</small>:</label>
+ </span>
+ </div>
+ <div nz-form-control nz-col [nzSpan]="12">
+ <nz-input-number style="width: 200px;" formControlName="interval" [nzParser]="parserInt" nzMin="1" nzStep="1" nzDisabled="{{ !f.value['alarmMode']['enable'] }}"></nz-input-number>
+ </div>
+ </div>
</div>
</nz-card>
<footer-toolbar errorCollect>
--
Gitblit v1.8.0