From 39ea49edce74ae063ca0afd9b2966f861e256a3e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 17 Apr 2018 13:18:36 +0800
Subject: [PATCH] ts fix,组织报警间隔时间设置
---
src/app/routes/systems/organization/organization-config/organization-config.component.html | 93 +++++++++++++++++++++-------------------------
1 files changed, 43 insertions(+), 50 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 b5a2a48..c86d7d5 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
@@ -8,7 +8,7 @@
<label nz-checkbox formControlName="_allChecked" [nzIndeterminate]="indeterminate" (ngModelChange)="checkAll($event)"></label>
</th>
<th nz-th>
- ���������������
+ ���������������(������)
</th>
<th nz-th>
������
@@ -19,77 +19,58 @@
<th nz-th>
������
</th>
- <th nz-th>
- ������������
+ <th nz-th [ngStyle]="{'width': '72px'}">
+ ������������
</th>
<th nz-th>
- ������������
+ <span *ngIf="hasDegression">������������</span>
</th>
<th nz-th>
- ������������
+ <span *ngIf="hasDegression">������������</span>
+ </th>
+ <th nz-th>
+ <span *ngIf="hasDegression">������������</span>
</th>
</tr>
</thead>
- <tbody nz-tbody>
- <tr nz-tbody-tr *ngFor="let row of nzTable.data">
+ <tbody formGroupName="alarmLevels" nz-tbody>
+ <tr nz-tbody-tr *ngFor="let row of nzTable.data" formGroupName="{{row.sensorKey}}">
+
<td nz-td [nzCheckbox]="true">
- <label nz-checkbox formControlName="{{row.key}}_enable"></label>
+ <label nz-checkbox formControlName="enable"></label>
</td>
- <td>
+ <td nz-td>
<span>
- {{ row.name }}
+ {{ row.name }}({{ row.unit }})
</span>
</td>
- <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="{{row.key}}_level_increment_1" maxlength="20" nzDisabled="{{ !f.value[row.key+'_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>
- <div nz-form-item>
- <div nz-form-control nzHasFeedback>
- <nz-input formControlName="{{row.key}}_level_increment_2" maxlength="20" nzDisabled="{{ !f.value[row.key+'_enable'] }}"
- validateGreater></nz-input>
- </div>
+ <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>
</div>
</td>
- <td>
- <div nz-form-item>
- <div nz-form-control nzHasFeedback>
- <nz-input formControlName="{{row.key}}_level_increment_3" maxlength="20" nzDisabled="{{ !f.value[row.key+'_enable'] }}"></nz-input>
+ <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 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>
- <div nz-form-item>
- <div nz-form-control nzHasFeedback>
- <nz-input formControlName="{{row.key}}_level_degression_1" maxlength="20" nzDisabled="{{ !f.value[row.key+'_enable'] }}"></nz-input>
- </div>
- </div>
- </td>
- <td>
- <div nz-form-item>
- <div nz-form-control nzHasFeedback>
- <nz-input formControlName="{{row.key}}_level_degression_2" maxlength="20" nzDisabled="{{ !f.value[row.key+'_enable'] }}"></nz-input>
- </div>
- </div>
- </td>
- <td>
- <div nz-form-item>
- <div nz-form-control nzHasFeedback>
- <nz-input formControlName="{{row.key}}_level_degression_3" maxlength="20" nzDisabled="{{ !f.value[row.key+'_enable'] }}"></nz-input>
- </div>
- </div>
</td>
</tr>
</tbody>
</nz-table>
</nz-card>
<div [ngStyle]="{'background-color':'#f5f7fa','width':'110%','left':'-5%','height':'20px','position':'relative'}"></div>
- <nz-card [nzBordered]="false" nzTitle="������������">
- <label nz-checkbox formControlName="mode_enable">
+ <nz-card [nzBordered]="false" nzTitle="������������" formGroupName="alarmMode">
+ <label nz-checkbox formControlName="enable">
<span>������������</span>
</label>
<div [ngStyle]="{'margin-left': '20%'}">
@@ -97,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>
@@ -105,8 +86,8 @@
</span>
</div>
<div nz-form-control nz-col [nzSpan]="12" nzHasFeedback>
- <nz-select formControlName="mode_level{{i}}" [nzMode]="'multiple'" [nzPlaceHolder]="'������ ������������'" [nzNotFoundContent]="'������������'"
- nzDisabled="{{ !f.value['mode_enable'] }}">
+ <nz-select formControlName="{{ 'level'+i }}" [nzMode]="'multiple'" [nzPlaceHolder]="'������ ������������'" [nzNotFoundContent]="'������������'"
+ nzDisabled="{{ !f.value['alarmMode']['enable'] }}">
<nz-option *ngFor="let option of alarmModes" [nzLabel]="option.label" [nzValue]="option.value" [nzDisabled]="option.disabled">
</nz-option>
</nz-select>
@@ -115,9 +96,21 @@
<br/>
<br/>
</div>
+ <br/>
+ <div nz-form-item nz-row class="mb-sm">
+ <div nz-form-label nz-col [nzSm]="5" [nzXs]="24">
+ <span [ngSwitch]="i">
+ <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 ng-content = '������������' errorCollect>
+ <footer-toolbar errorCollect>
+ <span [ngStyle]="{'color':'red','width':'300px','margin-right':'40px'}">{{ errorMessage }}</span>
<label>���������������</label>
<span [ngStyle]="{'font-size': '16px','font-weight': 'bold','margin-right':'30px'}">{{ organization.name }}</span>
<button nz-button type="button" (click)="backToList()">������</button>
--
Gitblit v1.8.0