From 928d55a8fde33200bb1ca4016ce5b86e9a1118a8 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 16 Jan 2018 16:57:13 +0800
Subject: [PATCH] 组织配置
---
src/app/routes/systems/organization/organization-config/organization-config.component.html | 119 +++++++++++++++++++++++------------------------------------
1 files changed, 46 insertions(+), 73 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..5d53391 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>
������
@@ -30,94 +30,67 @@
</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.key}}">
+
<td nz-td [nzCheckbox]="true">
- <label nz-checkbox formControlName="{{row.key}}_enable"></label>
+ <label nz-checkbox formControlName="enable"></label>
</td>
<td>
<span>
- {{ row.name }}
+ {{ row.name }}({{ row.unit }})
</span>
</td>
- <td>
+ <td formArrayName="increment" *ngFor="let in of validateForm.get('alarmLevels.'+row.key+'.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.key]['enable'] }}"></nz-input>
+ </div>
+ </div>
+ </td>
+ <td formArrayName="degression" *ngFor="let in of validateForm.get('alarmLevels.'+row.key+'.degression').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>
+ <nz-input [formControlName]="i" maxlength="20" nzDisabled="{{ !f.value['alarmLevels'][row.key]['enable'] }}"></nz-input>
</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>
- </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>
- </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>
+ </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">
- <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>
+ <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>
- <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-option *ngFor="let option of alarmModes" [nzLabel]="option.label" [nzValue]="option.value" [nzDisabled]="option.disabled">
- </nz-option>
- </nz-select>
- </div>
- <br/>
- <br/>
- <br/>
</div>
- </div>
- </nz-card>
- <footer-toolbar ng-content = '������������' errorCollect>
+ </nz-card>
+ <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>
@@ -127,5 +100,5 @@
<span *ngIf="isSaving">���</span>
</span>
</button>
- </footer-toolbar>
+ </footer-toolbar>
</form>
--
Gitblit v1.8.0