From f5e9467cdc5535be9d345914f828ac5a1ebe9cb5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Jul 2020 17:21:04 +0800
Subject: [PATCH] 无人机应用大屏页面update
---
src/main/webapp/view/alarm/device-data.jsp | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/view/alarm/device-data.jsp b/src/main/webapp/view/alarm/device-data.jsp
index 9a90c63..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++){
@@ -297,23 +307,23 @@
var sensor = sensors.find(function (value) {
return value.sensorKey == sensorKey;
});
+ sensorLevel = alarmLevels[sensorKey];
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]);
- sensorLevel = alarmLevels[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,11 +333,11 @@
}
bullets.push(bullet);
}
+ console.log(bullets);
return bullets;
}
// init page
(function () {
- debugger;
var alarm = $.parseJSON($("#alarm").text());
alarm["json"] = $.parseJSON(alarm.json);
var device = $.parseJSON($("#device").text());
--
Gitblit v1.8.0