src/app/business/enum/patterns.enum.ts
@@ -1,3 +1,3 @@ export enum patterns{ num = '\\d+(\\.\\d+)?' num = '(\\-?)\\d+(\\.\\d+)?' } src/app/routes/devices/basic-info/basic-info.component.html
@@ -1,6 +1,6 @@ <div class="content__title"> <h1> 设备列表 设备配置 <small>包含设备的查询、编辑、删除、配置等功能</small> </h1> </div> src/app/routes/systems/organization/organization-config/organization-config.component.html
@@ -46,8 +46,8 @@ </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]="i" maxlength="20" nzDisabled="{{ !f.value['alarmLevels'][row.sensorKey]['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> @@ -59,8 +59,8 @@ </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 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> src/app/routes/systems/organization/organization-config/organization-config.component.ts
@@ -70,17 +70,17 @@ let increment = alarmLevels[key].increment; increment = increment == null || increment.length != 3 ? [0, 0, 0] : increment; const incrementArray = this.formBuilder.array([ [increment[0], Validators.pattern(patterns.num)], [increment[1], Validators.pattern(patterns.num)], [increment[2], Validators.pattern(patterns.num)] [increment[0]], [increment[1]], [increment[2]] ]); let degression = alarmLevels[key].degression; degression = degression == null || degression.length != 3 ? [0, 0, 0] : degression; const degressionArray = this.formBuilder.array([ [degression[0], Validators.pattern(patterns.num)], [degression[1], Validators.pattern(patterns.num)], [degression[2], Validators.pattern(patterns.num)] [degression[0]], [degression[1]], [degression[2]] ]); //判断逆向是否启用 // let _degressionEnable = degression[0] != 0 || degression[1] != 0 || degression[2] != 0; @@ -241,14 +241,19 @@ return null; } let result = {}; if ((i0.value != 0 || i1.value != 0 || i2.value != 0)&&(i0.value >= i1.value||i1.value >= i2.value)) { const i0_value = parseInt(i0.value); const i1_value = parseInt(i1.value); const i2_value = parseInt(i2.value); if ((i0_value != 0 || i1_value != 0 || i2_value != 0)&&(i0_value >= i1_value||i1_value >= i2_value)) { this.addError('increment',i0,i1,i2); result["increment"] = true; }else{ this.removeError('increment',i0,i1,i2); } debugger; if(degressEnable&&(d0.value != 0 || d1.value != 0 || d2.value != 0)&&(d1.value >= d0.value||d2.value >= d1.value)) { const d0_value = parseInt(d0.value); const d1_value = parseInt(d1.value); const d2_value = parseInt(d2.value); if(degressEnable&&(d0_value != 0 || d1_value != 0 || d2_value != 0)&&(d1_value >= d0_value||d2_value >= d1_value)) { this.addError('degression',d0,d1,d2); result["degression"] = true; }else{ src/assets/app-data.json
@@ -40,7 +40,7 @@ "children": [] }] }, { "text": "系统管理", "text": "系统模块", "group": true, "children": [{ "text": "用户管理", @@ -58,7 +58,7 @@ "link": "/devices", "icon": "icon-grid", "children": [{ "text": "基本信息", "text": "设备配置", "link": "/devices/basic" }, { "text": "型号配置",
