From 4e909cc90975758c56848c9a86c14f18014d1126 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Jun 2018 15:32:41 +0800
Subject: [PATCH] “更新代码”
---
src/app/routes/systems/organization/organization-config/organization-config.component.html | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 cf95cce..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>
@@ -51,7 +51,7 @@
</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>
@@ -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