diff --git a/src/main/webapp/s/app/ems/ems.js b/src/main/webapp/s/app/ems/ems.js index 44fcca0..2ad38ae 100644 --- a/src/main/webapp/s/app/ems/ems.js +++ b/src/main/webapp/s/app/ems/ems.js @@ -19,6 +19,41 @@ }); } } + function requestMarkers() { + if (window.markerData.length == 0) { + $.ajax({ + type: "get", + url: $('#context').val() + "/marker/all-point-list.do", + dataType: "json", +// async:false, + cache: false, + success: function (r) { + if (r.data) {//请求成功,将获取到的数据加载到地图上 + //1.解析返回的结果,.设置全局变量data的值 + window.markerData = [];//清空原来的数据 + for (var t = 0; t < r.data.length; t++) { + var markerDto = r.data[t]; + var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle, + markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter, + markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType, + markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id,markerDto.line,markerDto.area); + window.markerData[t] = emsBean; + } + //2.增加marker + Ems.addMarker(window.markerData); + } + map.removeEventListener("tilesloaded", requestMarkers); + }, + error: function (d) {//请求出错 + alert(d.responseText); + map.removeEventListener("tilesloaded", requestMarkers); + } + }); + } else { + Ems.addMarker(window.markerData); + } + + } return { //添加标识器 @@ -293,41 +328,7 @@ drawingManager.addEventListener('overlaycomplete', overlaycomplete); //加载完毕请求标识点信息 - map.addEventListener("tilesloaded", function () { - if (window.markerData.length == 0) { - $.ajax({ - type: "get", - url: $('#context').val() + "/marker/all-point-list.do", - dataType: "json", -// async:false, - cache: false, - success: function (r) { - if (r.data) {//请求成功,将获取到的数据加载到地图上 - //1.解析返回的结果,.设置全局变量data的值 - window.markerData = [];//清空原来的数据 - for (var t = 0; t < r.data.length; t++) { - var markerDto = r.data[t]; - var emsBean = new EMSBean(markerDto.markerObjectType, markerDto.pipeMaterial, markerDto.pipeDiameter, markerDto.layStyle, - markerDto.depth, markerDto.belowType, markerDto.belowDepth, markerDto.belowDiameter, - markerDto.belowMaterial, markerDto.road, markerDto.constructTime, markerDto.ownerComp, markerDto.markerObjectId, markerDto.markerId, markerDto.markerType, - markerDto.markerDepth, markerDto.creator, markerDto.createTime, markerDto.memo, markerDto.latitude, markerDto.longitude, markerDto.recordType, markerDto.id,markerDto.line,markerDto.area); - window.markerData[t] = emsBean; - - } - //2.增加marker - Ems.addMarker(window.markerData); - } - - }, - error: function (d) {//请求出错 - alert(d.responseText); - } - }); - } else { - Ems.addMarker(window.markerData); - } - - }); + map.addEventListener("tilesloaded", requestMarkers); }, initForm: function () {