update

xufenglei

2018-11-14 850d0f291dc614c495685d1b82a145823b318201

update

 src/main/webapp/js/moralmap.js

@@ -550,7 +550,6 @@
    //new BMap.Marker()这种写法IE7会报错，很奇葩
    moralMap.MoralMarker.prototype = new BMap.Marker();
    //监控点对象 包装Mark对象
    var showMonitorpointInfoWindow = null;
    moralMap.Monitorpoint = function(option) {
        var icon = {};
        icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
@@ -600,9 +599,6 @@
            }
            return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
        })();
        if (!showMonitorpointInfoWindow) {
            showMonitorpointInfoWindow = infoWindow;
        }
        if(moralMarker["infoWindow"] == undefined) {
            moralMarker["infoWindow"] = infoWindow;
        }
@@ -642,7 +638,6 @@
    }
    //设备以mac为key储存
    //监控点对象 包装MoralMark对象
    var showEquipmentInfoWindow = null;
    moralMap.Equipment = function(option) {
        var icon = {};
        icon["stateIcons"] = ["/img/ico_coo00.png", "/img/ico_coo01.png", "/img/ico_coo02.png", "/img/ico_coo03.png", "/img/ico_coo04.png"];
@@ -697,10 +692,7 @@
            }
            return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
        })();
        if (!showEquipmentInfoWindow) {
            showEquipmentInfoWindow = infoWindow;
        }
		

        /*var infoWindow = (function() {
            //生成信息框
            var winOpts = {
@@ -968,41 +960,13 @@
        var new_point = new BMap.Point(condition.longitude, condition.latitude);
        baiduMap.panTo(new_point);
        baiduMap.setCenter(new_point);
        var parma={};
        parma["areaCode"] = moralMap['params']["areaCode"];
        parma["orgId"] = moralMap['params']["orgId"];
        if (condition.type == "mpoint") {
            parma["layer"] = "monitorpoints";
            parma["markerKeys"] = [condition.id];
            baiduMap.setZoom(17);
            moralMap.openInfoWindow(moralMap.getMpoint(condition.id)["infoWindow"], new_point);
        } else if (condition.type == "device") {
            parma["layer"] = "equipments";
            parma["markerKeys"] = [condition.mac];
            baiduMap.setZoom(18);
            moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
        }
        //$("#searchParam").val(JSON.stringify(parma));
        $.ajax({
            type : "post",
            url : "get-real-state-data",
            data : JSON.stringify(parma),
            dataType : "json",
            contentType : "application/json;charset=utf-8",
            cache : false,
            async : true,
            success : function(data) {
                condition.state = data["extData"]["markers"][0]["state"];
                if (condition.type == "mpoint") {
                    baiduMap.setZoom(17);
                    new moralMap.Monitorpoint(condition);
                    moralMap.openInfoWindow(showMonitorpointInfoWindow, new_point);
                    showMonitorpointInfoWindow = null;
                } else if (condition.type == "device") {
                    baiduMap.setZoom(18);
                    new moralMap.Equipment(condition);
                    moralMap.openInfoWindow(showEquipmentInfoWindow, new_point);
                    showEquipmentInfoWindow = null;
                }
            }
        });

    }