From a942cb0a9090867a3bf0afc69eb63df0d4b9d762 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 06 十二月 2018 10:25:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/index.jsp | 1231 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 938 insertions(+), 293 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 2064a1b..b53cd71 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -24,10 +24,12 @@
     
     <title><s:text name="HomePage"></s:text></title>
 	<meta name="renderer" content="webkit">
+	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 	<!-- 瀵煎叆鐧惧害鍦板浘API -->
+	<link rel="stylesheet" href="http://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.css" />
 	<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=QAerSFEiGDCx1oHPB7Z5XYcBHI6R3qwx"></script>
 	<script type="text/javascript" src="http://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.js"></script>
-	<link rel="stylesheet" href="http://api.map.baidu.com/library/SearchInfoWindow/1.5/src/SearchInfoWindow_min.css" />
+	<script type="text/javascript" src="js/AreaRestriction_min.js"></script>
 	<link href="css/basic.css" type="text/css" rel="stylesheet" />
 	<link href="css/common.css" type="text/css" rel="stylesheet" />
 	<link href="css/index_layout.css" type="text/css" rel="stylesheet" />
@@ -37,7 +39,7 @@
 	<link rel="stylesheet" href="src/css/layui.css">
 	<link rel="stylesheet" href="pages/css/mylayui.css">
 	<style type="text/css">
-		#map .explain-header:hover {
+		.explain-header:hover {
 			cursor: pointer;
 			background-color: #84ABFA !important;
 			color: #D6D1D1
@@ -83,12 +85,17 @@
 			overflow-y: auto; 
 			overflow-x: hidden;
     	}
+    	.BMapLib_bubble_content a {
+    		color: #2A3AF0;
+    	}
+    	.BMapLib_bubble_content a:hover {
+    		text-decoration: underline;
+    	}
     	body .layui-layer-dialog {
     		min-width:400px;
     	}
 	</style>
 	<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
-	
 	<script type="text/javascript" src="js/echarts.js"></script>
 	<script type="text/javascript" src="js/createTab.js"></script>
 	
@@ -102,21 +109,79 @@
 		<jsp:include page="nav.jsp" flush="true"/>
 		<!--瀵艰埅缁撴潫-->
 		<div id="content">
-			<!-- <div id="mapStatusOpts" class="map-status-container">
-				<div class="layui-form layui-form-pane">
-					<label class="layui-form-label">鏈烘埧绫诲瀷</label>
-					<div class="layui-input-inline">
-						<select name="warnType" id="warnType">
-							 <option value="0">鍏ㄩ儴</option>
-							 <option value="1">钀藉悗</option>
-							 <option value="2">鍛婅</option>
-							 <option value="3">寤舵椂</option>
-							 <option value="4">姝ｅ父</option>
-						</select>
+			
+			<div class="nav-map small">
+				<!-- 鍦板浘鍐呭绛涢��  -->
+				<div class="map-info-panel-left w300">
+					<div class="map-info-panel-content">
+						<div class="map-info" id="showMapInfoDetail">
+							<span>鍦板浘宸ュ叿</span>
+							<span class="map-info-btn-icon" title="璇︽儏"><i class="fa fa-angle-double-down"></i></span>
+						</div>
+						<div class="map-info-detail">
+							<div class="layui-collapse" lay-filter="test" lay-accordion="">
+								<div class="layui-colla-item">
+									<h2 class="layui-colla-title">鎼滅储鏈烘埧</h2>
+									<div class="layui-colla-content layui-show">
+										<table>
+											<tbody>
+												<tr>
+													<td class="alg-c f-bold"><span class="mrl8">鏈烘埧绫诲瀷:</span></td>
+													<td colspan="2" id="homeType">
+														<span class="mrl8 mrr8"><input type="checkbox" value="2"  checked="checked">2V</span>
+														<span><input type="checkbox" checked="checked" value="12">12V</span>
+													</td>
+												</tr>
+												<tr>
+													<td class="w5em alg-c f-bold"><span class="mrl8">鏈烘埧鍚嶇О:</span></td>
+					                				<td><input type="text" id="mapToolSearch"></td>
+													<td class="w54 btn-container">
+														<button type="button" value="鎼滅储" id="mapToolSearchBtn" class="mrr8"><i class="fa fa-search page-link"></i></button>
+													</td>
+												</tr>
+												<tr>
+					                				<td colspan="3" class="btn-container">
+					                					<span class="mrl8">宸插畨瑁呰澶囨暟/璁惧鎬绘暟锛�<span id="installnum">12/600</span><i id="installnumbtn" class="fa fa-refresh mrl8 page-link" title="鍒锋柊"></i></span>
+					                				</td>
+					                			</tr>
+											</tbody>
+										</table>
+									</div>
+								</div>
+								<div class="layui-colla-item" id="permitAddHome">
+									<h2 class="layui-colla-title">娣诲姞鏈烘埧</h2>
+									<div class="layui-colla-content">
+					                	<table id="mapToolAddHome">
+					                		<tbody>
+					                			<tr>
+					                				<td class="w4em alg-c f-bold">缁忓害:</td>
+					                				<td><input type="text" class="lng"></td>
+					                			</tr>
+					                			<tr>
+					                				<td class="w4em alg-c f-bold">绾害:</td>
+					                				<td><input type="text" class="lat"></td>
+					                			</tr>
+					                			<tr>
+					                				<td class="w4em alg-c f-bold">绫诲瀷:</td>
+					                				<td>
+					                					<input type="radio" class="pointStyle" name="pointStyle" value="0" checked><span class="mrr8">GPS</span>
+					                					<input type="radio" class="pointStyle" name="pointStyle" value="1"><span class="mrr8">鐧惧害</span>
+					                					<input type="radio" class="pointStyle" name="pointStyle" value="2"><span class="mrr8">鑵捐/楂樺痉</span>
+					                				</td>
+					                			</tr>
+					                			<tr>
+					                				<td colspan="2" class="alg-r btn-container">
+					                					<button type="button" value="娣诲姞" id="mapToolAddHomeBtn" class="mrr8">娣诲姞</button>
+					                				</td>
+					                			</tr>
+					                		</tbody>
+					                	</table>
+					                </div>
+								</div>
+							</div>
+						</div>
 					</div>
 				</div>
-			</div> -->
-			<div class="nav-map small">
 				<!-- 鐢垫睜鍒嗗竷鍥� -->
 				<div class="china-map" id="map">
 					<div class="img-change" style="display:none;">
@@ -161,16 +226,21 @@
 						<i class="fa fa-cog"></i>
 					</a>
 				</div>
-				<!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
-				<div class="brdn-pie module"></div>
-				<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
-				<div class="warn-pie module"></div>
-				<!--鐢垫睜鏁呴殰淇鍥�-->
-				<div class="repair-pie module"></div>
-				<!--鐢垫睜鍋ュ悍楗肩姸鍥�-->
-				<div class="health-pie module"></div>
-				<!--娓呴櫎娴姩-->
-				<div class="clear"></div>
+				<div class="pie-item-con">
+					<!-- 鏈烘埧鍋滅數 -->
+					<div class="repair-pie module"></div>
+					<!-- 鐢垫睜鐘舵�侀ゼ鐘跺浘 -->
+					<div class="brdn-pie module"></div>
+					<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
+					<div class="warn-pie module"></div>
+					<!--鐢垫睜瀹归噺楗肩姸鍥�-->
+					<div class="health-pie module"></div>
+					<!-- 鏈烘埧缁埅鑳藉姏楗肩姸鍥� -->
+					<div class="endur-pie module"></div>
+					<!--娓呴櫎娴姩-->
+					<div class="clear"></div>
+				</div>
+				
 			</div>
 			<c:forEach var="cust" items="${sessionScope.custompages}">
 			<c:if test="${cust.submenu eq 'My_work' && cust.subflag eq 1}">
@@ -332,12 +402,14 @@
 		</div>
 	</div>
 	<input type="hidden" id="user_logo" value="<%=user_logo  %>">
+	<div id="homeInfoIframeData"></div>
 	<!--娓呴櫎娴姩-->
 	<div class="clear"></div>
 	<script type="text/javascript" src="pages/js/base.js"></script>
 	<script type="text/javascript" src="pages/js/common.js"></script>
 	<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
 	<script type="text/javascript" src="pages/js/pages/index-common.js"></script>
+	<script type="text/javascript" src="pages/js/GPS.js"></script>
 	<script type="text/javascript" src="js/panel.js"></script>
 	<script type="text/javascript" src="js/search.js"></script>
 	<script type="text/javascript" src="js/changePinYin.js"></script>
@@ -345,6 +417,8 @@
 	<script type="text/javascript" src="js/myConfirm.js"></script>
 	<script type="text/javascript" src="js/loading.js"></script>
 	<script type="text/javascript" src="src/layui.js"></script>
+	<script type="text/javascript" src="src/layui.all.js"></script>
+	<script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
 	<script type="text/javascript">
 	var permits;
 	<%	Object obj=session.getAttribute("permits");
@@ -364,6 +438,7 @@
 	var search;
 	var warnOpts;
 	//console.info(BMap);
+	var mapDefults = new Image().src = 'image/mapDefault.gif';
 	var mapImages = getMapImageUrl();
 	// 瀹氫箟鐪�-甯傝祫婧愬唴瀹�
 	var area = [
@@ -390,6 +465,15 @@
 		
 	];
 	
+	
+	// 璁剧疆椤甸潰涓璸ie鐨勬ā鍧�
+	;(function() {
+		var pieStatus = GLOBAL.Index.Pie.pieStatus;		// 鏌ヨ楗肩姸鍥炬樉绀虹殑鐘舵��
+		var pieItemCon = $('.pie-con .pie-item-con');
+		pieItemCon.text('');
+		var pieItems = pieStatus();
+		pieItemCon.html(pieItems);
+	})();
 	
 	
 	var locationcity;
@@ -504,12 +588,17 @@
 	});
 	
 	$(function() {	// 鏄剧ず鍜岄殣钘忓浘鏍囪鏄�
-		$('#map').on('click', '.explain-header', function() {
-			$('#map .explain-list').fadeToggle();
+		$('.nav-map').on('click', '.explain-header', function() {
+			$('.explain-list').fadeToggle();
 		});
 		
 		$('#map').on('dblclick', '.explain-header', function() {
 			return false;
+		});
+		
+		$('.nav-map').on('click', '.explain-list input', function() {
+			setMapImgStyles();
+			updateStation(true);
 		});
 	});
 	
@@ -591,9 +680,10 @@
 				centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
 				map.enableScrollWheelZoom();
 				map.disableDoubleClickZoom();
-				map.setMapStyle({style: 'grayscale'});	//  璁剧疆鍦板浘鐨勯鏍�
+				//map.setMapStyle({style: 'grayscale'});	//  璁剧疆鍦板浘鐨勯鏍�
 				// 娣诲姞鍦板浘绫诲瀷鎺т欢
 				map.addControl(new BMap.MapTypeControl());
+				add_control();
 				// 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
 				var bottom_left_control = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
 				map.addControl(bottom_left_control);	// 娣诲姞姣斾緥灏哄埌鍦板浘
@@ -632,6 +722,17 @@
 				var menu = new BMap.ContextMenu();
 				var txtMenuItem = [
 					{
+						text: '璁剧疆涓績鐐�',
+						callback: function(e) {
+							myConfirm.show({
+								title: '璁剧疆鍦板浘榛樿鏄剧ず浣嶇疆',
+								content: '鏄惁纭淇敼鍦板浘榛樿涓績鍧愭爣',
+								enfun:updateMapCenterPoint,
+								enparams:[e]
+							});
+						}
+					},
+					{
 						text: '鎼滅储鍦板潃',
 						callback: function(e) {
 							search.showSearch();
@@ -646,21 +747,17 @@
 						}
 					},
 					{
-						text: '鎭㈠姝ｅ父',
+						text: '閫�鍑哄叏灞忔樉绀�',
 						callback: function(e) {
 							// console.info(e);
 							smallMap();
 						}
 					},
+					
 					{
-						text: '璁剧疆涓績鐐�',
-						callback: function(e) {
-							myConfirm.show({
-								title: '璁剧疆鍦板浘榛樿鏄剧ず浣嶇疆',
-								content: '鏄惁纭淇敼鍦板浘榛樿涓績鍧愭爣',
-								enfun:updateMapCenterPoint,
-								enparams:[e]
-							});
+						text: '杩斿洖涓績鐐�',
+						callback: function(e){
+							centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
 						}
 					}
 				];
@@ -709,36 +806,23 @@
 	}
 	
 	$(function() {
-		flushFourPie();
-		
-		if($('#content .brdn-pie').length>0){
-			//鐢熸垚鐢垫睜鐘舵�侀ゼ鐘跺浘
-			var $brdn=$('#content .pie-con .brdn-pie');		//鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
-			var brdn=$brdn.get(0);							//灏嗗鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
-			brdnPie=echarts.init(brdn);						//鍒濆鍖栬〃鏍煎鍣�
-			brdnPie.showLoading();
-		}
-		
-		if($('#content .repair-pie').length>0){
-			var $repair=$('#content .pie-con .repair-pie');	//鑾峰彇鏈烘埧鍋滅數鍥惧鍣ㄧ殑jquery瀵硅薄
-			var repair=$repair.get(0);	//灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
-			repairPie=echarts.init(repair);	//鍒濆鍖栬〃鏍煎鍣�
-			repairPie.showLoading();
-		}
+		flushFourPie(true);
 	});
 	
 	//鏇存柊鍥涚楗肩姸鍥�
-	function flushFourPie(){
+	function flushFourPie(create){
 		var cityname = $('#panelCity').val();
 		locationcity = getCityByName(cityname);
+		if(create) {
+			initPieObj();
+		}
+		
+		
 		searchalarm_data();			//鏌ヨ鍛婅鐜�
 		searchGood();				//鏌ヨ鍋ュ悍鐜�
 		searchmaintByMap();			//鏌ヨ鐢垫睜鐘舵��
-		
 		searchBatt_maint_inf();		//鏌ヨ鏈烘埧鍋滅數姣斾緥
-		
-		
-		
+		searchEndurHome();			//鏌ヨ缁埅楗肩姸鍥�
 	}
 	
 	//鏌ヨ鏈�杩戠殑鏁呴殰缁存姢璁板綍
@@ -845,20 +929,22 @@
 		});
 		
 	}
-	
+	var warnPie;
 	//鏌ヨ鍛婅淇℃伅骞舵樉绀哄憡璀︾巼
 	function searchalarm_data(){
 		if($('#content .warn-pie').length==0){
 			return;
 		}
-		
 		//鐢熸垚鐢垫睜鍛婅鐜囬ゼ鐘跺浘
 		var $warn=$('#content .pie-con .warn-pie');	//鑾峰彇鍛婅瀹瑰櫒鐨刯query瀵硅薄
 		if($warn.length!=0){
-			var warn=$warn.get(0);	//灏嗗憡璀﹀鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
-			var warnPie=echarts.init(warn);	//鍒濆鍖栧浘琛ㄥ鍣�
-			window.warnPie = warnPie;
-			warnPie.showLoading();
+			var isEcharts = isObject(warnPie)?true:false;
+			if(!isEcharts) {
+				var warn=$warn.get(0);	//灏嗗憡璀﹀鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+				warnPie=echarts.init(warn);	//鍒濆鍖栧浘琛ㄥ鍣�
+				warnPie.showLoading();
+			}
+			
 			
 			var cityname='';
 			//console.info("="+locationcity.pinyin+"=");
@@ -885,6 +971,8 @@
 	         				Almarr.push(/*{
 	         				name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId)			// 瀹归噺鍛婅鍛婅 									
 		         			} ,*/{
+		         				name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id),				// 鍦ㄧ嚎鐢靛帇 
+		         			},{
 		         				name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum),					// 缁勭鐢靛帇 
 		         			},{
 		         				name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id),					// 鍏呯數鐢垫祦 
@@ -928,38 +1016,63 @@
 	         		}
 					//鍒涘缓鐢垫睜鍛婅楗肩姸鍥�
 					var warnTle="<s:text name='Battery_alarm_rate'/>";		/* 鐢垫睜鍛婅鐜� */
-					createPie(warnPie,warnTle,Almarr);
+					if(!isEcharts) {
+						createPie(warnPie,warnTle,Almarr);
+						warnPie.on('click', function(param) {
+							// 0:鍦ㄧ嚎鐢靛帇   1:缁勭鐢靛帇   2:鍏呯數鐢垫祦   3:鏀剧數鐢垫祦  4:鍗曚綋鐢靛帇  5:瀹归噺鍛婅 
+							if(param.dataIndex == 5) {
+								
+							}else {
+								window.open('elewarn.jsp?warntype='+param.dataIndex+'&warntxt='+param.name);
+							}
+							
+						});
+					}else {
+						var opts = getOpt(warnTle, Almarr);
+						warnPie.setOption(opts);
+					}
+					
+					setTimeout(searchalarm_data, 10000)
+					
 	         	}
 	         });
 		}		
 	}
 	
-	var battstate_isExist = true;
 	var brdnPie;
 	//鏌ヨ鍚勪釜鏈烘埧鐨勭數姹犵姸鎬�
 	function searchmaintByMap(){
 		if($('#content .brdn-pie').length==0){
 			return;
 		}
+		
+		// 鍒ゆ柇鏄惁涓篍charts瀵硅薄
+		var isEcharts = isObject(brdnPie)?true:false;
+		
+		if(!isEcharts) {
+			//鐢熸垚鐢垫睜鐘舵�侀ゼ鐘跺浘
+			var $brdn=$('#content .pie-con .brdn-pie');		//鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
+			var brdn=$brdn.get(0);							//灏嗗鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+			brdnPie=echarts.init(brdn);						//鍒濆鍖栬〃鏍煎鍣�
+		}
+		
+		
 		var brdnTle="<s:text name='Batte_state'/>";						/* 鐢垫睜鐘舵�� */
 		$.post("Batt_rtstateAction!serchBattStateRate",null,function(data){
 			var model=eval("("+data.result+")");
 			//console.info(model);
 			var maintarr = new Array();
 			setBatt_list(maintarr,model.data);
-			if(battstate_isExist){
+			if(!isEcharts){
 				//鍒涘缓鐢垫睜鏁呴殰鐜囩姸鍥�
 				createPie(brdnPie,brdnTle,maintarr);
-				battstate_isExist = false;
 				brdnPie.on('click', function(param) {
-					console.info(param);
 					window.open('elestatus.jsp?battstate='+param.dataIndex);
 				});
 			}else{
 				brdnPie.setOption(getOpt(brdnTle, maintarr));
-				//console.info("鏇存柊鎴愬姛");
 			}	         		
-			setTimeout("searchmaintByMap()",10000);					
+			setTimeout(searchmaintByMap, 10000);					
 		});
 	}
 	
@@ -999,16 +1112,25 @@
 		{state:4,value:"<s:text name='Average_charge'/>",color:'#800080'},					//鍧囧厖
 	];
 	
-	var repairPie;
-	var powercut_isNew = true;  
+	var repairPie;  
 	//鏌ヨ鏈烘埧鍋滅數鐘舵��
 	function searchBatt_maint_inf(){
 		if($('#content .repair-pie').length==0){
 			return;
 		}
+		// 鍒ゆ柇鏄惁涓篍charts瀵硅薄
+		var isEcharts = isObject(repairPie)?true:false;
+		if(!isEcharts) {
+			var $repair=$('#content .pie-con .repair-pie');	//鑾峰彇鏈烘埧鍋滅數鍥惧鍣ㄧ殑jquery瀵硅薄
+			var repair=$repair.get(0);	//灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+			repairPie=echarts.init(repair);	//鍒濆鍖栬〃鏍煎鍣�
+		}
+		
+		// 璇锋眰鍚庡彴
 		$.ajax({ 	
        		type: "post", 				
-	        url: "BattPower_offAction!serchPowerOff",				
+	        //url: "BattPower_offAction!serchPowerOff",		
+	        url: "Bts_station_stateAction_action_serchPowerOff",	
 	        async:true,				
 	        dataType:'text',
 	        data:null,		
@@ -1019,25 +1141,25 @@
 	        	//console.info(model);
 	        	if((model.sum>=0) && (model.newsum>=0) && (model.newsum>=model.sum)){
 	        		repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:model.sum,color:'#FF0000'},							/*宸插仠鐢垫満鎴�*/
-								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'}];			/* 鏈仠鐢垫満鎴� */
+								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.newsum-model.sum,color:'#31CB36'},	/* 鏈仠鐢垫満鎴� */
+								{name:"鏈烘埧鎺夌珯", val: model.code}];			
 	        	}else{
 	        		repairObj=[{name:"<s:text name='Computer_room'/><s:text name='Power_cut'/>",val:0,color:'#FF0000'},									/* 宸插仠鐢垫満鎴� */
-								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'}];						/* '鏈慨澶�' */
+								{name:"<s:text name='Computer_room'/><s:text name='Not'/><s:text name='Power_cut'/>",val:model.sum,color:'#31CB36'},
+								{name:"鏈烘埧鎺夌珯", val: model.code}];						/* '鏈慨澶�' */
 	        	}
 	        	var repairTle="<s:text name='Computer_room'/><s:text name='Power_cut'/>";		/* '鏈烘埧鍋滅數' */
-	        	if(powercut_isNew){
-		        	//鍒涘缓鏈烘埧鍋滅數楗肩姸鍥�
-		        	powercut_isNew = false;
+	        	if(!isEcharts){
 		        	createPie(repairPie,repairTle,repairObj);
 		        	repairPie.on('click', function() {
-						window.open('powercut.jsp?power_state=0');
+						window.open('batt-state-manage.jsp');
 					});
 	        	}else{
 	        		var opt = getOpt(repairTle, repairObj);
 	        		repairPie.setOption(opt);
 	        	}	        	
-        		//console.info(repairPie);
-	        	setTimeout("searchBatt_maint_inf()", 10000);
+        		
+	        	setTimeout(searchBatt_maint_inf, 10000);
         	},		        	
         	error:function(){
         		//setTimeout("searchBatt_maint_inf()", 10000);
@@ -1046,6 +1168,7 @@
 	}
 	
 	//鏌ヨ鍋ュ悍鐜�
+	var healthPie;
 	function searchGood(){
 		if($('#content .health-pie').length==0){		
 			return;
@@ -1053,16 +1176,18 @@
 		//鐢熸垚鐢垫睜鍋ュ悍鐜�
 		var $health=$('#content .pie-con .health-pie');	//鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
 		if($health.length!=0){
-			var health=$health.get(0);	//灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
-			var healthPie=echarts.init(health);	//鍒濆鍖栬〃鏍煎鍣�
-			window.healthPie = healthPie;
+			// 鏄惁echarts瀵硅薄
+			var isEcharts = isObject(healthPie)?true:false;
+			if(!isEcharts) {
+				var health=$health.get(0);	//灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+				healthPie=echarts.init(health);	//鍒濆鍖栬〃鏍煎鍣�
+				healthPie.showLoading();	
+			}
+			
 			var healthTle="<s:text name='Monomer_cap_health_rate'/>";			/* '鐢垫睜鍋ュ悍鐜�' */
-			healthPie.showLoading();
 			$.post("Battalarm_dataAction!serchGood",null,function(data){
 				var model=eval("("+data.result+")");
-				//console.info(model);
 				var healthObj;
-				//console.info(model);	
 				if(model.code==1){
 					healthObj=[
 							{name:"鍗曚綋瀹归噺鍋ュ悍",val:model.sum-model.data[0]-model.data[1],color:'#31CB36'},		/* '鍋ュ悍鐢垫睜' */
@@ -1076,11 +1201,128 @@
 							{name:"鍗曚綋瀹归噺鏇存崲",val:0,color:'#FF0000'}
 						];
 				}
-				//鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
-				createPie(healthPie,healthTle,healthObj);
+				if(!isEcharts) {
+					//鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
+					createPie(healthPie,healthTle,healthObj);
+					
+					// 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
+					healthPie.on('click', function(param) {
+						window.open('taskplan.jsp');	// 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
+					});
+				}else {
+					var opt = getOpt(healthTle, healthObj);
+					healthPie.setOption(opt);
+				}
+				
+				setTimeout(searchGood, 10000);
 			});			
 		}		
 	}
+	
+	// 鏌ヨ缁埅涓嶈冻鐨勬満鎴挎暟
+	var endurPie;
+	function searchEndurHome() {
+		if($('#content .endur-pie').length==0){
+			return;
+		}
+		
+		//鐢熸垚鐢垫睜鍛婅鐜囬ゼ鐘跺浘
+		var $endur=$('#content .pie-con .endur-pie');	//鑾峰彇鍛婅瀹瑰櫒鐨刯query瀵硅薄
+		if($endur.length!=0){
+			var isEcharts = endurPie?true:false;
+			if(!isEcharts) {
+				var endur=$endur.get(0);	//灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
+				endurPie=echarts.init(endur);	//鍒濆鍖栬〃鏍煎鍣�
+			}
+			
+			var endurTle="鏈烘埧缁埅鑳藉姏";			/* 鏈烘埧缁埅鑳藉姏 */
+			// 鏌ヨ鍚庡彴鍐呭
+			$.ajax({
+				type: 'post'
+				,async: true
+				,url: 'Batt_enduranceAction!serchByState_xuhang'
+				,data: null
+				,dataType: 'json'
+				,success: function(res) {
+					var rs = JSON.parse(res.result);
+					if(rs.code == 1) {
+						var data = rs.data;
+						var endurObj =[
+							{name:"缁埅涓嶈冻1灏忔椂",val:data[0],color:'#FF0000'}
+							,{name:"缁埅1~2灏忔椂",val:data[1],color:'#D1D105'}
+							,{name:"缁埅2~3灏忔椂",val:data[2],color:'#31CB36'}
+							,{name:"缁埅3灏忔椂浠ヤ笂",val:data[3],color:'#619FA7'}
+						];
+						
+						if(!isEcharts) {
+							//鍒涘缓鐢垫睜鏁呴殰楗肩姸鍥�
+							createPie(endurPie,endurTle,endurObj);
+							
+							// 鐐瑰嚮楗肩姸鍥捐繘琛岃烦杞�
+							endurPie.on('click', function(param) {
+								var str = '';
+								switch(param.dataIndex) {
+									case 0: 
+										str = 'timelong=60';
+									break;
+									case 1:
+										str = 'timelong=120';
+									break;
+									case 2:
+										str = 'timelong=180';
+									break;
+									case 3:
+										str = 'is_stand=0';
+									break;
+								}
+								
+								window.open('batt-life-manage.jsp?'+str);	// 璺宠浆鍒拌惤鍚庡崟浣撴煡璇�
+							});
+							
+						}else {
+							var opts = getOpt(endurTle, endurObj);
+							endurPie.setOption(opts);
+						}
+					}
+					
+					setTimeout(searchEndurHome, 10000);
+				}
+			});
+			
+		}
+	}
+	
+	// 鍒濆鍖栭ゼ鐘跺浘瀹瑰櫒瀵硅薄
+	function initPieObj() {
+		warnPie = false;
+		brdnPie = false;
+		repairPie = false;
+		healthPie = false;
+		endurPie = false;
+	}
+	
+	//璁╁湴鍥惧拰楗肩姸鍥鹃殢娴忚鍣ㄧ獥鍙ｇ殑鏀瑰彉鑰屾敼鍙�
+	$(window).resize(function(){
+		getMapHt();
+		if(isObject(warnPie))
+		{
+			warnPie.resize();
+		}
+		if(isObject(brdnPie))
+		{
+			brdnPie.resize();
+		}
+		if(isObject(repairPie))
+		{
+			repairPie.resize();
+		}
+		if(isObject(healthPie)) {
+			healthPie.resize();
+		}
+		if(isObject(endurPie)) {
+			endurPie.resize();
+		}
+	});
 	
 	//鏌ヨ鎵�鏈夌殑鍏憡淇℃伅
 	function searchAnnounceall(){
@@ -1109,15 +1351,12 @@
 	//鏌ヨ鏀剧數娴嬭瘯鐨勬瘮渚�
 	function searchTestsCale(){
 		if($('#content .discharge-test').length==0){
-			//alert();	
 			return;
 		}	
 		//鐢熸垚鐢垫睜鏈斁鐢垫瘮渚嬪浘
 		var $health=$('#content .discharge-test .test-pie');	//鑾峰彇鏁呴殰瀹瑰櫒鐨刯query瀵硅薄
 		if($health.length!=0){
 			var health=$health.get(0);	//灏嗘晠闅滃鍣ㄧ殑jquery瀵硅薄杞寲涓篸om瀵硅薄
-			//console.info(health);					
-			//healthPie.showLoading();
 			var healthTle="<s:text name='Battery_discharge_scale_map'/>";			/* '鐢垫睜鏀剧數姣斾緥鍥�' */
 			Batttest_Td=new Array();
 			$.post("Batttestdata_infAction!searchTestsCale",$('#batttest_form').serialize(),function(data){
@@ -1364,9 +1603,7 @@
 		});
 	});
 	
-	$(window).resize(function() {
-		getMapHt();
-	});
+	
 	// 鏀瑰彉div鐨勫ぇ灏�
 	function changeDivBig(ele) {
 		// 闅愯棌闈㈡澘
@@ -1468,9 +1705,14 @@
 		
 		changeMapImgDesc(iconExplain, 'normal');
 		
-		mapEle.prepend(iconExplain);
+		mapEle.parent().append(iconExplain);
+		
+		// 缁熻鏈烘埧鐘舵�佷釜鏁�
+		updateMapIconBadge();
+		
+		// 璁剧疆鍦板浘鍥炬爣绉嶇被
+		setMapImgStyles();
 	}
-	
 	// 鍒囨崲鍦板浘鍥炬爣璇存槑
 	function changeMapImgDesc(iconExplain, type) {
 		iconExplain.find('.explain-list').remove();
@@ -1486,39 +1728,136 @@
 	
 	// 鏅�氭満鎴挎弿杩�
 	function mapImgDescNormal(iconExplain) {
-		// 鏈烘埧钀藉悗
+		// 鎺夌珯鏈烘埧
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
-		var icon = $('<img src="'+mapImages.behind+'" style="float:left">');
-		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鐢垫睜缁勮惤鍚庢満鎴�</span>');
-		iconList.append(icon);
+		var input = $('<input type="checkbox" data-img="item-timeout" checked="checked">');
+		var icon = $('<img src="'+mapImages.timeout+'">');
+		var span = $('<span>鎺夌珯鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-down">0</a>');
+		iconList.append(input);
 		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
 		iconExplain.append(iconList);
 		
-		// 鏈烘埧鍛婅
+		// 鍋滅數鏈烘埧
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
-		var icon = $('<img src="'+mapImages.warn+'" style="float:left;">');
-		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鐢垫睜缁勫憡璀︽満鎴�</span>');
-		iconList.append(icon);
+		var input = $('<input type="checkbox" data-img="item-poff" checked="checked">');
+		var icon = $('<img src="'+mapImages.powercut+'">');
+		var span = $('<span>鍋滅數鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-powercut">0</a>');
+		iconList.append(input);
 		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
+		iconExplain.append(iconList);
+		
+		// 缁埅涓嶈冻
+		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+		var input = $('<input type="checkbox" data-img="item-xuhang" checked="checked">');
+		var icon = $('<img src="'+mapImages.xuhang+'">');
+		var span = $('<span>缁埅涓嶈冻鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-xuhang">0</a>');
+		iconList.append(input);
+		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
+		iconExplain.append(iconList);
+		
+		// 钀藉悗鏈烘埧
+		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+		var input = $('<input type="checkbox" data-img="item-behind" checked="checked">');
+		var span = $('<span>鐢垫睜钀藉悗鏈烘埧</span>');
+		var icon = $('<img src="'+mapImages.behind+'">');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-behind">0</a>');
+		iconList.append(input);
+		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
+		iconExplain.append(iconList);
+		
+		// 鍛婅鏈烘埧
+		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+		var input = $('<input type="checkbox" data-img="item-warn" checked="checked">');
+		var span = $('<span>鐢垫睜鍛婅鏈烘埧</span>');
+		var icon = $('<img src="'+mapImages.warn+'">');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-warn">0</a>');
+		iconList.append(input);
+		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
 		iconList.append('<div class="clear"></div>');
 		iconExplain.append(iconList);
 		
+		
+		
 		// 鏈烘埧寤舵椂
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
-		var icon = $('<img src="'+mapImages.timeout+'" style="float:left">');
-		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鐢垫睜缁勬斁鐢靛欢鏃舵満鎴�</span>');
-		iconList.append(icon);
+		var input = $('<input type="checkbox" data-img="item-timeout" checked="checked">');
+		var icon = $('<img src="'+mapImages.timeout+'">');
+		var span = $('<span>鐢垫睜缁勬斁鐢靛欢鏃舵満鎴�</span>');
+		iconList.append(input);
 		iconList.append(span);
-		iconExplain.append(iconList);
+		iconList.append(icon);
+		//iconExplain.append(iconList);
 		
 		// 姝ｅ父鏈烘埧
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
-		var icon = $('<img src="'+mapImages.normal+'" style="float:left">');
-		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">姝ｅ父鏈烘埧</span>');
-		iconList.append(icon);
+		var input = $('<input type="checkbox" data-img="item-normal" checked="checked">');
+		var icon = $('<img src="'+mapImages.normal+'">');
+		var span = $('<span>姝ｅ父鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-normal">0</a>');
+		iconList.append(input);
 		iconList.append(span);
+		iconList.append(icon);
+		//iconList.append(badge);
 		iconExplain.append(iconList);
+		
+		// 缁埅涓嶈冻3灏忔椂鏈烘埧
+		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
+		var input = $('<input type="checkbox" data-img="item-weak" checked="checked">');
+		var icon = $('<img src="'+mapImages.normal+'">');
+		var span = $('<span>缁埅涓嶈冻3灏忔椂鏈烘埧</span>');
+		var badge = $('<a href="javascript:;" class="layui-badge-rim mrr8 badge-weak">0</a>');
+		iconList.append(input);
+		iconList.append(span);
+		iconList.append(icon);
+		iconList.append(badge);
+		//iconExplain.append(iconList);
 	}
+	
+	// 鏇存柊鍦板浘鍥炬爣badge鐨勫��
+	function updateMapIconBadge() {
+		var mapImgDesc = $('#mapImgDesc');
+		var behind = mapImgDesc.find('.badge-behind');		// 鐢垫睜钀藉悗鏈烘埧
+		var warn = mapImgDesc.find('.badge-warn');			// 鐢垫睜鍛婅鏈烘埧
+		var down = mapImgDesc.find('.badge-down');			// 鎺夌珯鏈烘埧
+		var powercut = mapImgDesc.find('.badge-powercut');	// 鍋滅數鏈烘埧
+		var normal = mapImgDesc.find('.badge-normal');		// 姝ｅ父鏈烘埧
+		var weak = mapImgDesc.find('.badge-xuhang');			// 缁埅涓嶈冻3灏忔椂鏈烘埧
+		console.log(warn.length);
+		//  璇锋眰鍚庡彴鏁版嵁
+		$.ajax({
+			type: 'post'
+			,async: true
+			,url: 'Bts_station_stateAction_action_serchStationState'
+			,data: null
+			,dataType: 'json'
+			,success:function(res) {
+				var rs = JSON.parse(res.result);
+				console.log(rs);
+				powercut.text(rs.sum);		// 鍋滅數鏁�
+				down.text(rs.code);		// 鎺夌珯鏁�
+				behind.text(rs.msgN);	// 钀藉悗鏈烘埧
+				warn.text(rs.msg);		// 鍛婅鏈烘埧
+				weak.text(rs.msgT);		// 缁埅涓嶈冻3灏忔椂
+				/* var normalNum = Number(rs.newsum) - (Number(rs.sum)+Number(rs.code)+Number(rs.msgN)+Number(rs.msg));
+				normal.text(normalNum); */	// 姝ｅ父鏈烘埧
+			}
+		});
+		
+	}
+	
 	
 	// 61850鎻忚堪
 	function mapImgDesc61850(iconExplain) {
@@ -1526,16 +1865,16 @@
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var icon = $('<img src="'+mapImages.nuclear+'" style="float:left">');
 		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">鏍稿/鍋滅數鏀剧數</span>');
-		iconList.append(icon);
 		iconList.append(span);
+		iconList.append(icon);
 		iconExplain.append(iconList);
 		
 		// 鍛婅
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var icon = $('<img src="'+mapImages.devalarm+'" style="float:left;">');
 		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">61850璁惧鍛婅</span>');
-		iconList.append(icon);
 		iconList.append(span);
+		iconList.append(icon);
 		iconList.append('<div class="clear"></div>');
 		iconExplain.append(iconList);
 		
@@ -1543,16 +1882,16 @@
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var icon = $('<img src="'+mapImages.precharge+'" style="float:left">');
 		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">61850棰勫厖鐢�</span>');
-		iconList.append(icon);
 		iconList.append(span);
+		iconList.append(icon);
 		iconExplain.append(iconList);
 		
 		// 鍦ㄧ嚎娴厖
 		var iconList = $('<div class="explain-list" style="padding: 4px 6px; border-bottom: 1px slid #ccc; display:block"></div>');
 		var icon = $('<img src="'+mapImages.float+'" style="float:left">');
 		var span = $('<span style="line-height: 30px; text-align:center; margin-left: 4px">61850鍦ㄧ嚎娴厖</span>');
-		iconList.append(icon);
 		iconList.append(span);
+		iconList.append(icon);
 		iconExplain.append(iconList);
 	}
 	
@@ -1602,17 +1941,16 @@
 	}
 	
 	// 鐢熸垚鍦板浘鍥炬爣
-	function createMapDot(map, dotList) {
+	function createMapDot(map, dotList, isTop) {
 		// 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
 		mkList = [];
-		
 		// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
-		for(var i = 0; i < dotList.length; i++) {
+		for(var i = 0; i<dotList.length; i++) {
+			var isShow = checkMapImgStyle(dotList[i].msg);
 			var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].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鐐�
-			
 			// 鍒犻櫎鎸囧畾鐨勭偣(璇ョ偣浼氬湪鏈嚱鏁板悗闈㈤噸鏂板垱寤�)
 			deletePoint(map, dotList[i].title);
 			
@@ -1637,16 +1975,67 @@
 				//showMapPanel(target, dotList);
 				searchPanelInfo(target);
 			});
+			
+			if(isTop) {
+				mk.setTop(true);
+			}
+			
 			mkList.push(mk);
 			// 鍚戝湴鍥炬坊鍔犺鐩栫墿
-			map.addOverlay(mk);
+			if(isShow) {
+				map.addOverlay(mk);
+			}
 		}
+	}
+	
+	// 鏇存柊鍦板浘鍥炬爣
+	function updateMapDotIcon(map, dotList, isTop) {
+		var homeType = getHomeType();
+		// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
+		for(var i = 0; i<dotList.length; i++) {
+			var isAcType = checkHomeType(dotList[i].type, homeType);
+			var isShow = checkMapImgStyle(dotList[i].msg);
+			var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30));	// 璁剧疆鍥剧墖
+			var mk =  getMapMarker(map, dotList[i].title);
+			if(mk) {
+				// 璁剧疆鍦板浘鍥炬爣
+				mk.setIcon(dotIcon);
+				
+				// 灏嗗凡缁忓畨瑁呯殑鏄剧ず鍦ㄩ《閮�
+				if(isTop) {
+					mk.setTop(true);
+				}
+				
+				// 闅愯棌marker鐐�
+				isShow&&isAcType?mk.show():mk.hide();
+			}
+		}
+	}
+	
+	// 鑾峰彇鍦板浘鍥炬爣
+	function getMapMarker(map, msg) {
+		var rs = false;
+		var allOverlay = map.getOverlays();
+		for (var i = 0; i < allOverlay.length; i++){
+			try{
+				if(allOverlay[i].getLabel().content == msg){
+					rs = allOverlay[i];
+					return rs;
+				}
+			}catch(e) {
+			
+			}
+			
+		}
+		
+		return rs;
+		
 	}
 	
 	// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
 	function deletePoint(map, msg){
 		var allOverlay = map.getOverlays();
-		for (var i = 0; i < allOverlay.length -1; i++){
+		for (var i = 0; i < allOverlay.length; i++){
 			try{
 				if(allOverlay[i].getLabel().content == msg){
 					map.removeOverlay(allOverlay[i]);
@@ -1659,6 +2048,35 @@
 		}
 	}
 	
+	// 鑾峰彇鍦板浘闇�瑕佹樉绀哄浘鏍囩殑绫诲瀷
+	var magImgStyles = [];
+	
+	function setMapImgStyles() {
+		var ipts = $('#mapImgDesc .explain-list input');
+		magImgStyles = [];
+		ipts.each(function(i) {
+			var imgStyle = $(this).data('img');
+			if($(this).is(':checked')) {
+				magImgStyles.push(imgStyle);
+			}
+		});
+		magImgStyles.push('');
+		// 鏍规嵁褰撳墠鍐呭鏇存柊鍦板浘鍥炬爣
+		//searchStation();
+	}
+	
+	// 妫�娴嬪綋鍓嶅浘鏍囨槸鍚︾鍚�
+	function checkMapImgStyle(imgStyle) {
+		var isShow = false;
+		for(var i=0; i<magImgStyles.length; i++) {
+			if(magImgStyles[i] == imgStyle) {
+				isShow = true;
+				break;
+			}
+		}
+		
+		return isShow;
+	}
 	// 鍒涘缓鍛婅鐐�
 	function createWarnDot(map, warnDotList) {
 		for(var i = 0; i < warnDotList.length; i++) {
@@ -1763,7 +2181,7 @@
 	
 	function showMapPanel(target, warnList) {
 		var point = target.point;
-		console.log(target.getLabel());
+		//console.log(target.getLabel());
 		var searchInforWin = null;
 		for(var i = 0; i < warnList.length; i++) {
 			if(warnList[i].lng == point.lng && warnList[i].lat == point.lat) {
@@ -1897,6 +2315,8 @@
 	function getAddHomeInfo() {
 		var lng = $('.add-panel .lng').text();								// 鑾峰彇缁忓害
 		var lat = $('.add-panel .lat').text();								// 鑾峰彇绾害
+		var wgsPoint = GPS.bd2wgs(lat, lng);								// 鐧惧害鍦板浘鍧愭爣杞寲涓篏PS
+		
 		var addr = $('.add-panel .addr').text();							// 鑾峰彇鍦板潃
 		var homeName = $('.add-panel select option:selected').text();		// 鏈烘埧鍚嶇О
 		var homeId = $('.add-panel select option:selected').val();			// 鏈烘埧ID
@@ -1905,8 +2325,8 @@
 				StationId:homeId,			//鏈烘埧缂栧彿
 				StationName:homeName,		//鏈烘埧鍚嶇О
 				Address:addr,				//鏈烘埧鐗╃悊淇℃伅
-				longitude:lng,				// 缁忓害
-				latitude:lat,				// 绾害
+				longitude: wgsPoint.lon,				// 缁忓害
+				latitude: wgsPoint.lat,				// 绾害
 				information:"",				//澶囨敞
 			};
 			var json = JSON.stringify(temp);
@@ -1989,6 +2409,16 @@
 		// 鏍规嵁鍙鑼冨洿鏄剧ず鍧愭爣鐐�
 		var dots = [];
 		var currMarkers = {};
+		
+		// 鍒濆鍖�
+		function init() {
+			dots = [];
+			currMarkers = {};
+		}
+		// init鍑芥暟缁戝畾鍒癎LOBAL.BMap涓�
+		gl.BMap.init = init;
+		
+		
 		// 鏌ヨ褰撳墠鑼冨洿鍐呭鐨勫浘鏍�
 		function queryInRect(map, callback) {
 			var cp = map.getBounds(); // 杩斿洖map鍙鍖哄煙锛屼互鍦扮悊鍧愭爣琛ㄧず  
@@ -2108,22 +2538,21 @@
 	
 	var allStation = [];
 	var mapPages = {
-		pageSize:100, 				// 姣忛〉鐨勮鏁�
+		pageSize:50, 				// 姣忛〉鐨勮鏁�
 		pageCurr:1,  				// 褰撳墠椤电爜鏁�
 		pageAll:1,					// 鏁扮洰
 		pageNum: 0,
 		pageNew: true
 	};
+	
 	//鏌ヨ鏈烘埧
 	function searchStation(setRect){
 		var temp = createSearchParam();
 		var json = JSON.stringify(temp);
 		var bmap = GLOBAL.BMap;		// BMap鐨勫懡鍚嶇┖闂�
-		var bmap_s = bmap.Search;	// Search鐨勫懡鍚嶇┖闂�
-		commonDot = new Array();
-		warnDotList = new Array();
-		dischargeDotList = [];
-		behindCellList = [];
+		var init = bmap.init;
+		//init();
+		// 鏌ヨ鍚庡彴
 		$.ajax({ 	
 	        type: "post", 				
 	        //url: "BattMap_informationAction!searchAll",				
@@ -2136,27 +2565,31 @@
 				// 鑾峰彇缁撴灉闆�
 				var rs = JSON.parse(data.result);
 				var list = rs.data;
-				// console.log(list);
+				//console.log(list);
 				allStation = new Array();
 				if(list!=undefined && list.length>0){
 					// 璁剧疆鍒嗛〉淇℃伅
 					mapPages.pageAll = list.length;
 					setMapPages();
-					
+					//console.log(123);
 					// 閬嶅巻鏌ヨ缁撴灉
 					for(var i=0;i<list.length;i++){
 						var _list = list[i];
 						allStation.push(formatAllStation(_list));
 					}
-					
 					// 鏄剧ず鍖哄煙鐨勫浘鏍�
 					bmap.setDots(allStation);
 					bmap.queryInRect(map, createMapDot);
+					updateStation();
+					
+					// 鏇存柊灏忓伐鍏锋悳绱㈡満鎴垮姛鑳�
+					updateSearchSource(allStation);
+					
 					// 鏄惁绗竴娆℃墽琛�
 					if(setRect) {
 						map.addEventListener("moveend", bmap.queryInRect.bind({},map, createMapDot));  // 鎷栧姩
 						map.addEventListener("zoomend", bmap.queryInRect.bind({},map, createMapDot)); // 缂╂斁
-						updateStation();
+						
 					}
 				}
         	} 				
@@ -2166,9 +2599,11 @@
 	// 鏍煎紡鍖栨煡璇㈢粨鏋�
 	function formatAllStation(list) {
 		var obj = new Object();
+		// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+		var point = GPS.wgs2bd(list.latitude, list.longitude);
 		// 鏋勯�犵粨鏋滈泦
-		obj.lng = list.longitude;
-		obj.lat = list.latitude;
+		obj.lng = point.lon;
+		obj.lat = point.lat;
 		obj.title = list.StationName;
 		obj.sId = list.StationId;
 		obj.fbsId = list.FBSDeviceId;
@@ -2186,9 +2621,16 @@
 	}
 	
 	// 杞鏇存柊鍦板浘鐨勭偣鏌ヨ
-	function updateStation() {
+	var updateTimeout;
+	var updateLoad;
+	function updateStation(isLoad) {
 		var bmap = GLOBAL.BMap;		// BMap鐨勫懡鍚嶇┖闂�
 		var updateStationData = [];
+		
+		if(isLoad) {
+			updateLoad = layer.load(1);
+		}
+		
 		$.ajax({
 			type: "post",
 			url: "BattMap_informationAction!searchUserManageStation2",				
@@ -2196,28 +2638,30 @@
 	        dataType:'json',
 	        data: "json="+JSON.stringify(mapPages),
 	        success: function(result) {
+	        	layer.close(updateLoad);
 	        	var data = JSON.parse(result.result);
+	        	//console.log(data);
 	        	for(var i=0; i<data.length; i++) {
 	        		var _data = data[i];
 	        		var _list =  formatUpdateStation(_data);
 	        		updateStationData.push(_list);
-	        		//_list.msg = 'item-nuclear_cap';
 	        		// 鍒ゆ柇鏄惁鏇存柊
 	        		if(mapPages.pageNew) {
 	        			bmap.updateDots(_list);
 	        		}
 	        	}
-	        	
-	        	createMapDot(map, updateStationData);
-	        	
+	        	//console.log(updateStationData);
+	        	updateMapDotIcon(map, updateStationData, true);
 	        	// 鏇存柊鍒嗛〉淇℃伅
 	        	mapPages.pageCurr++;
-	        	if(mapPages.pageCurr>mapPages.pageNum) {
+	        	if(mapPages.pageCurr>mapPages.pageNum || updateStationData.length<mapPages.pageSize) {
 	        		mapPages.pageCurr=1;
 	        		mapPages.pageNew=false;
 	        	}
+	        	// 鍏抽棴骞舵坊鍔犲欢鏃舵墽琛�
+	        	clearInterval(updateTimeout);
+	        	updateTimeout = setTimeout(updateStation, 4000);
 	        	
-	        	setTimeout(updateStation, 4000);
 	        }
 		});
 	}
@@ -2226,27 +2670,45 @@
 	function formatUpdateStation(list) {
 		var obj = {};
 		var data = list.data;
+		// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+		var point = GPS.wgs2bd(data.latitude, data.longitude);
 		// 鏋勯�犵粨鏋滈泦
-		obj.lng = data.longitude;
-		obj.lat = data.latitude;
+		obj.lng = point.lon;
+		obj.lat = point.lat;
 		obj.title = data.StationName;
 		obj.sId = data.StationId;
 		obj.fbsId = data.FBSDeviceId;
 		obj.addr = data.Address;
 		obj.msg = list.msg;
-		obj.num = list.num;
+		obj.num = data.num;
+		obj.type = data.monvolstd;
 		return obj;
+	}
+	
+	// 鏍规嵁鏄剧ず鐨勭被鍨嬬瓫閫夋暟鎹�
+	
+	
+	// 鏍规嵁allStation鐨勫�煎幓鏇存柊鍐呭
+	function updateMapByAllStation() {
+		var bmap = GLOBAL.BMap;		// BMap鐨勫懡鍚嶇┖闂�
+		var init = bmap.init; // 鍒濆鍖栧唴瀹�
+		
+		// 鍒濆鍖栧湴鍥惧唴瀹�
+		init();
+		
+		// 鏄剧ず鍖哄煙鐨勫浘鏍�
+		bmap.setDots(allStation);
+		bmap.queryInRect(map, createMapDot);
 	}
 	
 	// 鏌ヨ鏈烘埧闈㈡澘淇℃伅
 	function searchPanelInfo(data) {
-		var point = data.point;
+		var point = new BMap.Point(data.point.lng, data.point.lat);
 		var stationInfo = getStaionByPoint(point);
 		if(!stationInfo) {
 			alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
 			return;
 		}
-		
 		var temp = {
 			StationId: stationInfo.sId
 		};
@@ -2261,14 +2723,17 @@
 				var rs = JSON.parse(result.result);
 				if(rs.length != 0) {
 					var data = rs[0];
-					console.info(data);
+					//console.info(data);
 					var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
 							'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
-							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a></div>'+
+							'<div style="padding:6px"><a href="javascript:loadToRealTime();">瀹炴椂鏁版嵁</a><a style="margin-left: 20px" href="javascript:loadToOldTime();">鍘嗗彶鏁版嵁</a>'+
+							'<a style="margin-left: 20px" href="javascript:showHomeInfo('+data.data.StationId+');">鍩虹珯淇℃伅</a></div>'+
 							'<div style="padding:6px;"><span>鍦板潃锛�</span>'+data.data.Address+'</div>'+
 							'<input type="hidden" class="ipt-hide home" value="'+data.data.StationName+'">'+
 							'<input type="hidden" class="ipt-hide province" value="'+data.data.stationName1+'">'+
+							'<input type="hidden" class="ipt-hide county" value="'+data.data.stationName5+'">'+							
+							'<input type="hidden" class="ipt-hide sid" value="'+data.data.StationId+'">'+
 							'<input type="hidden" class="ipt-hide city" value="'+data.data.stationName2+'">';
 					
 					var list = {
@@ -2410,7 +2875,10 @@
 		var home = $('.ipt-hide.home').val();
 		var province = $('.ipt-hide.province').val();
 		var city = $('.ipt-hide.city').val();
-		window.open('control.jsp?province='+province+'&city='+city+'&home='+home);
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('control.jsp',province,city,county,home);
+		window.open(url);
+		//window.open('control.jsp?province='+province+'&city='+city+'&home='+home);
 	}
 
 	// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
@@ -2418,27 +2886,49 @@
 		var home = $('.ipt-hide.home').val();
 		var province = $('.ipt-hide.province').val();
 		var city = $('.ipt-hide.city').val();
-		window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home);
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('charge-test.jsp',province,city,county,home);
+		window.open(url);
+		//window.open('charge-test.jsp?province='+province+'&city='+city+'&home='+home);
 	}
 	
 	//瀹氫綅鍒板憡璀﹂〉闈�
 	function loadToWarnPage() {
+		var home = $('.ipt-hide.home').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('elewarn.jsp',province,city,county,home);
+		window.open(url);
 		// console.info($('.ipt-hide').val());
-		var stationId = $('.ipt-hide').eq(1).val();
-		window.open('elewarn.jsp?stationId='+stationId);
+		//var stationId = $('.ipt-hide').eq(1).val();
+		//window.open('elewarn.jsp?stationId='+stationId);
 	}
 
 	// 瀹氫綅鍒拌惤鍚庡崟浣撻〉闈�
 	function loadToBehindPage() {
+		var home = $('.ipt-hide.home').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('taskplan.jsp',province,city,county,home);
+		window.open(url);
 		// console.info($('.ipt-hide').val());
-		var stationId = $('.ipt-hide').eq(1).val();
-		window.open('taskplan.jsp?stationId='+stationId);
+		//var stationId = $('.ipt-hide').eq(1).val();
+		//window.open('taskplan.jsp?stationId='+stationId);
 	}
 
 	// 瀹氫綅鍒版斁鐢靛欢鏃堕〉闈�
 	function loadToDischargeDelay() {
-		var stationId = $('.ipt-hide').eq(1).val();
-		window.open('dischargeplan.jsp?stationId='+stationId);
+		var home = $('.ipt-hide.home').val();
+		var province = $('.ipt-hide.province').val();
+		var city = $('.ipt-hide.city').val();
+		var county = $('.ipt-hide.county').val();
+		var url = skipUrl('dischargeplan.jsp',province,city,county,home);
+		window.open(url);
+	
+		//var stationId = $('.ipt-hide').eq(1).val();
+		//window.open('dischargeplan.jsp?stationId='+stationId);
 	}
 
 	// 瀹氫綅鍒版満鎴胯缁嗕俊鎭〉闈�
@@ -2554,6 +3044,8 @@
 						//console.info(allStation);
 						console.info(allStation);
 						var temp = getStationMap(allStation, mk.point);
+						console.info(temp);
+						temp.StationName = temp.title;
 						if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.title+"'鐨勪綅缃俊鎭悧锛�")){
 							if(temp != undefined){
 								var json = JSON.stringify(temp);
@@ -2772,25 +3264,6 @@
 	
 	$(function() {
 		searchProvince();
-	});	
-	
-	//璁╁湴鍥惧拰楗肩姸鍥鹃殢娴忚鍣ㄧ獥鍙ｇ殑鏀瑰彉鑰屾敼鍙�
-	$(window).resize(function(){
-		if(warnPie != undefined)
-		{
-			warnPie.resize();
-		}
-		if(brdnPie != undefined)
-		{
-			brdnPie.resize();
-		}
-		if(repairPie != undefined)
-		{
-			repairPie.resize();
-		}
-		if(healthPie != undefined) {
-			healthPie.resize();
-		}
 	});
 	
 	// 鐐瑰嚮鍒囨崲鍐呭
@@ -2853,102 +3326,19 @@
 		var rs = new Object();
 		rs.normal = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_normal}";	// 鏅�氭満鎴垮浘鏍�
 		rs.behind = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_behind}";	// 钀藉悗鍥炬爣
+		//rs.diaozhan = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_diaozhan}";	// 寤舵椂鏈烘埧鍥炬爣
 		rs.timeout = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_timeout}";	// 寤舵椂鏈烘埧鍥炬爣
 		rs.warn = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_warn}";	// 鍛婅鏈烘埧鍥炬爣
 		rs.nuclear = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_nuclear_cap}";	// 鏍稿鏀剧數
 		rs.devalarm = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_dev_alarm}";	// 璁惧鍛婅
 		rs.precharge = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_pre_charge}";	// 棰勫厖鐢�
 		rs.float = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_online_charge}";	// 娴厖
+		rs.powercut = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_poff}";
+		rs.defaults = "User_ChartAction!serchByInfo?json={Chart_file:'"+user_logo+"',Chart_name:chart_install}";
+		rs.xuhang = 'image/home-weak.gif';
 		return rs;
 	}
-	/* $(function(){
-		setTimeout(function(){
-			var _script = document.createElement('script');  
-			_script.type = "text/javascript";  
-			_key = "55UbnVOR7XovezZC4jFvTqNDPAamsuoo";//鐧惧害鍦板浘鍙互鐢宠鍒�  
-			_script.src = "http://api.map.baidu.com/location/ip?ak="+_key+"&coor=bd09ll&ip=&callback=f";//鎷兼帴URL  
-			document.head.appendChild(_script);  
-		
-		}, 2000);
-	        
-	});
-	var pointX;  
-    var pointY;  
-    function f(data){  
-        pointX = data.content.point.x;  
-        pointY = data.content.point.y;  
-        console.info("浣犳墍鍦ㄥ煄甯�:"+data.content.address);  
-        console.info("浣犲煄甯傜粡搴�:"+pointX);  
-        console.info("浣犵殑鍩庡競绾害:"+pointY);
-        var point = new BMap.Point(pointX, pointY);
- 		map.centerAndZoom(point, 10);	// 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�  
-    }     */
-    
-    
-    /* $(document).ready(function(){
-		//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
-		$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
-			data=data.result;
-			data=eval("("+data+")");
-			//console.info(data);
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#station_name1");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					$option=$("<option></option>");
-					if(i==0){
-						$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
-						$option.attr("value", "");			
-					}else{
-						$option.text(data.data[i-1]);
-						$option.attr("value",data.data[i-1]);	
-					}					
-					$select.append($option);
-				}
-			}else{
-				$("#station_name1").text('').html('<option>鏆傛棤鍙祴缁存姢鍖�</option>');
-			}
-			findStationNamebyStationname1();		
-		});
-	});
 	
-	//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
-	$('#station_name1').change(function(){
-		findStationNamebyStationname1();
-	});
-	
-	//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
-	function findStationNamebyStationname1(){
-		var user = {
-			UNote:$("#station_name1 option:selected").val()
-		};
-		//var selectvalue=$("#station_name1 option:selected").val();
-		//alert(selectvalue);
-		$.post("User_battgroup_baojigroup_battgroupAction!serchStationNameInGroup","json="+JSON.stringify(user),function(data){
-			//console.info(data);
-			data=data.result;
-			data=eval("("+data+")");
-			if(data.code==1 && data.data.length>0){
-				var $select = $("#station_name");
-				$select.text('');
-				for(var i=0;i<=data.data.length;i++){
-					var $option=$("<option></option>");
-					if(i==0){
-						$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");	
-						$option.attr("value", "");			
-					}else{
-						$option.text(data.data[i-1]);
-						$option.attr("value",data.data[i-1]);	
-					}					
-					$select.append($option);
-				}
-			}else{
-				$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
-			}
-			findserchByBattGroupNamebystationname();
-		});
-	} */
-    
     //鏌ヨ鎵�鏈夌殑缁存姢鍖�
     function searchAllProvince(){
     	$.ajax({ 	
@@ -3137,14 +3527,23 @@
 	 function getMapStateImg(imgs, cla) {
 	 	var rs = imgs.normal;
 	 	switch(cla) {
+	 		case 'item-normal':
+	 			rs = imgs.normal;
+	 			break
 	 		case 'item-warn':	// 鍛婅
 	 			rs = imgs.warn;
 	 			break;
 	 		case 'item-behind':	 // 钀藉悗
 	 			rs = imgs.behind;
 	 			break;
+	 		case 'item-diaozhan':
+	 			rs = imgs.timeout;  // 鎺夌珯
+	 			break;
 	 		case 'item-timeout':	// 寤舵椂
 	 			rs = imgs.timeout;
+	 			break;
+	 		case 'item-poff':	// 鍋滅數
+	 			rs = imgs.powercut;
 	 			break;
 	 		case 'item-dev_alarm':	// 61850鍛婅
 	 			rs = imgs.devalarm;
@@ -3157,6 +3556,12 @@
 	 			break;
 	 		case 'item-pre_charge':	// 61850棰勫厖鐢�
 	 			rs = imgs.precharge;
+	 			break;
+	 		case 'item-xuhang':		// 缁埅涓嶈冻
+	 			rs = imgs.xuhang;
+	 			break;
+	 		default:
+	 			rs = imgs.defaults;
 	 			break;
 	 	}
 	 	
@@ -3337,10 +3742,11 @@
 		});
 	});
 	
-	layui.use(['form', 'layer', 'laytpl'], function() {
+	layui.use(['form', 'layer', 'laytpl', 'element'], function() {
 		var form = layui.form;
 		var layer = layui.layer;		
 		var laytpl = layui.laytpl;
+		var element = layui.element;
 		
 		// 鐐瑰嚮楗肩姸鍥鹃厤缃�
 		$('#faCog').click(function() {
@@ -3364,6 +3770,11 @@
 					type: 1
 				});
 				$(this).prop('checked', false);
+			}else if(num == 0) {
+				layerMsg = layer.msg("鑷冲皯閫夋嫨涓�涓紒", {
+					type: 1
+				});
+				$(this).prop('checked', true);
 			}
 			
 		});
@@ -3382,34 +3793,43 @@
 		        data:null,		
 		        success: function(data){ 
 					var model = eval('('+data.result+')');
+					var resData;
 					if(model.code == 1) {
 						var result = model.data;
-						var formatData = formatPieRsData(result[0]);
-						laytpl(pieConfTpl).render(formatData, function(html) {
-							layer.open({
-								id: 'pie',
-								title: '楗肩姸鍥鹃厤缃�',
-								maxHeight: 450,
-								content: html,
-								yes: function(index) {
-									var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
-									var iptArr = [];
-									iptList.each(function() {
-										if($(this).is(':checked')) {
-											iptArr.push(1);
-										}else {
-											iptArr.push(0);
-										}
-									});
-									
-									var temp = structUpdatePie(iptArr);
-									layer.load();
-									updateUserBieState(temp);
-								}
-							});
-						});
+						resData = result[0];
+					}else {
+						resData = {
+							echarts1_enable:1,
+							echarts2_enable:1,
+							echarts3_enable:1,
+							echarts4_enable:1
+						};
 					}
 					
+					// 鏍煎紡鑾峰彇鍒扮殑鏁版嵁
+					var formatData = formatPieRsData(resData);
+					laytpl(pieConfTpl).render(formatData, function(html) {
+						layer.open({
+							id: 'pie',
+							title: '楗肩姸鍥鹃厤缃�',
+							maxHeight: 450,
+							content: html,
+							yes: function(index) {
+								var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
+								var iptArr = [];
+								iptList.each(function() {
+									if($(this).is(':checked')) {
+										iptArr.push(1);
+									}else {
+										iptArr.push(0);
+									}
+								});
+								var temp = structUpdatePie(iptArr);
+								layer.load();
+								updateUserBieState(temp);
+							}
+						});
+					});
 		       	} 				
 			});
 		}
@@ -3459,6 +3879,7 @@
 		
 		// 鏇存柊褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
 		function updateUserBieState(temp, dialog, load){
+			var pieItemCon = $('.pie-con .pie-item-con');
 			// 鏇存柊鍚庡彴鏁版嵁
 			$.ajax({ 	
 		        type:"post", 								
@@ -3468,9 +3889,22 @@
 		        data:'json='+JSON.stringify(temp),		
 		        success: function(data){ 
 		        	layer.closeAll();
-		        	
 					var model = eval('('+data.result+')');
 					if(model.code == 1) {
+						// 鏇村叿temp鐨勫�艰缃ゼ鐘跺浘鐨勫唴瀹�
+			        	var formaterTmp = GLOBAL.Index.Pie.formaterPieStauts(temp);
+			        	//console.log(formaterTmp);
+			        	var pieItems = GLOBAL.Index.Pie.getPieList(formaterTmp);
+			        	//console.log(pieItems);
+			        	pieItemCon.text('');
+			        	pieItemCon.append(pieItems);
+			        	
+			        	// 璁剧疆楂樺害
+			        	getMapHt();
+			        	
+			        	// 鏇存柊楗肩姸鍥�
+			        	flushFourPie(true);
+			        	
 						layer.msg('閰嶇疆鎴愬姛锛侊紒锛�');
 					}else {
 						layer.msg('閰嶇疆澶辫触锛侊紒锛�');
@@ -3479,6 +3913,217 @@
 			});
 		}
 		
+		// 鏍规嵁鏉冮檺鏇存柊鍦板浘宸ュ叿鍐呭
+		var permitAddHome = getPermit('batt_map_edit_permit', permits);	// 娣诲姞鏈烘埧鐨勬潈闄�
+		// 娌℃湁娣诲姞鏈烘埧鐨勬潈闄�
+		if(!permitAddHome) {
+			$('#permitAddHome').remove();
+		}
+		
+		// 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�-鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
+		$('#showMapInfoDetail').click(function() {
+			$('.map-info-detail').slideToggle();
+		});
+		
+		// 鐐瑰嚮闅愯棌
+		$('.map-info-detail .map-panel-hide').click(function() {
+			$('.map-info-detail').slideUp();
+		});
+		
+		// 鍐呭鏀瑰彉鍒濆璇�$('#mapToolSearchBtn').data('homeInfo')鐨勫��
+		$( "#mapToolSearch" ).on('input propertychange', function(){
+			$('#mapToolSearchBtn').data('homeInfo', 0);
+		});
+		
+		// 瀹氫箟鏈烘埧鏌ヨ淇℃伅
+		$( "#mapToolSearch" ).autocomplete({
+			source: [],
+			select: function(event, ui) {
+				$('#mapToolSearchBtn').data('homeInfo', ui.item);	// 璁剧疆鏈烘埧淇℃伅鍐呭
+			}
+		});
+		
+		// 鐐瑰嚮鏈烘埧绫诲瀷澶嶉�夋
+		$('#homeType input[type=checkbox]').click(function() {
+			var homeType = getHomeType();
+			getInstallNum();
+			updateStation(true);
+		});
+		
+		
+		// 鐐瑰嚮鏌ョ湅homeInfo鐨勫��
+		$('#mapToolSearchBtn').click(function() {
+			var homeInfo = $(this).data('homeInfo');
+			if(homeInfo) {
+				searchPanelInfo(homeInfo);
+				$(this).data('homeInfo', 0);
+				$( "#mapToolSearch" ).val('');
+			}else {
+				layer.msg('璇烽噸鏂拌緭鍏ユ満鎴夸俊鎭紒');
+				$( "#mapToolSearch" ).val("");
+			}
+		});
+		
+		/* 鍦板浘宸ュ叿娣诲姞鍦板浘鍥炬爣 */
+		var mapToolAddHome = $('#mapToolAddHome');
+		var mapToolAddHomeBtn = $('#mapToolAddHomeBtn');
+		
+		// 鐐瑰嚮鍦板浘宸ュ叿娣诲姞鍦板浘鎸夐挳
+		mapToolAddHomeBtn.click(function() {
+			var lng = mapToolAddHome.find('.lng').val().trim();
+			var lat = mapToolAddHome.find('.lat').val().trim();
+			var pointStyles = mapToolAddHome.find('.pointStyle');
+			var pointStyle = 0;
+			pointStyles.each(function() {
+				if($(this).is(':checked')) {
+					pointStyle = $(this).val();
+				}
+			});
+			if(lng && lat) {
+				var point = getBaiduPoint(lng, lat, pointStyle);
+				var pt = new BMap.Point(point.lon, point.lat);
+				addCommonDot(map, pt);
+				map.centerAndZoom(pt, 18);	// 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�
+			}else {
+				layer.msg('璇疯緭鍏ョ粡绾害');
+			}
+			
+		});
+		
+		// 鑾峰彇鐧惧害鍦板浘鐨勭粡绾害
+		function getBaiduPoint(lng, lat, type) {
+			var point = {};
+			lng = Number(lng);
+			lat = Number(lat);
+			var _type = Number(type);
+			switch(_type) {
+				case 0:	// GPS鍘熷鍧愭爣
+					point = GPS.wgs2bd(lat, lng);
+					break;
+				case 1:	// 鐧惧害鍦板浘鍧愭爣
+					point = {
+						lon: lng,
+						lat: lat
+					};
+					break;
+				case 2:		// 鑵捐/楂樺痉
+					point = GPS.bd_encrypt(lat, lng);
+					break;
+			}
+			
+			return point;
+		}
+		// 鐐瑰嚮璁惧瀹夎鐘舵�佺殑鍒锋柊鎸夐挳
+		$('#installnumbtn').click(function() {
+			getInstallNum(true);
+		});
+		
+		// 缁熻璁惧瀹夎鎯呭喌
+		getInstallNum();
+		// 鑾峰彇褰撳墠宸茬粡瀹夎鐨勮澶囨暟鐩�
+		function getInstallNum(isLoad) {
+			var load;
+			// 鏌ヨ鍚庡彴鏁版嵁
+			$.ajax({
+				type: 'post',
+				async:true,
+				url: 'BattInfAction!serchDevice',
+				data: null,
+				dataType: 'json',
+				beforeSend:  function(xhr) {
+					if(isLoad) {
+						load = layer.load(1);
+					}
+					
+				},
+				complete: function(xhr) {
+					layer.close(load);
+				},
+				success: function(result) {
+					// 鏍煎紡鍖栨暟鎹�
+					var rs = JSON.parse(result.result);
+					//console.log(rs);
+					if(rs.code == 1) {
+						var txt = getInstallNumByType(rs.data,getHomeType());
+					
+						// 鏇存柊鏂囨湰鍊�
+						$('#installnum').text(txt);
+					}
+					
+				}
+			});
+		}
+		
+		// 鏇村叿閫夋嫨鏈烘埧鐨勭被鍨嬭繑鍥炴枃鏈�
+		function getInstallNumByType(data,type) {
+			var rs = '鏈煡/鏈煡';
+			switch(type) {
+				case 0:
+					rs = '0/0';
+				break;
+				case 2:
+					rs = data[0]+'/'+data[1];
+				break;
+				case 12:
+					rs = data[2]+'/'+data[3];
+				break;
+				case 14:
+					rs = data[4]+'/'+data[5];
+				break;
+			}
+			
+			return rs;
+		}
 	});
+	
+	// 0=鍏ㄩ儴涓嶉�� 14=鍏ㄩ儴閫変腑 2=閫変腑2V 12=閫変腑12V
+	function getHomeType() {
+		var boxList = $('#homeType input[type=checkbox]')
+		var rs = 0;		// 鍏ㄩ儴
+		
+		boxList.each(function() {
+			if($(this).is(':checked')) {
+				rs += Number($(this).val());
+			}
+		});
+		
+		return rs;
+	}
+	
+	
+	// 妫�娴嬪綋鍓嶆満鎴挎槸鍚︾鍚�2V鎴�12V
+	function checkHomeType(homeType, type) {
+		var rs = false;
+		var _homeType = Number(homeType);
+		if(type == 14 || homeType == type) {
+			rs = true;
+		}
+		
+		return rs;
+	}
+	
+	// 鏇存柊鍦板浘宸ュ叿鎼滅储鏈烘埧
+	function updateSearchSource(data) {
+		var homeSource = [];
+		for(var i=0; i<data.length; i++) {
+			var _data = data[i];
+			var tmp = {
+				label: _data.title+'('+_data.sId+')',
+				point: {
+					lng: _data.lng,
+					lat: _data.lat
+				}
+			};
+			homeSource.push(tmp);
+		}
+		
+		$( "#mapToolSearch" ).autocomplete('option', 'source', homeSource);
+	}
+	
+	// 娣诲姞鍦板浘鎺т欢
+	function add_control(){
+		var bottom_left_navigation = new BMap.NavigationControl({anchor: BMAP_ANCHOR_BOTTOM_LEFT});
+		map.addControl(bottom_left_navigation);  
+	}
 	</script> 
 </html>

--
Gitblit v1.9.1