From 880eaffb3557deb7da44b32a637b61125655115c Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.24>
Date: 星期五, 28 九月 2018 14:33:45 +0800
Subject: [PATCH] 电池续航时间查询后台修改
---
gx_tieta/WebRoot/index.jsp | 215 ++++++++++++++++++++++++-----------------------------
1 files changed, 98 insertions(+), 117 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index b0aee9e..27666f9 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -93,9 +93,6 @@
<div id="content">
<div class="nav-map small">
<!-- 鐢垫睜鍒嗗竷鍥� -->
- <div class="side-bar abs">
- <div class="lside"></div>
- </div>
<div class="china-map" id="map">
<div class="img-change" style="display:none;">
<div class="img-list">
@@ -600,7 +597,6 @@
flushFourPie(); //鏇存柊鍥涚楗肩姸鍥�
});
-
// 璁剧疆鍙抽敭鑿滃崟
var menu = new BMap.ContextMenu();
var txtMenuItem = [
@@ -635,17 +631,7 @@
enparams:[e]
});
}
- },
- /* {
- text: '鏈烘埧瀹氫綅',
- callback: function(e) {
- panel.setPanelLayout();
- panel.showPanel();
- $('#map .panel-mask').bind('click', function() {
- panel.hidePanel();
- });
- }
- } */
+ }
];
//console.info(getPermit('taskchange_edit_permit', permits)+"*******");
if(getPermit('batt_map_edit_permit', permits)) {
@@ -1600,11 +1586,10 @@
// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
for(var i = 0; i < dotList.length; i++) {
- var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
-
+ var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[0].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
var pt = new BMap.Point(dotList[i].lng, dotList[i].lat);
- var mk = new BMap.Marker(pt, {icon:dotIcon}); // 瀹氫箟marker鐐�
+ var mk = new BMap.Marker(pt, {icon: dotIcon}); // 瀹氫箟marker鐐�
addMenu(mk, mapDel);
deletePoint(map, dotList[i].title);
// 鍚憁k鐐规坊鍔爈abel
@@ -1629,6 +1614,11 @@
map.addOverlay(mk);
}
}
+
+
+
+
+ //
// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
function deletePoint(map, msg){
@@ -1969,10 +1959,86 @@
}
}
- searchStation();
+ // 璁剧疆椤甸潰涓殑鍙鍖哄煙鍥炬爣
+ ;(function($, window, document, gl, undefined) {
+ // 璁剧疆鍛藉悕绌洪棿
+ gl.namespace('BMap');
+ // 鏍规嵁鍙鑼冨洿鏄剧ず鍧愭爣鐐�
+ var dots = [];
+ var currMarkers = {};
+ // 鏌ヨ褰撳墠鑼冨洿鍐呭鐨勫浘鏍�
+ function queryInRect(map, callback) {
+ var cp = map.getBounds(); // 杩斿洖map鍙鍖哄煙锛屼互鍦扮悊鍧愭爣琛ㄧず
+ var sw = cp.getSouthWest(); // 杩斿洖鐭╁舰鍖哄煙鐨勮タ鍗楄
+ var ne = cp.getNorthEast(); // 杩斿洖鐭╁舰鍖哄煙鐨勪笢鍖楄
+ //var zoom = map.getZoom(); //褰撳墠缂╂斁绾у埆
+ //console.log(dots);
+ var mapDots = getDotsList(sw, ne);
+ callback(map, mapDots);
+ }
+
+ // 鑾峰彇dots鐨勯泦鍚�
+ function getDotsList(sw, ne) {
+ var rs = [];
+ swlng=sw.lng,
+ swlat=sw.lat,
+ nelng=ne.lng,
+ nelat=ne.lat;
+
+ var maxLng = sw.lng>ne.lng?sw.lng:ne.lng;
+ var minLng = sw.lng<ne.lng?sw.lng:ne.lng;
+
+ var maxLat = sw.lat>ne.lat?sw.lat:ne.lat;
+ var minLat = sw.lat<ne.lat?sw.lat:ne.lat;
+
+ for(var i=0; i<dots.length; i++) {
+ var dot = dots[i];
+ var lat = dot.lat;
+ var lng = dot.lng;
+ var sId = dot.binformation.StationId;
+ var isExist = checkMarker(sId);
+
+ // 鏈娣诲姞杩�
+ if(!isExist) {
+ // 鍒ゆ柇缁忕含搴︽槸鍚﹀瓨鍦ㄨ鍖哄煙
+ if(lng<maxLng && lng>minLng && lat<maxLat && lat>minLat) {
+ currMarkers['markers'+sId] = sId;
+ rs.push(dot);
+ }
+ }
+ }
+ return rs;
+ }
+
+
+ // 妫�娴嬪綋鍓嶇偣鏄惁宸茬粡琚坊鍔犺繃
+ function checkMarker(id) {
+ var flag = false;
+ // 閬嶅巻宸茬粡娣诲姞鐨勭偣杩斿洖鏄惁宸茬粡琚坊鍔犺繃
+ Object.keys(currMarkers).forEach(function(key) {
+ if(currMarkers[key] == id) {
+ flag = true;
+ }
+ });
+
+ return flag;
+ }
+
+ // 璁剧疆dots闆嗗悎鐨勫��
+ function setDots(data) {
+ dots = data;
+ }
+ // 灏嗗彉閲忕粦瀹氬埌鍛藉悕绌洪棿涓�
+ gl.BMap.setDots = setDots;
+
+ // 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓�
+ gl.BMap.queryInRect = queryInRect;
+ })(jQuery, window, document, GLOBAL);
+
+ searchStation(true);
var allStation;
//鏌ヨ鏈烘埧
- function searchStation(){
+ function searchStation(setRect){
var temp = createSearchParam();
var json = JSON.stringify(temp);
commonDot = new Array();
@@ -1983,18 +2049,16 @@
type: "post",
//url: "BattMap_informationAction!searchAll",
url: "BattMap_informationAction!searchUserManageStation",
- async:true,
+ async: true,
dataType:'text',
data:"json="+json,
success: function(data){
data = eval('('+data+')');
var list = eval('('+data.result+')');
- //console.info(list);
+ console.log(list.length);
allStation = new Array();
if(list!=undefined && list.length>0){
for(var i=0;i<list.length;i++){
- //console.info("绗�"+i+"娆�:"+model.data[i].binformation.num);
- //setAllStation(model.data[i],allStation);
var tmp = {
binformation:list[i].data,
alarm_num:list[i].code, //鍛婅鏁扮洰
@@ -2004,32 +2068,18 @@
};
allStation.push(analyzeData(tmp));
}
- //console.info(allStation);
- createMapDot(map, allStation);
-
- //setTimeout(searchStation, 4000);
- }
- /* for(var i=0;i<allStation.length;i++){
- if(allStation[i].low_num>0){ //钀藉悗鏁扮洰
- behindCellList.push(analyzeData(allStation[i]));
- //console.info(analyzeData(allStation[i]));
- }else if(allStation[i].alarm_num>0){ //鍛婅鏁扮洰
- warnDotList.push(analyzeData(allStation[i]));
- }else if(allStation[i].delay_num > 0){ //寤舵椂鏁扮洰
- dischargeDotList.push(analyzeData(allStation[i]));
- }else{
- commonDot.push(analyzeData(allStation[i]));
+ // 鏄剧ず鍖哄煙鐨勫浘鏍�
+ GLOBAL.BMap.setDots(allStation);
+ GLOBAL.BMap.queryInRect(map,createMapDot);
+ // 鏄惁璁剧疆鎷栧埌鍜岀缉鏀�
+ if(setRect) {
+ map.addEventListener("moveend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot)); // 鎷栧姩
+ map.addEventListener("zoomend", GLOBAL.BMap.queryInRect.bind({},map, createMapDot)); // 缂╂斁
}
+
+ //createMapDot(map, allStation);
+
}
-
- // 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
- map.clearOverlays();
- mkList = [];
-
- addCommonDotHome(commonDot);
- createWarnDot(map, warnDotList);
- dischargeTimeOut(map, dischargeDotList);
- behindDotCell(map, behindCellList); */
}
});
}
@@ -3065,74 +3115,5 @@
img.attr('src', navImg);
}
}
- // siderbar妯″潡
- $(function() {
- var TreeView = GLOBAL.pages.TreeView;
- var first = GLOBAL.pages.siderbar.first; // 涓�绾у鑸�
- var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
- var thirdFile = GLOBAL.pages.siderbar.thirdFile; // 涓夌骇瀵艰埅
- var treeView = new TreeView($('.side-bar .lside'));
- // 璁剧疆瀹瑰櫒鍙嫋鍔�
- $('.side-bar').resizable({
- handles: 'e',
- maxWidth: 520,
- minWidth: 200,
- alsoResize: $('.side-bar .lside'),
- resize:function() {
- treeView.setContainer();
- }
- });
-
- // 鐢熸垚涓�绾у鑸�-鐪�
- first(treeView, treeView.container);
-
- // 鐪�->甯�
- treeView.ele.on('click', '.province', function() {
- var province = $(this).data('attr');
- second(treeView, $(this).parent(), province);
- });
-
- // 甯�->鏈烘埧
- treeView.ele.on('click', '.city', function() {
- var city = $(this).data('attr');
- thirdFile(treeView, $(this).parent(), city);
- });
-
- // 鐐瑰嚮鏈烘埧瀹氫綅
- treeView.ele.on('click', '.home', function() {
- var home = $(this).data('attr');
- var dev_id = home.FBSDeviceId;
-
- searchStationById(home.StationId);
- // 鏍规嵁璁惧id璁剧疆涓嶅悓鐨勫浘鏍�
- if(eType.regType(dev_id, eType.type.equip61850)) {
- changeMapImgDesc($('#mapImgDesc'), '61850');
- }else {
- changeMapImgDesc($('#mapImgDesc'));
- }
- });
-
- $('#map').on('dblclick', function() {
- setLside();
- treeView.setContainer();
- });
-
- // 璁剧疆lside鐨勯珮搴�
- setLside();
- treeView.setContainer();
- setLside();
- $(window).resize(function() {
- setLside();
- });
-
- // 璁剧疆lside鐨勯珮搴﹀嚱鏁�
- function setLside() {
- var sideBar = $('.side-bar');
- var lside = $('.side-bar .lside');
- // 璁剧疆瀹介珮
- lside.width(sideBar.width());
- lside.height(sideBar.height());
- }
- });
</script>
</html>
--
Gitblit v1.9.1