diff --git a/src/main/webapp/s/app/task/task-gd.js b/src/main/webapp/s/app/task/task-gd.js index 7a8a3f1..084736e 100644 --- a/src/main/webapp/s/app/task/task-gd.js +++ b/src/main/webapp/s/app/task/task-gd.js @@ -18,6 +18,7 @@ var markerData = []; var hadRequest = false; var viewMarkers = []; //视域范围内的点 + var path = []; //绘制的区域的顶点 var style = [{ url: $('#context').val() + '/images/drop/0.png', // 蓝色图标地址 @@ -73,6 +74,7 @@ map.remove(drawOverlays[i]); } drawOverlays.length = 0; + path = []; clearAllTaskPoint(); clearAllEventPoint(); @@ -278,21 +280,13 @@ swal("请先绘制区域", "", "warning"); return; } - for (var i = 0; i < drawOverlays.length; i++) { - var layer = drawOverlays[i]; - try { - // 生成判断是否在多边形内的数据格式 - var path = []; - for (var k = 0; k < layer.He.path.length; k++) { - var pos = []; - pos.push(layer.He.path[k].lng, layer.He.path[k].lat); - path.push(pos); - } + for (var i = 0; i < path.length; i++) { + try { for (var j = 0; j < markerData.length; j++) { var emsBean = markerData[j]; var point = new AMap.LngLat(emsBean.longitude, emsBean.latitude); - var isPointInRing = AMap.GeometryUtil.isPointInRing(point, path); + var isPointInRing = AMap.GeometryUtil.isPointInRing(point, path[i]); if (isPointInRing) { taskMarkers = taskMarkers + emsBean.id + ","; } @@ -301,6 +295,7 @@ swal("脚本异常", e.message, "error"); } } + if (taskMarkers == "") { swal("请选择标识器点!", "", "error"); return; @@ -366,6 +361,7 @@ mouseTool = new AMap.MouseTool(map); mouseTool.on('draw',function(e){ drawOverlays.push(e.obj); + path.push(e.obj.getPath()); }); //加载完毕请求标识点信息 @@ -629,7 +625,6 @@ //增加事件图片的marker addEventMarker: function () { - console.log(eventBeanList); for (var i = 0; i < eventBeanList.length; i++) { var eventMarker = new AMap.Marker({ position: [eventBeanList[i].longitude, eventBeanList[i].latitude],