于紫祥_1901
2020-07-13 9e4480300d1285a574d52451206c5adc81396be4
src/main/webapp/js/newmoralmap.js
@@ -648,15 +648,6 @@
    moralMap.MoralMarker = function (option) {
        var _option = option;
        var _pointObj = new BMap.Point(_option['longitude'], _option['latitude']);
        if (_option["description"]=="国控站"){
            _option["state"]="5";
        }
        if (_option["description"]=="省控站"){
            _option["state"]="6";
        }
        if (_option["description"]=="县控站"){
            _option["state"]="8";
        }
        var _iconObj = _getMapIcon(_option["state"]);
        this._point = _pointObj;
@@ -1127,6 +1118,19 @@
                        if (longitude < bounds.northeastLng && longitude > bounds.southwestLng && latitude < bounds.northeastLat && latitude > bounds.southwestLat) {
                            markers.push(oldmarker);
                        }
                        if("国控站"===option["monitorPoint"]["description"]){
                            var icon05 = new BMap.Icon("/img/ico05.png", new BMap.Size(50, 50));
                            var mark05 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon05});
                            markers.push(mark05);
                        }else if("省控站"===option["monitorPoint"]["description"]){
                            var icon06 = new BMap.Icon("/img/ico06.png", new BMap.Size(50, 50));
                            var mark06 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon06});
                            markers.push(mark06);
                        }else if("县控站"===option["monitorPoint"]["description"]){
                            var icon08 = new BMap.Icon("/img/ico08.png", new BMap.Size(50, 50));
                            var mark08 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon08});
                            markers.push(mark08);
                        }
                    }
                }
            }