update

xufenglei

2018-11-12 35934dc9e317e4a2de655c1f01fc573f69f37234

update

 src/main/webapp/js/moralmap.js

@@ -782,7 +782,7 @@
        }
        var  mouseOverHandle = option['mouseover'];
        //弹窗打开和关闭
        moralMarker.addEventListener("mouseover", function() {
        /*moralMarker.addEventListener("mouseover", function() {
            if(mouseOverHandle!=null&&mouseOverHandle instanceof  Function){
                //将arguments转换成数组
                var args = Array.prototype.slice.call(arguments);
@@ -790,7 +790,7 @@
            }
            moralMap.closeSearchBox();
            baiduMap.openInfoWindow(infoWindow, this._point); //开启信息窗口
            /*if(infoWindow.getContent() == "") {
            if(infoWindow.getContent() == "") {
                var data = this.getData();
                var option = this.getOption();
                if(data==null||data["state"]==4){
@@ -802,13 +802,21 @@
                }
                infoWindow.setContent(dataHandle._getDataOutHtml(data));
                infoWindow.redraw();
            }*/
            }
        });
        moralMarker.addEventListener("mouseout", function() {
            baiduMap.closeInfoWindow();
            infoWindow.setContent("");
            moralMap.openSearchBox();
        });*/
		
        moralMarker.addEventListener("mouseover", function() {
            moralMap.openInfoWindow(infoWindow, this._point); //开启信息窗口
        });
        moralMarker.addEventListener("mouseout", function() {
            moralMap.closeInfoWindow();
        });

        //==================infoWindow-end============================
        //储存监控点
        moralMap.putEquipment(option['mac'], moralMarker);