修复bug

fengxiang

2018-02-08 68f5d3ded35395988f5d8b279c216a4e19cd9a6e

 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: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>
                        <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%'}">
@@ -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>
@@ -117,7 +98,8 @@
            </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>