From 43e7ed40c26afa535aba24b1c9ddc1b87b607d8d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 09:26:26 +0800
Subject: [PATCH] 报表查看
---
src/app/routes/systems/organization/organization-config/organization-config.component.ts | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 f4cee54..50c4d60 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
@@ -2,7 +2,6 @@
import { filter } from 'rxjs/operators';
import { HttpClient } from '@angular/common/http';
import { FormGroup, FormBuilder, FormControl, Validators, FormArray, AbstractControl } from '@angular/forms';
-import { SensorsService } from '@business/services/http/sensors.service';
import { Grid, PageBean } from '@business/entity/grid';
import { Organization, AlarmConfig, AlarmSensorLevel, AlarmConfigValue } from '@business/entity/data';
import { Component, OnInit, OnDestroy } from '@angular/core';
@@ -23,12 +22,11 @@
ngOnDestroy(): void {
this.backToList();
}
- private organization: Organization;
+ public organization: Organization;
grid: Grid<object> = new Grid<object>(null);
validateForm: FormGroup;
constructor(
private organizationService: OrganizationService,
- private sensorsService: SensorsService,
private alarmConfigService: AlarmConfigService,
private formBuilder: FormBuilder,
private http: _HttpClient,
@@ -70,17 +68,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 +239,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{
@@ -274,8 +277,8 @@
}
}
}
- private hasDegression = false;
- refreshHasDegression(value){
+ public hasDegression = false;
+ public refreshHasDegression(value){
if(value){
this.hasDegression = true;
}else{
--
Gitblit v1.8.0