From d5d18e36e370b804f6e5f352e75fe3a2b3ae9610 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 25 Apr 2018 13:58:56 +0800
Subject: [PATCH] 微信报警详情页bug修复
---
src/main/webapp/js/bullet.js | 1 -
src/main/webapp/view/alarm/device-data.jsp | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/js/bullet.js b/src/main/webapp/js/bullet.js
index baa3cb7..9707a40 100644
--- a/src/main/webapp/js/bullet.js
+++ b/src/main/webapp/js/bullet.js
@@ -23,7 +23,6 @@
g = d3.select(this) // ��������� ������
.append("g")
.attr("transform", "translate(75)");
- debugger;
// Compute the new x-scale.
var x1 = d3.scale.linear()
.domain([0, Math.max(rangez[0], markerz[0], measurez[0])])
diff --git a/src/main/webapp/view/alarm/device-data.jsp b/src/main/webapp/view/alarm/device-data.jsp
index 9a90c63..13983d5 100644
--- a/src/main/webapp/view/alarm/device-data.jsp
+++ b/src/main/webapp/view/alarm/device-data.jsp
@@ -297,13 +297,13 @@
var sensor = sensors.find(function (value) {
return value.sensorKey == sensorKey;
});
- if(!sensor) break;
+ sensorLevel = alarmLevels[sensorKey];
+ if(!sensor||!sensorLevel) 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 ranges = sensorLevel.increment;
@@ -327,7 +327,6 @@
}
// init page
(function () {
- debugger;
var alarm = $.parseJSON($("#alarm").text());
alarm["json"] = $.parseJSON(alarm.json);
var device = $.parseJSON($("#device").text());
--
Gitblit v1.8.0