update

jinpengyong

2020-09-28 9b9f6e309a0b0ffd5c2495eaf8438b36704991a6

 src/main/webapp/js/newmoralmap.js

@@ -218,6 +218,10 @@
                    var longitude = 106.638135;
                    var latitude = 29.709625;
                    point = new BMap.Point(longitude, latitude);
                } else if ("射阳县" == regoinNames[2]) {
                    var longitude = 120.332826;
                    var latitude = 33.772274;
                    point = new BMap.Point(longitude, latitude);
                }
                map.centerAndZoom(point, showZoom);
            } else {
@@ -395,7 +399,7 @@
        var timer = setTimeout(function () {
            baiduMap.closeInfoWindow.apply(baiduMap, arguments);
            moralMap["_closeInfoWinTimer"] = null;
        }, 1200);
        }, 500);
        moralMap["_closeInfoWinTimer"] = timer;
    }
    moralMap.clearOverlays = function () {
@@ -944,56 +948,47 @@
        }
        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);
            }

            moralMap.showSensors = function (jsonData) {
                /* var deviceSensors = jsonData;
                 var mac = deviceSensors["mac"];
                 if (mac == option['mac']) {*/
                var deviceSensors = jsonData;
                var mac = deviceSensors["mac"];
                if (!jsonData.hasOwnProperty('mac')) {
                    infoWindow.setContent("");
                    infoWindow.redraw();
                } else {
                    var adressOutHtml = '<div style="min-height:20px;overflow:auto;max-height:480px;font-size: 12px;" onmouseover="moralMap.clearCloseInfoWindow()" onmouseout="moralMap.closeInfoWindow()">';
                    var y, m, d, h, mm, s;
                    var date = new Date($.now());
                    y = 1900 + date.getYear();
                    m = "0" + (date.getMonth() + 1);
                    d = "0" + date.getDate();
                    h = "0" + date.getHours();
                    mm = "0" + date.getMinutes();
                    s = "0" + date.getSeconds();
                    date = y + "-" + m.substring(m.length - 2, m.length) + "-" + d.substring(d.length - 2, d.length) + " " + h.substring(h.length - 2, h.length) + ":" + mm.substring(mm.length - 2, mm.length) + ":" + s.substring(s.length - 2, s.length);
                    adressOutHtml += '<p style="height: 18px;line-height: 18px">' + "时间：&nbsp;" + date + "&nbsp;</p>";
                    for (var prop in jsonData) {
                        if (jsonData.hasOwnProperty(prop) && prop != 'ver' && prop != 'methodName' && prop != 'mac' && prop != 'time') {
                            for (var key in sensorsDescriptionMap) {
                                if (prop == key) {
                                    var sensorsDescription = sensorsDescriptionMap[key];
                                }
                            }
                            for (var key in sensorsUnitMap) {
                                if (prop == key) {
                                    var sensorsUnit = sensorsUnitMap[key];
                                    if (sensorsUnit == null) {
                                        sensorsUnit = "";
                    if (mac == option['mac']) {
                        var adressOutHtml = '<div style="min-height:20px;overflow:auto;max-height:480px;font-size: 12px;" onmouseover="moralMap.clearCloseInfoWindow()" onmouseout="moralMap.closeInfoWindow()">';
                        var y, m, d, h, mm, s;
                        var date = new Date($.now());
                        y = 1900 + date.getYear();
                        m = "0" + (date.getMonth() + 1);
                        d = "0" + date.getDate();
                        h = "0" + date.getHours();
                        mm = "0" + date.getMinutes();
                        s = "0" + date.getSeconds();
                        date = y + "-" + m.substring(m.length - 2, m.length) + "-" + d.substring(d.length - 2, d.length) + " " + h.substring(h.length - 2, h.length) + ":" + mm.substring(mm.length - 2, mm.length) + ":" + s.substring(s.length - 2, s.length);
                        adressOutHtml += '<p style="height: 18px;line-height: 18px">' + "时间：&nbsp;" + date + "&nbsp;</p>";
                        for (var prop in jsonData) {
                            if (jsonData.hasOwnProperty(prop) && prop != 'ver' && prop != 'methodName' && prop != 'mac' && prop != 'time') {
                                for (var key in sensorsDescriptionMap) {
                                    if (prop == key) {
                                        var sensorsDescription = sensorsDescriptionMap[key];
                                    }
                                }
                                for (var key in sensorsUnitMap) {
                                    if (prop == key) {
                                        var sensorsUnit = sensorsUnitMap[key];
                                        if (sensorsUnit == null) {
                                            sensorsUnit = "";
                                        }
                                    }
                                }
                                adressOutHtml += ('<p style="height: 18px;line-height: 18px">' + sensorsDescription + "：" + jsonData[prop] + sensorsUnit + "</p>");
                            }
                            adressOutHtml += ('<p style="height: 18px;line-height: 18px">' + sensorsDescription + "：" + jsonData[prop] + sensorsUnit + "</p>");
                        }
                        adressOutHtml += "</div>";
                        infoWindow.setContent(adressOutHtml);
                        infoWindow.redraw();
                    }
                    adressOutHtml += "</div>";
                    infoWindow.setContent(adressOutHtml);
                    infoWindow.redraw();
                }
            }
            // }
@@ -1004,14 +999,6 @@
        });

        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);
            }
            moralMap.closeInfoWindow();
        });

@@ -1118,17 +1105,17 @@
                        if (longitude < bounds.northeastLng && longitude > bounds.southwestLng && latitude < bounds.northeastLat && latitude > bounds.southwestLat) {
                            markers.push(oldmarker);
                        }
                        if("国控站"===option["monitorPoint"]["description"]){
                        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("省控站"===obj["monitorPoint"]["description"]){
                        } 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(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon06});
                            var mark06 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon06});
                            markers.push(mark06);
                        }else if("县控站"===obj["monitorPoint"]["description"]){
                        } 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(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon08});
                            var mark08 = new BMap.Marker(new BMap.Point(option["monitorPoint"]["longitude"], option["monitorPoint"]["latitude"]), {icon: icon08});
                            markers.push(mark08);
                        }
                    }