修改飞行轨迹点只有一点时显示1，修改信息弹窗显示顺序及添加数据类别

ZhuDongming

2019-08-14 a423846897181b1f84a37bc9b28125b43e103551

 src/main/webapp/view/uavTrajectory.jsp

@@ -66,16 +66,13 @@
        font-size: 13px;
        font-weight: bold;
        text-align: left;
        padding-left: 5px;
        padding-top: 5px;
        padding: 5px 5px 0 5px;
        background-color: #2DA0EB;
    }

    .BMap_bubble_content {
        background-color: white;
        padding-left: 5px;
        padding-top: 5px;
        padding-bottom: 10px;
        padding: 5px 5px 10px 5px;
    }

    .BMap_pop img {
@@ -147,6 +144,8 @@
    }
    var trackPoints = []; //用来存放从后台获取到的所有历史轨迹点的数据
    var coincidentPoints = new Array();
    var flyingParameters=['经度','纬度','高度','速度x','速度y','速度z'];
    var monitorParameters=['PM2.5','PM10','一氧化碳','二氧化硫','二氧化氮','臭氧','VOCs总量','气压','温度','湿度','核辐射'];
    if (sensorInfo.length > 0) {
        $.each(sensorInfo, function (item, value) {
            if (typeof (value.经度) == "undefined") {
@@ -156,6 +155,8 @@
            }
        })
        for (var i = 0; i < trackPoints.length; i++) {
            var flyingData=[];
            var monitorData=[];
            var startPoint = trackPoints[i];
            var endPoint = trackPoints[i + 1];
            var marker;
@@ -235,7 +236,13 @@
                '<div style="min-height:20px;overflow:auto;max-height:400px;" >';
            var opts = {
                width: 220,
                title: '<h4>无人机信息</h4>', // 信息窗口标题
                title: '<h4>时间：'+sensorInfo[i].时间+'</h4>', // 信息窗口标题
                enableMessage: false, //设置允许信息窗发送短息
            }

            var optsCoincide = {
                width: 220,
                title: '<h4>重合坐标信息</h4>', // 信息窗口标题
                enableMessage: false, //设置允许信息窗发送短息
            }

@@ -253,20 +260,32 @@
                    winfowText += winfowTextAdd;
                }
            }

            var monitorDataResult=monitorDataSort(sensorInfo[i],monitorData,monitorParameters);
            var flyingDataResult=flyingDataSort(sensorInfo[i],flyingData,flyingParameters);
            if (coincidentPoints.indexOf(i) > -1) {
                winfowText = winfowText + "</div>";
            } else {
                for (var prop in sensorInfo[i]) {
                    if (sensorInfo[i].hasOwnProperty(prop)) {
                        winfowText += (prop + "：" + sensorInfo[i][prop] + "</br>");
                winfowText +='<h4 style="background-color: #CD5C5C;color:white">监测因子信息</h4>';
                for (var prop in monitorDataResult) {
                    if (monitorDataResult.hasOwnProperty(prop)) {
                        winfowText += (prop + "：" + monitorDataResult[prop] + "</br>");
                    }
                }
                winfowText +='<h4 style="background-color: #66CD00;color:white">飞行因子信息</h4>';
                for (var prop in flyingDataResult) {
                    if (flyingDataResult.hasOwnProperty(prop)) {
                        winfowText += (prop + "：" + flyingDataResult[prop] + "</br>");
                    }
                }
                winfowText += "</div>";
            }

            (function (x) {
                if (coincidentPoints.indexOf(i) > -1) {
                    var infoWindow = new BMap.InfoWindow(winfowText, optsCoincide);
                }else{
                var infoWindow = new BMap.InfoWindow(winfowText, opts);
                }
                marker.addEventListener("click", function () {
                    this.openInfoWindow(infoWindow);
                });
@@ -274,15 +293,31 @@

            function openInfo(e) {
                var point = new BMap.Point(sensorInfo[e.id].经度.substr(0, sensorInfo[e.id].经度.length - 1), sensorInfo[e.id].纬度.substr(0, sensorInfo[e.id].纬度.length - 1));
                var flyingData=[];
                var monitorData=[];
                var monitorDataCoincide=monitorDataSort(sensorInfo[e.id],monitorData,monitorParameters);
                var flyingDataCoincide=flyingDataSort(sensorInfo[e.id],flyingData,flyingParameters);
                var winfowText1 =
                    '<div style="min-height:20px;overflow:auto;max-height:400px;" >';
                for (var prop in sensorInfo[e.id]) {
                    if (sensorInfo[e.id].hasOwnProperty(prop)) {
                        winfowText1 += (prop + "：" + sensorInfo[e.id][prop] + "</br>");
                winfowText1 +='<h4 style="background-color: #CD5C5C;color:white">监测因子信息</h4>';
                for (var prop in monitorDataCoincide) {
                    if (monitorDataCoincide.hasOwnProperty(prop)) {
                        winfowText1 += (prop + "：" + monitorDataCoincide[prop] + "</br>");
                    }
                }
                winfowText1 +='<h4 style="background-color: #66CD00;color:white">飞行因子信息</h4>';
                for (var prop in flyingDataCoincide) {
                    if (flyingDataCoincide.hasOwnProperty(prop)) {
                        winfowText1 += (prop + "：" + flyingDataCoincide[prop] + "</br>");
                    }
                }
                winfowText1 += "</div>";
                var infoWindow1 = new BMap.InfoWindow(winfowText1, opts);
                var optsCoincideChild = {
                    width: 220,
                    title: '<h4>时间：'+sensorInfo[e.id].时间+'</h4>', // 信息窗口标题
                    enableMessage: false, //设置允许信息窗发送短息
                }
                var infoWindow1 = new BMap.InfoWindow(winfowText1, optsCoincideChild);
                //开启信息窗口
                map.openInfoWindow(infoWindow1, point);
            }
@@ -300,6 +335,28 @@
                map.openInfoWindow.apply(map, arguments); //开启信息窗口
            }

            function monitorDataSort(sensorMap,monitorData,monitorParameters) {
                for(var j = 0; j < monitorParameters.length; j++) {
                    $.map(sensorMap,function(value,key){
                        if (monitorParameters[j]==key) {
                            monitorData[key]=sensorMap[key];
                        }
                    });
                }
                return monitorData;
            }

            function flyingDataSort(sensorMap,flyingData,flyingParameters) {
                for(var k = 0; k < flyingParameters.length; k++) {
                    $.map(sensorMap,function(value,key){
                        if (flyingParameters[k]==key) {
                            flyingData[key]=sensorMap[key];
                        }
                    });
                }
                return flyingData;
            }

            if (count > 0) {
                var lab;
                if (count > 0 && count <= 8) {
@@ -320,6 +377,17 @@
                });
                map.addOverlay(lab);
            }
            if(count==0){
                var lab=new BMap.Label(count + 1, {position: startPoint, offset: new BMap.Size(-7,-22)});
                lab.setStyle({
                    color: "#fff",
                    fontSize: "16px",
                    backgroundColor: "1",
                    border: "0",
                    fontWeight: "bold"
                });
                map.addOverlay(lab);
            }
            map.addOverlay(marker);
        }
    }