From 05c2df61e5d0b9d621617b84a906605fe2c77497 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 26 九月 2018 11:13:32 +0800
Subject: [PATCH] 提交内容
---
gx_tieta/WebRoot/index.jsp | 105 ++--------------------------------------------------
gx_tieta/src/com/fgkj/services/BattMap_informationService.java | 4 +-
2 files changed, 7 insertions(+), 102 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index b0aee9e..53f5b4b 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">
@@ -1597,14 +1594,12 @@
function createMapDot(map, dotList) {
// 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
mkList = [];
-
// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
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 +1624,8 @@
map.addOverlay(mk);
}
}
+
+ //
// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
function deletePoint(map, msg){
@@ -1989,12 +1986,10 @@
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, //鍛婅鏁扮洰
@@ -2009,27 +2004,6 @@
//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]));
- }
- }
-
- // 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
- map.clearOverlays();
- mkList = [];
-
- addCommonDotHome(commonDot);
- createWarnDot(map, warnDotList);
- dischargeTimeOut(map, dischargeDotList);
- behindDotCell(map, behindCellList); */
}
});
}
@@ -3065,74 +3039,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>
diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index db0b9b4..69680d3 100644
--- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
+++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -100,7 +100,7 @@
state="item-normal";
ServiceModel model=new ServiceModel();
BattMap_information binformation = list.get(i);
- if(binformation.getFBSDeviceId()/100000==6185){
+ /*if(binformation.getFBSDeviceId()/100000==6185){
BattInf binf=new BattInf();
binf.setFBSDeviceId(binformation.getFBSDeviceId());
state=(new Fbs9100_stateImpl().seachDevNow(binf));
@@ -119,7 +119,7 @@
}
}
}
- }
+ }*/
model.setData(list.get(i));
model.setCode(numAlarm); //鍛婅鎬绘暟
model.setSum(numBadBatt); //钀藉悗鎬绘暟
--
Gitblit v1.9.1