From 68f5d3ded35395988f5d8b279c216a4e19cd9a6e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Feb 2018 10:46:31 +0800
Subject: [PATCH] 修复bug
---
src/app/routes/systems/organization/organization-config/organization-config.component.ts | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/systems/organization/organization-config/organization-config.component.ts b/src/app/routes/systems/organization/organization-config/organization-config.component.ts
index 34f4089..f73e7b6 100644
--- a/src/app/routes/systems/organization/organization-config/organization-config.component.ts
+++ b/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{
--
Gitblit v1.8.0