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

ZhuDongming

2020-06-30 67a7a24b47d71dd843dd0b17c5cdf9f519e29d5d

 src/main/webapp/js/newmoralmap.js

@@ -644,6 +644,7 @@

        return listView;
    }

    moralMap.MoralMarker = function (option) {
        var _option = option;
        var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
@@ -696,21 +697,61 @@
        })
    }

    moralMap.WindMarker = function (option, target) {
    moralMap.WindMarker = function (option, moralMap) {
        var _option = option;
        var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
        var _iconObj = new BMap.Icon("/img/wind_dir.png", new BMap.Size(25, 25));
        var _iconObj = _getWindIcon(1);
        this._point = _pointObj;

        function _getWindIcon(speedLevel) {
            speedLevel = speedLevel == null ? 0 : speedLevel;
            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"])
            });
        }

        this.constructor.call(this, _pointObj, {
            icon: _iconObj,
            offset: new BMap.Size(0, -35),
            offset: new BMap.Size(0, -11),
            enableMassClear: true
        })
        return $.extend(this, {
            refreshWindDir: function (windDir) {
            refreshWindDir: function (windDir, windSpeed) {
                //状态发生变化的时候设置图标风向
                this.setRotation(windDir);
                if (windDir == undefined || windSpeed == undefined) {
                    moralMap.removeOverlay(this);
                } else {
                    var speedLevel;
                    if (windSpeed >= 0 && windSpeed <= 0.2) {
                        speedLevel = 0;
                    } else if (windSpeed > 0.2 && windSpeed <= 1.5) {
                        speedLevel = 1;
                    } else if (windSpeed > 1.5 && windSpeed <= 3.3) {
                        speedLevel = 2;
                    } else if (windSpeed > 3.3 && windSpeed <= 5.4) {
                        speedLevel = 3;
                    } else if (windSpeed > 5.4 && windSpeed <= 7.9) {
                        speedLevel = 4;
                    } else if (windSpeed > 7.9 && windSpeed <= 10.7) {
                        speedLevel = 5;
                    } else if (windSpeed > 10.7 && windSpeed <= 13.8) {
                        speedLevel = 6;
                    } else if (windSpeed > 13.8 && windSpeed <= 17.1) {
                        speedLevel = 7;
                    } else if (windSpeed > 17.1) {
                        speedLevel = 8;
                    }
                    if (speedLevel == 0) {
                        moralMap.removeOverlay(this);
                    } else {
                        moralMap.addOverlay(this);
                        var iconObj = _getWindIcon(speedLevel);
                        this.setIcon(iconObj);
                        this.setRotation(windDir);
                    }
                }
            },
            getOption: function () {
                return _option;
@@ -805,7 +846,7 @@
    var sensorsDescriptionMap;
    var sensorsUnitMap;
    $.ajax({
        url: "getSensorsMap",
        url: "getSensorsAllMap",
        type: "get",
        dataType: "json",
        success: function (data) {
@@ -823,14 +864,19 @@
                }
            }
        }
        var windMarker = new moralMap.WindMarker(option);
        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;
        return $.extend(windMarker, {
            refreshWindDir: function (data) {
                if (data != null && data != "") {
                    this.setData(data); //更新数据
                    refreshWindMarker.call(this, data["e23"]);
                    refreshWindMarker.call(this, data["e23"], data["e18"]);
                }
            },
            setData: function (data) {
@@ -898,15 +944,15 @@
        }
        var mouseOverHandle = option['mouseover'];
        moralMarker.addEventListener("mouseover", function () {
         /*   var obj = {};
            obj['methodName'] = 'deliverMac';
            obj['mac'] = option['mac'];
            var objStr = JSON.stringify(obj);
            if (!!window['external'] && !!window['external']['callWin']) {
                window['external'].callWin(objStr);
            } else {
                alert(objStr);
            }*/
            /*   var obj = {};
               obj['methodName'] = 'deliverMac';
               obj['mac'] = option['mac'];
               var objStr = JSON.stringify(obj);
               if (!!window['external'] && !!window['external']['callWin']) {
                   window['external'].callWin(objStr);
               } else {
                   alert(objStr);
               }*/

            moralMap.showSensors = function (jsonData) {
                var deviceSensors = jsonData;
@@ -958,14 +1004,14 @@
        });

        moralMarker.addEventListener("mouseout", function () {
          /*  var obj = {};
            obj['methodName'] = 'stopDeliverMac';
            var objStr = JSON.stringify(obj);
            if (!!window['external'] && !!window['external']['callWin']) {
                window['external'].callWin(objStr);
            } else {
                alert(objStr);
            }*/
            /*  var obj = {};
              obj['methodName'] = 'stopDeliverMac';
              var objStr = JSON.stringify(obj);
              if (!!window['external'] && !!window['external']['callWin']) {
                  window['external'].callWin(objStr);
              } else {
                  alert(objStr);
              }*/
            moralMap.closeInfoWindow();
        });