diff --git a/src/main/webapp/s/app/task/task.js b/src/main/webapp/s/app/task/task.js index 936c84a..bf8c522 100644 --- a/src/main/webapp/s/app/task/task.js +++ b/src/main/webapp/s/app/task/task.js @@ -44,7 +44,14 @@ drawTaskOverlays.length = 0; taskDetailLists.length = 0; } - + function clearAllEventPoint() { + for (var i = 0; i < drawEventOverlays.length; i++) { + map.removeOverlay(drawEventOverlays[i]); + } +// drawEventOverlays.length = 0; + drawEventOverlays = []; + eventBeanList = []; + } function getTaskInfo(patroler) { taskLists.clear(); $.ajax({ @@ -116,12 +123,10 @@ var imageDivs=""; var width = 100/images.length;//动态展示 for(var i =0;i" + imageDivs +="" } $("#eventImg").append(imageDivs) $("#eventDescription").html(msg2); -// $('#eventPagination').remove -// $('#eventPagination').children().remove(); $('#eventModal').modal('show').css({width: "300px"}); // alert("showEventInfo:"+images); // eventImgPage(images.length, 1, images); @@ -270,20 +275,20 @@ map.addControl(emsEditControl); //创建工单按钮 - var addTaskImage = $('#context').val() + "/images/tasks/singleTask.png"; - var offset1 = new BMap.Size(10, 100); - var taskAddControl = new EmsControl(map, addTaskImage, Task.taskAddCallBack, offset1, "按线路创建工单"); - map.addControl(taskAddControl); +// var addTaskImage = $('#context').val() + "/images/tasks/singleTask.png"; +// var offset1 = new BMap.Size(10, 100); +// var taskAddControl = new EmsControl(map, addTaskImage, Task.taskAddCallBack, offset1, "按线路创建工单"); +// map.addControl(taskAddControl); //绘制区域创建工单按钮 var addTaskImage = $('#context').val() + "/images/tasks/multi-tasks.png"; - var offset2 = new BMap.Size(10, 170); + var offset2 = new BMap.Size(10, 100); var taskAddControl = new EmsControl(map, addTaskImage, Task.selectMarkerCallBack, offset2, "选择多点创建工单"); map.addControl(taskAddControl); //绘制清除绘制按钮 var clearImage = $('#context').val() + "/images/tasks/clear.png"; - var offset3 = new BMap.Size(10, 240); + var offset3 = new BMap.Size(10, 170); var clearControl = new EmsControl(map, clearImage, Task.clearCallBack, offset3, "清空选择"); map.addControl(clearControl); @@ -371,6 +376,7 @@ return; } clearAllTaskPoint(); + clearAllEventPoint(); var taskId = this.getElementsByClassName("id")[0].innerHTML; var i = 0; //请求任务 @@ -605,8 +611,10 @@ "上传时间:" + eventBeanList[i].createTime + "\r\n"; var marker = new BMap.Marker(point, {icon: myIcon, title: msg}); // 创建标注 marker.Tag = eventBeanList[i]; + marker.addEventListener("click", showEventInfo); map.addOverlay(marker); // 将标注添加到地图中 + drawEventOverlays.push(marker); } },