From 7ca521e4267b987270f6ccbb9a6c076aeb467d96 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:11:33 +0800
Subject: [PATCH] 设备，监控站 管理功能增强
---
src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
index 2965818..0f48916 100644
--- a/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
+++ b/src/app/routes/sensors/basic-info/sensor-unit/sensor-unit.component.ts
@@ -39,6 +39,9 @@
}
);
}
+ public rulesToShow(rules: string) {
+ return rules.replace( /d/g, '').replace('{0}', '������');
+ }
ngOnInit() {
this.loadDataList();
const validates: SensorUnit = {
@@ -111,22 +114,25 @@
};
this.rules.push(rule);
this.setValueToControl('_rules' , this.rulesToString(this.rules, '������'));
- }
- rulesToString(rules , dataLabel?: string) {
+ } rulesToString(rules , dataLabel?: string) {
let rulesString = '' ;
- dataLabel = dataLabel === undefined ? '{0}' : dataLabel;
+ const isDataLabel = dataLabel === undefined;
+ dataLabel = isDataLabel ? '{0}' : dataLabel;
if (!!this.rules && this.rules.length > 0) {
// const dataLabel = '������';
rulesString += dataLabel ;
this.rules.forEach(rule => {
if (!rulesString.endsWith(dataLabel)) {
rulesString = '(' + rulesString + ')';
- }
- switch (rule.operator) {
- case Operator.PLUS: rulesString += '+' + rule.value + 'd'; break;
- case Operator.MINUS: rulesString += '-' + rule.value + 'd'; break;
- case Operator.MULTIPLY: rulesString += '*' + rule.value + 'd'; break;
- case Operator.DIVIDE: rulesString += '/' + rule.value + 'd'; break;
+ }
+ switch (rule.operator) {
+ case Operator.PLUS: rulesString += '+' + rule.value; break;
+ case Operator.MINUS: rulesString += '-' + rule.value; break;
+ case Operator.MULTIPLY: rulesString += '*' + rule.value; break;
+ case Operator.DIVIDE: rulesString += '/' + rule.value; break;
+ }
+ if ( isDataLabel ) {
+ rulesString += 'd';
}
});
}
--
Gitblit v1.8.0