微信报警详情页bug修复

fengxiang

2018-04-25 d5d18e36e370b804f6e5f352e75fe3a2b3ae9610

微信报警详情页bug修复

 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])])

 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());