update大屏左侧站点设备查询优化及设备因子名称显示null问题

ZhuDongming

2020-06-30 67a7a24b47d71dd843dd0b17c5cdf9f519e29d5d

 src/main/webapp/js/newmoralmap.js

@@ -705,10 +705,10 @@

        function _getWindIcon(speedLevel) {
            speedLevel = speedLevel == null ? 0 : speedLevel;
            var icon = _option["icon"];
            var url = icon["url"] + speedLevel + ".png";
            return new BMap.Icon(url, new BMap.Size(icon["width"], icon["height"]), {
                imageSize: new BMap.Size(icon["width"], icon["height"])
            var windIcon = _option["windIcon"];
            var windUrl = windIcon["url"] + speedLevel + ".png";
            return new BMap.Icon(windUrl, new BMap.Size(windIcon["width"], windIcon["height"]), {
                imageSize: new BMap.Size(windIcon["width"], windIcon["height"])
            });
        }

@@ -724,32 +724,33 @@
                    moralMap.removeOverlay(this);
                } else {
                    var speedLevel;
                    if (windSpeed >= 0.0 && windSpeed <= 0.2) {
                    if (windSpeed >= 0 && windSpeed <= 0.2) {
                        speedLevel = 0;
                    } else if (windSpeed >= 0.3 && windSpeed <= 1.5) {
                    } else if (windSpeed > 0.2 && windSpeed <= 1.5) {
                        speedLevel = 1;
                    } else if (windSpeed >= 1.6 && windSpeed <= 3.3) {
                    } else if (windSpeed > 1.5 && windSpeed <= 3.3) {
                        speedLevel = 2;
                    } else if (windSpeed >= 3.4 && windSpeed <= 5.4) {
                    } else if (windSpeed > 3.3 && windSpeed <= 5.4) {
                        speedLevel = 3;
                    } else if (windSpeed >= 5.5 && windSpeed <= 7.9) {
                    } else if (windSpeed > 5.4 && windSpeed <= 7.9) {
                        speedLevel = 4;
                    } else if (windSpeed >= 8.0 && windSpeed <= 10.7) {
                    } else if (windSpeed > 7.9 && windSpeed <= 10.7) {
                        speedLevel = 5;
                    } else if (windSpeed >= 10.8 && windSpeed <= 13.8) {
                    } else if (windSpeed > 10.7 && windSpeed <= 13.8) {
                        speedLevel = 6;
                    } else if (windSpeed >= 13.9 && windSpeed <= 17.1) {
                    } else if (windSpeed > 13.8 && windSpeed <= 17.1) {
                        speedLevel = 7;
                    } else if (windSpeed >= 17.2) {
                    } else if (windSpeed > 17.1) {
                        speedLevel = 8;
                    }
                }
                if (speedLevel == 0) {
                    moralMap.removeOverlay(this);
                } else {
                    var iconObj = _getWindIcon(speedLevel);
                    this.setIcon(iconObj);
                    this.setRotation(windDir);
                    if (speedLevel == 0) {
                        moralMap.removeOverlay(this);
                    } else {
                        moralMap.addOverlay(this);
                        var iconObj = _getWindIcon(speedLevel);
                        this.setIcon(iconObj);
                        this.setRotation(windDir);
                    }
                }
            },
            getOption: function () {
@@ -845,7 +846,7 @@
    var sensorsDescriptionMap;
    var sensorsUnitMap;
    $.ajax({
        url: "getSensorsMap",
        url: "getSensorsAllMap",
        type: "get",
        dataType: "json",
        success: function (data) {
@@ -863,11 +864,11 @@
                }
            }
        }
        var icon = {};
        icon["url"] = "/img/icoWind0";
        icon["width"] = 25;
        icon["height"] = 25;
        option["icon"] = icon;
        var windIcon = {};
        windIcon["url"] = "/img/icoWind0";
        windIcon["width"] = 25;
        windIcon["height"] = 25;
        option["windIcon"] = windIcon;
        var windMarker = new moralMap.WindMarker(option, moralMap);
        moralMap.putDevice(option['mac'], windMarker);
        var refreshWindMarker = windMarker.refreshWindDir;