From d45d08d36896d96e12f3bd4fb283c523dff52eb5 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 10:59:49 +0800
Subject: [PATCH] 添加自动下拉选择

---
 gx_tieta/WebRoot/index.jsp |  893 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 711 insertions(+), 182 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index b0aee9e..0a5081b 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -24,18 +24,22 @@
     
     <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" />
 	<link rel="stylesheet" href="css/img-change.css">
 	<link rel="stylesheet" href="css/confirm.css">
 	<link rel="stylesheet" href="css/loading.css">
+	<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
@@ -75,9 +79,23 @@
 		.ui-resizable-s, .ui-resizable-se {
 			display: none !important;
 		}
+		
+		.ui-autocomplete {
+			height: 200px;
+			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>
 	
@@ -91,11 +109,46 @@
 		<jsp:include page="nav.jsp" flush="true"/>
 		<!--瀵艰埅缁撴潫-->
 		<div id="content">
+			
 			<div class="nav-map small">
-				<!-- 鐢垫睜鍒嗗竷鍥� -->
-				<div class="side-bar abs">
-					<div class="lside"></div>
+				<!-- 鍦板浘鍐呭绛涢��  -->
+				<div class="map-info-panel-left">
+					<div class="map-info-panel-content">
+						<div class="map-info">
+							<span>闄愬埗鏄剧ず鍖哄煙: </span><span class="k-point red" id="mapVsArea">涓浗</span>
+							<span class="mr5">鏈烘埧鏄剧ず绫诲瀷:</span><span class="k-point red" id="mapIconStyle">鍏ㄩ儴</span>
+							<span class="map-info-btn-icon" id="showMapInfoDetail" title="璇︽儏"><i class="fa fa-angle-double-down"></i></span>
+						</div>
+						<div class="map-info-detail">
+							<table>
+								<tbody>
+									<tr>
+										<td class="w8em alg-c">闄愬埗鏄剧ず鍖哄煙:</td>
+										<td>
+											<select name="mapVsAreaSel" id="mapVsAreaSel">
+												<option>涓浗</option>
+												<option>涓浗-骞胯タ</option>
+											</select>
+										</td>
+									</tr>
+									<tr>
+										<td class="w8em alg-c">鏈烘埧鏄剧ず绫诲瀷:</td>
+										<td>
+											<select name="mapIconStyleSel" id="mapIconStyleSel">
+												<option>鍏ㄩ儴</option>
+											</select>
+										</td>
+									</tr>
+								</tbody>
+							</table>
+							<div class="map-info-footer alg-r">
+								<button type="button" class="mr10 map-panel-hide" value="纭畾" id="mapPanelEn">纭畾</button>
+								<button type="button" class="mr10 map-panel-hide" value="闅愯棌">闅愯棌</button>
+							</div>
+						</div>
+					</div>
 				</div>
+				<!-- 鐢垫睜鍒嗗竷鍥� -->
 				<div class="china-map" id="map">
 					<div class="img-change" style="display:none;">
 						<div class="img-list">
@@ -134,7 +187,11 @@
 			
 			<!-- 鐢垫睜鏁呴殰涓庣數姹犲憡璀﹂ゼ鐘跺浘 -->
 			<div class="pie-con">
-
+				<div class="pie-conf">
+					<a href="javascript:;" class="pie-btn" id="faCog"  title="鍥捐〃閰嶇疆">
+						<i class="fa fa-cog"></i>
+					</a>
+				</div>
 				<!-- 鐢垫睜鏁呴殰楗肩姸鍥� -->
 				<div class="brdn-pie module"></div>
 				<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
@@ -311,12 +368,15 @@
 	<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>
 	<script type="text/javascript" src="js/createMap.js"></script>
 	<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">
 	var permits;
 	<%	Object obj=session.getAttribute("permits");
@@ -336,6 +396,7 @@
 	var search;
 	var warnOpts;
 	//console.info(BMap);
+	var mapDefults = new Image().src = 'image/mapDefault.gif';
 	var mapImages = getMapImageUrl();
 	// 瀹氫箟鐪�-甯傝祫婧愬唴瀹�
 	var area = [
@@ -476,12 +537,16 @@
 	});
 	
 	$(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();
 		});
 	});
 	
@@ -563,7 +628,7 @@
 				centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
 				map.enableScrollWheelZoom();
 				map.disableDoubleClickZoom();
-				map.setMapStyle({style: 'grayscale'});	//  璁剧疆鍦板浘鐨勯鏍�
+				//map.setMapStyle({style: 'grayscale'});	//  璁剧疆鍦板浘鐨勯鏍�
 				// 娣诲姞鍦板浘绫诲瀷鎺т欢
 				map.addControl(new BMap.MapTypeControl());
 				// 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
@@ -600,10 +665,20 @@
 					
 					flushFourPie();		//鏇存柊鍥涚楗肩姸鍥�
 				});
-	
 				// 璁剧疆鍙抽敭鑿滃崟
 				var menu = new BMap.ContextMenu();
 				var txtMenuItem = [
+					{
+						text: '璁剧疆涓績鐐�',
+						callback: function(e) {
+							myConfirm.show({
+								title: '璁剧疆鍦板浘榛樿鏄剧ず浣嶇疆',
+								content: '鏄惁纭淇敼鍦板浘榛樿涓績鍧愭爣',
+								enfun:updateMapCenterPoint,
+								enparams:[e]
+							});
+						}
+					},
 					{
 						text: '鎼滅储鍦板潃',
 						callback: function(e) {
@@ -625,27 +700,13 @@
 							smallMap();
 						}
 					},
+					
 					{
-						text: '璁剧疆涓績鐐�',
-						callback: function(e) {
-							myConfirm.show({
-								title: '璁剧疆鍦板浘榛樿鏄剧ず浣嶇疆',
-								content: '鏄惁纭淇敼鍦板浘榛樿涓績鍧愭爣',
-								enfun:updateMapCenterPoint,
-								enparams:[e]
-							});
+						text: '杩斿洖涓績鐐�',
+						callback: function(e){
+							centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
 						}
-					},
-					/* {
-						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)) {
@@ -1347,16 +1408,8 @@
 		});
 	});
 	
-	//  鐐瑰嚮鍦板浘鐨勬悳绱㈡寜閽畾浣嶅湴鍧�
-	$(function() {
-		$('#map').on('click', '.search .search-btn', function() {
-			var posTxt = $('#map .search .pos-txt').val();
-			addrAnalyze(posTxt);
-		});
-	});
-	
-	
 	$(window).resize(function() {
+		console.log(123);
 		getMapHt();
 	});
 	// 鏀瑰彉div鐨勫ぇ灏�
@@ -1460,9 +1513,11 @@
 		
 		changeMapImgDesc(iconExplain, 'normal');
 		
-		mapEle.prepend(iconExplain);
+		mapEle.parent().append(iconExplain);
+		
+		// 璁剧疆鍦板浘鍥炬爣绉嶇被
+		setMapImgStyles();
 	}
-	
 	// 鍒囨崲鍦板浘鍥炬爣璇存槑
 	function changeMapImgDesc(iconExplain, type) {
 		iconExplain.find('.explain-list').remove();
@@ -1480,35 +1535,43 @@
 	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-behind" checked="checked">');
+		var icon = $('<img src="'+mapImages.behind+'">');
+		var span = $('<span>鐢垫睜缁勮惤鍚庢満鎴�</span>');
+		iconList.append(input);
 		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.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-warn" checked="checked">');
+		var icon = $('<img src="'+mapImages.warn+'">');
+		var span = $('<span>鐢垫睜缁勫憡璀︽満鎴�</span>');
+		iconList.append(input);
 		iconList.append(span);
+		iconList.append(icon);
 		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);
+		iconList.append(icon);
 		iconExplain.append(iconList);
 		
 		// 姝e父鏈烘埧
 		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">姝e父鏈烘埧</span>');
-		iconList.append(icon);
+		var input = $('<input type="checkbox" data-img="item-normal" checked="checked">');
+		var icon = $('<img src="'+mapImages.normal+'">');
+		var span = $('<span>姝e父鏈烘埧</span>');
+		iconList.append(input);
 		iconList.append(span);
+		iconList.append(icon);
 		iconExplain.append(iconList);
 	}
 	
@@ -1518,16 +1581,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);
 		
@@ -1535,16 +1598,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);
 	}
 	
@@ -1594,19 +1657,22 @@
 	}
 	
 	// 鐢熸垚鍦板浘鍥炬爣
-	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鐐�
-			addMenu(mk, mapDel);
+			var mk = new BMap.Marker(pt, {icon: dotIcon});	// 瀹氫箟marker鐐�
+			// 鍒犻櫎鎸囧畾鐨勭偣(璇ョ偣浼氬湪鏈嚱鏁板悗闈㈤噸鏂板垱寤�)
 			deletePoint(map, dotList[i].title);
+			
+			// 缁欑偣鍙抽敭鑿滃崟娣诲姞鍒犻櫎鎸夐挳
+			addMenu(mk, mapDel);
+			
 			// 鍚憁k鐐规坊鍔爈abel
 			var home_name = new BMap.Label(dotList[i].title, {offset:new BMap.Size(20,-10)});
 			home_name.setStyle({display: 'none', padding: '4px 2px'});
@@ -1622,18 +1688,26 @@
 			
 			mk.addEventListener('click', function(e) {
 				var target = e.target;
-				showMapPanel(target, dotList);
+				//showMapPanel(target, dotList);
+				searchPanelInfo(target);
 			});
+			
+			if(isTop) {
+				mk.setTop(true);
+			}
+			
 			mkList.push(mk);
 			// 鍚戝湴鍥炬坊鍔犺鐩栫墿
-			map.addOverlay(mk);
+			if(isShow) {
+				map.addOverlay(mk);
+			}
 		}
 	}
 	
 	// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
 	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]);
@@ -1646,6 +1720,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++) {
@@ -1750,6 +1853,7 @@
 	
 	function showMapPanel(target, warnList) {
 		var point = target.point;
+		//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) {
@@ -1779,10 +1883,9 @@
 	function showMapPanelByPoint(point, dataList) {
 		var searchInforWin = null;
 		var opts = {
-			//title  : warnList[i].title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none">璇︽儏>></a>',      //鏍囬
 			title  : dataList.title+'<a href="javascript:loadToHomeInfo();" style="margin-left: 1em;text-decoration:none;cursor:not-allowed">璇︽儏>></a>',      //鏍囬鏈紑鍚�
 			width  : '290',             //瀹藉害
-			height : 140,              //楂樺害
+			height : 160,              //楂樺害
 			panel  : "panel",         //妫�绱㈢粨鏋滈潰鏉�
 			enableAutoPan : true,     //鑷姩骞崇Щ
 			enableSendToPhone:false,
@@ -1884,6 +1987,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
@@ -1892,8 +1997,8 @@
 				StationId:homeId,			//鏈烘埧缂栧彿
 				StationName:homeName,		//鏈烘埧鍚嶇О
 				Address:addr,				//鏈烘埧鐗╃悊淇℃伅
-				longitude:lng,				// 缁忓害
-				latitude:lat,				// 绾害
+				longitude: wgsPoint.lon,				// 缁忓害
+				latitude: wgsPoint.lat,				// 绾害
 				information:"",				//澶囨敞
 			};
 			var json = JSON.stringify(temp);
@@ -1969,76 +2074,353 @@
 		}
 	}
 	
-	searchStation();
-	var allStation;
+	// 璁剧疆椤甸潰涓殑鍙鍖哄煙鍥炬爣
+	;(function($, window, document, gl, undefined) {
+		// 璁剧疆鍛藉悕绌洪棿
+		gl.namespace('BMap');
+		// 鏍规嵁鍙鑼冨洿鏄剧ず鍧愭爣鐐�
+		var dots = [];
+		var currMarkers = {};
+		
+		// 鍒濆鍖�
+		function init() {
+			dots = [];
+			currMarkers = {};
+		}
+		// init鍑芥暟缁戝畾鍒癎LOBAL.BMap涓�
+		gl.BMap.init = init;
+		
+		
+		// 鏌ヨ褰撳墠鑼冨洿鍐呭鐨勫浘鏍�
+		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.sId;
+	            	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;
+		
+		// 鏇存柊dots闆嗗悎鐨勬暟鎹�
+		function updateDots(data) {
+			for(var i=0; i<dots.length; i++) {
+				var _dots = dots[i];
+				if(_dots.sId == data.sId) {
+					_dots.msg = data.msg;
+				}
+			}
+		}
+		
+		// 灏嗗彉閲忕粦瀹氬埌鍛藉悕绌洪棿涓�
+		gl.BMap.updateDots = updateDots;
+		
+		// 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓�
+		gl.BMap.queryInRect = queryInRect;
+	})(jQuery, window, document, GLOBAL);
+	
+	
+	// 鍦板浘鏈烘埧鎼滅储妯″潡
+	;(function($, window, document, gl, undefined) {
+		// 璁剧疆鍛藉悕绌洪棿BMap.Search妯″潡
+		gl.namespace('BMap.Search');
+		
+		var homeInfor = [];
+		
+		// 璁剧疆homeInfor鐨勫��
+		function setHomeInfor(data) {
+			homeInfor = data;
+		}
+		// 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓�
+		gl.BMap.Search.setHomeInfor = setHomeInfor;
+		
+		// 鏍规嵁homeInfor鐨勫�艰繑鍥瀐ome鍒楄〃
+		function getHomeList() {
+			var rs = [];
+			// 閬嶅巻homeInfor鐨勫��
+			for(var i=0; i<homeInfor.length; i++) {
+				rs.push(homeInfor[i].title);
+			}
+			return rs;
+		}
+		// 灏嗗嚱鏁扮粦瀹氬埌鍛藉悕绌洪棿涓�
+		gl.BMap.Search.getHomeList = getHomeList;
+	})(jQuery, window, document, GLOBAL);
+	
+	// 鏌ヨ骞惰缃満鎴跨殑鍥炬爣
+	$(function () {
+		searchStation(true);
+	});
+	
+	
+	var allStation = [];
+	var mapPages = {
+		pageSize:50, 				// 姣忛〉鐨勮鏁�
+		pageCurr:1,  				// 褰撳墠椤电爜鏁�
+		pageAll:1,					// 鏁扮洰
+		pageNum: 0,
+		pageNew: true
+	};
+	
 	//鏌ヨ鏈烘埧
-	function searchStation(){
+	function searchStation(setRect){
 		var temp = createSearchParam();
 		var json = JSON.stringify(temp);
-		commonDot = new Array();
-		warnDotList = new Array();
-		dischargeDotList = [];
-		behindCellList = [];
+		var bmap = GLOBAL.BMap;		// BMap鐨勫懡鍚嶇┖闂�
+		var init = bmap.init;
+		//init();
+		// 鏌ヨ鍚庡彴
 		$.ajax({ 	
 	        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);
+				// 鑾峰彇缁撴灉闆�
+				var rs = JSON.parse(data.result);
+				var list = rs.data;
+				// 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++){
-						//console.info("绗�"+i+"娆�:"+model.data[i].binformation.num);
-						//setAllStation(model.data[i],allStation);
-						var tmp = {
-							binformation:list[i].data,
-							alarm_num:list[i].code,		//鍛婅鏁扮洰
-							low_num:list[i].sum,		//钀藉悗鏁扮洰
-							delay_num:list[i].newsum,	//寤舵椂鏁扮洰
-							msg: list[i].msg
-						};
-						allStation.push(analyzeData(tmp));
+						var _list = list[i];
+						allStation.push(formatAllStation(_list));
 					}
-					//console.info(allStation);
-					createMapDot(map, allStation);
+					// 鏄剧ず鍖哄煙鐨勫浘鏍�
+					bmap.setDots(allStation);
+					bmap.queryInRect(map, createMapDot);
+					updateStation();
 					
-					//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]));
+					// 鏄惁绗竴娆℃墽琛�
+					if(setRect) {
+						map.addEventListener("moveend", bmap.queryInRect.bind({},map, createMapDot));  // 鎷栧姩
+						map.addEventListener("zoomend", bmap.queryInRect.bind({},map, createMapDot)); // 缂╂斁
+						
 					}
 				}
-				
-				// 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
-				map.clearOverlays();
-				mkList = [];
-				
-				addCommonDotHome(commonDot);
-				createWarnDot(map, warnDotList);
-				dischargeTimeOut(map, dischargeDotList);
-				behindDotCell(map, behindCellList); */
         	} 				
 		});
 	}
 	
+	// 鏍煎紡鍖栨煡璇㈢粨鏋�
+	function formatAllStation(list) {
+		var obj = new Object();
+		// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+		var point = GPS.wgs2bd(list.latitude, list.longitude);
+		// 鏋勯�犵粨鏋滈泦
+		obj.lng = point.lon;
+		obj.lat = point.lat;
+		obj.title = list.StationName;
+		obj.sId = list.StationId;
+		obj.fbsId = list.FBSDeviceId;
+		obj.addr = list.Address;
+		obj.msg = "";
+		obj.num = list.num;
+		return obj;
+	}
+	
+	// 璁剧疆鍒嗛〉鐨勪俊鎭�
+	function setMapPages() {
+		var pageNum = Math.ceil(mapPages.pageAll/mapPages.pageSize);
+		mapPages.pageNum = pageNum;
+		mapPages.pageNew= true;
+	}
+	
+	// 杞鏇存柊鍦板浘鐨勭偣鏌ヨ
+	function updateStation() {
+		var bmap = GLOBAL.BMap;		// BMap鐨勫懡鍚嶇┖闂�
+		var updateStationData = [];
+		$.ajax({
+			type: "post",
+			url: "BattMap_informationAction!searchUserManageStation2",				
+	        async: true,				
+	        dataType:'json',
+	        data: "json="+JSON.stringify(mapPages),
+	        success: function(result) {
+	        	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, true);
+	        	// 鏇存柊鍒嗛〉淇℃伅
+	        	mapPages.pageCurr++;
+	        	if(mapPages.pageCurr>mapPages.pageNum || updateStationData.length<mapPages.pageSize) {
+	        		mapPages.pageCurr=1;
+	        		mapPages.pageNew=false;
+	        	}
+	        	
+	        	setTimeout(updateStation, 4000);
+	        	
+	        }
+		});
+	}
+	
+	// 鏍煎紡鍖栨煡璇㈢粨鏋�
+	function formatUpdateStation(list) {
+		var obj = {};
+		var data = list.data;
+		console.log(list);
+		// GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+		var point = GPS.wgs2bd(data.latitude, data.longitude);
+		// 鏋勯�犵粨鏋滈泦
+		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;
+		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 stationInfo = getStaionByPoint(point);
+		if(!stationInfo) {
+			alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
+			return;
+		}
+		var temp = {
+			StationId: stationInfo.sId
+		};
+		// 鏌ヨ闈㈡澘淇℃伅
+		$.ajax({
+			type: 'post',
+			async: true,
+			url: 'BattMap_informationAction!searchUserManageStation3',
+			data: 'json='+JSON.stringify(temp),
+			dataType: 'json',
+			success: function(result) {
+				var rs = JSON.parse(result.result);
+				if(rs.length != 0) {
+					var data = rs[0];
+					//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;"><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 city" value="'+data.data.stationName2+'">';
+					
+					var list = {
+						title: data.data.StationName,
+						content: content
+					};
+					
+					showMapPanelByPoint(point, list);
+				}
+				
+			}
+		});	
+	}
+	
+	
+	// 鏍规嵁缁忕含搴﹁幏鍙栨満鎴跨殑淇℃伅
+	function getStaionByPoint(point) {
+		var stationInfo = false;
+		// 閬嶅巻鎵�鏈夋満鎴�
+		for(var i=0; i<allStation.length; i++) {
+			var info = allStation[i];
+			if(info.lng == point.lng && info.lat == point.lat) {
+				stationInfo = info;
+			}
+		}
+		return stationInfo;
+	}
 	function setAllStation(obj,allstation){
 		//console.info(allstation);
 		var flag = false;
 		var index = 0;
-		for(var i = 0;i < allstation.length;i++){
+		for(var i = 0;i < allStation.length;i++){
 			//console.info(obj.binformation.num + "==" + allstation[i].binformation.num);
 			if(obj.binformation.num == allstation[i].binformation.num){
 				flag = true;
@@ -2145,16 +2527,18 @@
 	}
 	// 瀹氫綅鍒板疄鏃舵暟鎹〉闈�
 	function loadToRealTime() {
-		var battgroupId = $('.ipt-hide').eq(0).val();
-		var homeId = $('.ipt-hide').eq(1).val();
-		window.open('control.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+		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);
 	}
 
 	// 瀹氫綅鍒板巻鍙叉暟鎹〉闈�
 	function loadToOldTime() {
-		var battgroupId = $('.ipt-hide').eq(0).val();
-		var homeId = $('.ipt-hide').eq(1).val();
-		window.open('charge-test.jsp?battgroupId='+battgroupId+'&stationId='+homeId);
+		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);
 	}
 	
 	//瀹氫綅鍒板憡璀﹂〉闈�
@@ -2288,11 +2672,10 @@
 					text: '鍒犻櫎',
 					callback: function(e) {
 						//console.info(allStation);
-						console.info(mk);
+						console.info(allStation);
 						var temp = getStationMap(allStation, mk.point);
-						if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.StationName+"'鐨勪綅缃俊鎭悧锛�")){
+						if(confirm("纭浠庡湴鍥句笂鍒犻櫎'"+temp.title+"'鐨勪綅缃俊鎭悧锛�")){
 							if(temp != undefined){
-								//console.info(temp);
 								var json = JSON.stringify(temp);
 								$.ajax({ 	
 							        type: "post", 				
@@ -2334,8 +2717,8 @@
 	function getStationMap(list,localposi){
 		if(list != undefined){
 			for(var i = 0 ; i < list.length ; i++){
-				if(list[i].binformation.latitude == localposi.lat && list[i].binformation.longitude == localposi.lng){
-					return list[i].binformation;
+				if(list[i].lat == localposi.lat && list[i].lng == localposi.lng){
+					return list[i];
 				}
 			}
 		}
@@ -2596,6 +2979,7 @@
 		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.defaults = mapDefults;
 		return rs;
 	}
 	/* $(function(){
@@ -2874,6 +3258,9 @@
 	 function getMapStateImg(imgs, cla) {
 	 	var rs = imgs.normal;
 	 	switch(cla) {
+	 		case 'item-normal':
+	 			rs = imgs.normal;
+	 			break
 	 		case 'item-warn':	// 鍛婅
 	 			rs = imgs.warn;
 	 			break;
@@ -2894,6 +3281,9 @@
 	 			break;
 	 		case 'item-pre_charge':	// 61850棰勫厖鐢�
 	 			rs = imgs.precharge;
+	 			break;
+	 		default:
+	 			rs = imgs.defaults;
 	 			break;
 	 	}
 	 	
@@ -3065,73 +3455,212 @@
     		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();
+		$('#map').on('click', '.search .search-btn', function() {
+			var posTxt = $('#map .search .pos-txt').val();
+			addrAnalyze(posTxt);
+		});
+	});
+	
+	layui.use(['form', 'layer', 'laytpl'], function() {
+		var form = layui.form;
+		var layer = layui.layer;		
+		var laytpl = layui.laytpl;
+		
+		// 鐐瑰嚮楗肩姸鍥鹃厤缃�
+		$('#faCog').click(function() {
+			searchUserBieState();	// 鏌ヨ褰撳墠楗肩姸鍥剧殑閰嶇疆鐘舵��
+		});
+		
+		var layerMsg;
+		
+		// 鐐瑰嚮閰嶇疆椤瑰閫夋
+		$('body').on('click', '#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]', function(event) {
+			layer.close(layerMsg);
+			var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');
+			var num = 0;
+			iptList.each(function() {
+				if($(this).is(':checked')) {
+					num++;
+				}
+			});
+			if(num>4) {
+				layerMsg = layer.msg("鏈�澶氶�夋嫨鍥涗釜锛�", {
+					type: 1
+				});
+				$(this).prop('checked', false);
 			}
-		});
-		
-		// 鐢熸垚涓�绾у鑸�-鐪�
-		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'));
+		});
+		
+		
+		var pie = GLOBAL.Index.Pie;
+		var pieType = pie.pieType;
+		var pieConfTpl =  getTpl('iframe/pie-config.html');
+		//鏌ヨ褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
+		function searchUserBieState(){
+			$.ajax({ 	
+		        type:"post", 								
+		        url: "Echarts_usrAction!serchByCondition",						
+		        async:true,				
+		        dataType:'json',
+		        data:null,		
+		        success: function(data){ 
+					var model = eval('('+data.result+')');
+					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);
+								}
+							});
+						});
+					}
+					
+		       	} 				
+			});
+		}
+		
+		// 鏍煎紡鍖栨煡璇㈢粨鏋�
+		function formatPieRsData(result) {
+			var data={};
+			data.tblData=[];
+			// 閬嶅巻pieType鐨勭被鍨�
+			for(var i=0; i<pieType.length; i++) {
+				var tmp = {};
+				var num = i+1;
+				var key = 'echarts'+num+'_enable';
+				tmp.name = pieType[i].name;
+				tmp.status = result[key];
+				data.tblData.push(tmp);
 			}
+			
+			return data;
+		}
+		
+		
+		// 鏋勯�犳洿鏂伴ゼ鐘跺浘鍙傛暟
+		function structUpdatePie(arr) {
+			var rs = {
+				echarts1_enable:0,
+				echarts2_enable:0,
+				echarts3_enable:0,
+				echarts4_enable:0,
+				echarts5_enable:0,
+				echarts6_enable:0,
+				echarts7_enable:0,
+				echarts8_enable:0,
+				echarts9_enable:0,
+				echarts10_enable:0
+			};
+			
+			// 閬嶅巻arr缁檙s鍊奸噸瀹氫箟
+			for(var i=0; i<arr.length; i++) {
+				var num = i+1;
+				var key = 'echarts'+num+'_enable';
+				rs[key] = arr[i];
+			}
+			
+			return rs; 
+		}
+		
+		// 鏇存柊褰撳墠鐢ㄦ埛璁剧疆楗肩姸鍥剧殑浣胯兘鐘舵��
+		function updateUserBieState(temp, dialog, load){
+			// 鏇存柊鍚庡彴鏁版嵁
+			$.ajax({ 	
+		        type:"post", 								
+		        url: "Echarts_usrAction!add",						
+		        async:true,				
+		        dataType:'json',
+		        data:'json='+JSON.stringify(temp),		
+		        success: function(data){ 
+		        	layer.closeAll();
+		        	
+					var model = eval('('+data.result+')');
+					if(model.code == 1) {
+						layer.msg('閰嶇疆鎴愬姛锛侊紒锛�');
+					}else {
+						layer.msg('閰嶇疆澶辫触锛侊紒锛�');
+					}
+	        	} 				
+			});
+		}
+		
+		// 鍦板浘宸︿笂鏂归潰鏉挎ā鍧�
+		var mapViewArea = GLOBAL.BMap.mapViewArea;	// 鍦板浘鏄剧ず鍖哄煙鐨勪俊鎭�
+		// 鐐瑰嚮闈㈡澘涓婃柟鐨勫皬鍥炬爣鏄剧ず璁惧畾淇℃伅
+		$('#showMapInfoDetail').click(function() {
+			$('.map-info-detail').slideToggle();
 		});
 		
-		$('#map').on('dblclick', function() {
-			setLside();
-			treeView.setContainer();
+		// 鐐瑰嚮闅愯棌
+		$('.map-info-detail .map-panel-hide').click(function() {
+			$('.map-info-detail').slideUp();
 		});
 		
-		// 璁剧疆lside鐨勯珮搴�
-		setLside();
-		treeView.setContainer();
-		setLside();
-		$(window).resize(function() {
-			setLside();
+		// 閬嶅巻mapViewArea鑾峰彇mapVsAreaSel涓嬫媺妗嗙殑鍊�
+		var mapVsAreaSel = $('#mapVsAreaSel');
+		var mapVsAreaSelOpts = [];
+		for(var i=0; i<mapViewArea.length; i++) {
+			var _data = mapViewArea[i];
+			var tmp = getOptionsData(_data.name, _data.area, _data);
+			mapVsAreaSelOpts.push(tmp);
+		}
+		// 鐢熸垚闈㈡澘涓殑mapVsAreaSel
+		createOptions(mapVsAreaSel, mapVsAreaSelOpts);
+		// 鏄剧ず榛樿鍖哄煙-涓浗
+		setMapViewArea(mapViewArea[0]);
+		centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
+		// 鐐瑰嚮闈㈡澘纭畾鎸夐挳
+		$('#mapPanelEn').click(function() {
+			var areaData = mapVsAreaSel.find('option:selected').data('attr');
+			
+			// 璁剧疆澶撮儴鍙鍖哄煙鐨勬枃鏈�
+			$('#mapVsArea').text(areaData.name);
+			
+			// 璁剧疆鍙鍖哄煙
+			setMapViewArea(areaData);
 		});
 		
-		// 璁剧疆lside鐨勯珮搴﹀嚱鏁�
-		function setLside() {
-			var sideBar = $('.side-bar');
-			var lside = $('.side-bar .lside');
-			// 璁剧疆瀹介珮
-			lside.width(sideBar.width());
-			lside.height(sideBar.height());
+		// 璁剧疆鍦板浘鐨勫彲瑙嗗尯鍩�
+		function setMapViewArea(data) {
+			var left = new BMap.Point(data.left.lng, data.left.lat);
+			var right = new BMap.Point(data.right.lng, data.right.lat);
+			var b = new BMap.Bounds(left, right);
+			
+			var cLng = (data.left.lng+data.right.lng)/2;
+			var cLat = (data.left.lat+data.right.lat)/2;
+			var f = new BMap.Point(cLng, cLat);
+			map.panTo(f, {
+                noAnimation: "no"
+            });
+			
+			
+			try {
+				BMapLib.AreaRestriction.setBounds(map, b);
+			} catch (e) {
+				alert(e);
+			}
 		}
 	});
 	</script> 

--
Gitblit v1.9.1