From 245ab3bcc323dbcc877f8d49fb725b2eec91e118 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 08:46:33 +0800
Subject: [PATCH] 区域 增加 镇村选项
---
src/main/webapp/view/alarm/device-data.jsp | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/view/alarm/device-data.jsp b/src/main/webapp/view/alarm/device-data.jsp
index 13983d5..226a762 100644
--- a/src/main/webapp/view/alarm/device-data.jsp
+++ b/src/main/webapp/view/alarm/device-data.jsp
@@ -289,6 +289,16 @@
.attr("dy", "1em")
.text(function(d) { return d.subtitle; });
}
+
+ /**
+ *
+ * @param sortKeys ������������key������
+ * @param data ������������
+ * @param sensors ������������
+ * @param alarmData ������������
+ * @param alarmLevels ������������������
+ * @returns {Array}
+ */
function createBulletData(sortKeys,data,sensors,alarmData,alarmLevels) {
var bullets = [];
for(var index = 0; index<sortKeys.length;index++){
@@ -298,22 +308,22 @@
return value.sensorKey == sensorKey;
});
sensorLevel = alarmLevels[sensorKey];
- if(!sensor||!sensorLevel) break;
+ if(!sensor) break;
bullet.title = !!sensor["description"]?sensor["description"]:sensor.name;
bullet.subtitle = sensor.unit;
bullet.state = !!alarmData[sensorKey]?alarmData[sensorKey]:0;
bullet.measures.push(data[sensorKey]);
bullet.markers.push(data[sensorKey]);
- if(!!sensorLevel.enable){
- var start = 0;
+ var start = 0;
+ if(!!sensorLevel&&!!sensorLevel.enable){
var ranges = sensorLevel.increment;
if(!!sensorLevel.degressEnable){
var inFirst = sensorLevel.increment[0];
var deFirst = sensorLevel.degression[0];
start = (inFirst+deFirst)/2;
ranges = Math.abs(data[sensorKey]-inFirst) > Math.abs(data[sensorKey]-deFirst) ? sensorLevel.degression:sensorLevel.increment;
+ bullet.startPoint = start;
}
- bullet.startPoint = start;
bullet.ranges = ranges;
}else {
var range = data[sensorKey]*10;
@@ -323,6 +333,7 @@
}
bullets.push(bullet);
}
+ console.log(bullets);
return bullets;
}
// init page
--
Gitblit v1.8.0