From 0d8b1828eea6bb027bbf71ddcd9c28a7bcf0ca3b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:38:12 +0800
Subject: [PATCH] 组织配置
---
src/app/routes/systems/organization/organization-config/organization-config.component.html | 93 +++++++++++++++++++++++++---------------------
1 files changed, 51 insertions(+), 42 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 20c2c97..e5b43b0 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
@@ -19,14 +19,17 @@
<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>
@@ -36,59 +39,65 @@
<td nz-td [nzCheckbox]="true">
<label nz-checkbox formControlName="enable"></label>
</td>
- <td>
+ <td nz-td>
<span>
{{ row.name }}({{ row.unit }})
</span>
</td>
- <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>
- </div>
- </td>
- <td formArrayName="degression" *ngFor="let in of validateForm.get('alarmLevels.'+row.sensorKey+'.degression').controls; index as i">
+ <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>
</div>
- </td>
+ </td>
+ <td nz-td style="padding-top:0px;">
+ <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 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>
+ </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="������������" formGroupName="alarmMode">
- <label nz-checkbox formControlName="enable">
- <span>������������</span>
- </label>
- <div [ngStyle]="{'margin-left': '20%'}">
- <br/>
- <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">
- <span [ngSwitch]="i">
- <label *ngSwitchCase="1">������������������:</label>
- <label *ngSwitchCase="2">������������������:</label>
- <label *ngSwitchCase="3">������������������:</label>
- </span>
- </div>
- <div nz-form-control nz-col [nzSpan]="12" nzHasFeedback>
- <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>
- </div>
- <br/>
- <br/>
- <br/>
+ <nz-card [nzBordered]="false" nzTitle="������������" formGroupName="alarmMode">
+ <label nz-checkbox formControlName="enable">
+ <span>������������</span>
+ </label>
+ <div [ngStyle]="{'margin-left': '20%'}">
+ <br/>
+ <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">
+ <span [ngSwitch]="i">
+ <label *ngSwitchCase="1">������������������:</label>
+ <label *ngSwitchCase="2">������������������:</label>
+ <label *ngSwitchCase="3">������������������:</label>
+ </span>
</div>
+ <div nz-form-control nz-col [nzSpan]="12" nzHasFeedback>
+ <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>
+ </div>
+ <br/>
+ <br/>
+ <br/>
</div>
- </nz-card>
+ </div>
+ </nz-card>
<footer-toolbar errorCollect>
<span [ngStyle]="{'color':'red','width':'300px','margin-right':'40px'}">{{ errorMessage }}</span>
<label>���������������</label>
@@ -100,5 +109,5 @@
<span *ngIf="isSaving">���</span>
</span>
</button>
- </footer-toolbar>
+ </footer-toolbar>
</form>
--
Gitblit v1.8.0