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 |  474 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 413 insertions(+), 61 deletions(-)

diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 2f681a8..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
@@ -81,9 +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>
 	
@@ -97,7 +109,45 @@
 		<jsp:include page="nav.jsp" flush="true"/>
 		<!--瀵艰埅缁撴潫-->
 		<div id="content">
+			
 			<div class="nav-map small">
+				<!-- 鍦板浘鍐呭绛涢��  -->
+				<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;">
@@ -137,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>
 				<!-- 鐢垫睜鍛婅楗肩姸鍥� -->
@@ -314,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");
@@ -339,6 +396,7 @@
 	var search;
 	var warnOpts;
 	//console.info(BMap);
+	var mapDefults = new Image().src = 'image/mapDefault.gif';
 	var mapImages = getMapImageUrl();
 	// 瀹氫箟鐪�-甯傝祫婧愬唴瀹�
 	var area = [
@@ -479,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();
 		});
 	});
 	
@@ -566,7 +628,7 @@
 				centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
 				map.enableScrollWheelZoom();
 				map.disableDoubleClickZoom();
-				map.setMapStyle({style: 'grayscale'});	//  璁剧疆鍦板浘鐨勯鏍�
+				//map.setMapStyle({style: 'grayscale'});	//  璁剧疆鍦板浘鐨勯鏍�
 				// 娣诲姞鍦板浘绫诲瀷鎺т欢
 				map.addControl(new BMap.MapTypeControl());
 				// 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
@@ -607,6 +669,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();
@@ -627,15 +700,11 @@
 							smallMap();
 						}
 					},
+					
 					{
-						text: '璁剧疆涓績鐐�',
-						callback: function(e) {
-							myConfirm.show({
-								title: '璁剧疆鍦板浘榛樿鏄剧ず浣嶇疆',
-								content: '鏄惁纭淇敼鍦板浘榛樿涓績鍧愭爣',
-								enfun:updateMapCenterPoint,
-								enparams:[e]
-							});
+						text: '杩斿洖涓績鐐�',
+						callback: function(e){
+							centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
 						}
 					}
 				];
@@ -1340,6 +1409,7 @@
 	});
 	
 	$(window).resize(function() {
+		console.log(123);
 		getMapHt();
 	});
 	// 鏀瑰彉div鐨勫ぇ灏�
@@ -1443,9 +1513,11 @@
 		
 		changeMapImgDesc(iconExplain, 'normal');
 		
-		mapEle.prepend(iconExplain);
+		mapEle.parent().append(iconExplain);
+		
+		// 璁剧疆鍦板浘鍥炬爣绉嶇被
+		setMapImgStyles();
 	}
-	
 	// 鍒囨崲鍦板浘鍥炬爣璇存槑
 	function changeMapImgDesc(iconExplain, type) {
 		iconExplain.find('.explain-list').remove();
@@ -1463,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);
 	}
 	
@@ -1501,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);
 		
@@ -1518,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);
 	}
 	
@@ -1577,17 +1657,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);
 			
@@ -1612,16 +1691,23 @@
 				//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]);
@@ -1634,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++) {
@@ -1738,7 +1853,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) {
@@ -1770,7 +1885,7 @@
 		var opts = {
 			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,
@@ -1872,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
@@ -1880,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);
@@ -1964,6 +2081,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鍙鍖哄煙锛屼互鍦扮悊鍧愭爣琛ㄧず  
@@ -2083,22 +2210,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",				
@@ -2117,21 +2243,22 @@
 					// 璁剧疆鍒嗛〉淇℃伅
 					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();
+					
 					// 鏄惁绗竴娆℃墽琛�
 					if(setRect) {
 						map.addEventListener("moveend", bmap.queryInRect.bind({},map, createMapDot));  // 鎷栧姩
 						map.addEventListener("zoomend", bmap.queryInRect.bind({},map, createMapDot)); // 缂╂斁
-						updateStation();
+						
 					}
 				}
         	} 				
@@ -2141,9 +2268,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;
@@ -2172,6 +2301,7 @@
 	        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);
@@ -2183,16 +2313,16 @@
 	        		}
 	        	}
 	        	
-	        	createMapDot(map, updateStationData);
-	        	
+	        	createMapDot(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;
 	        	}
 	        	
 	        	setTimeout(updateStation, 4000);
+	        	
 	        }
 		});
 	}
@@ -2201,9 +2331,12 @@
 	function formatUpdateStation(list) {
 		var obj = {};
 		var data = list.data;
+		console.log(list);
+		// 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;
@@ -2211,6 +2344,19 @@
 		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);
 	}
 	
 	// 鏌ヨ鏈烘埧闈㈡澘淇℃伅
@@ -2221,7 +2367,6 @@
 			alert('闈㈡澘淇℃伅鏌ヨ澶辫触锛�');
 			return;
 		}
-		
 		var temp = {
 			StationId: stationInfo.sId
 		};
@@ -2236,7 +2381,7 @@
 				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>'+
@@ -2834,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(){
@@ -3112,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;
@@ -3132,6 +3281,9 @@
 	 			break;
 	 		case 'item-pre_charge':	// 61850棰勫厖鐢�
 	 			rs = imgs.precharge;
+	 			break;
+	 		default:
+	 			rs = imgs.defaults;
 	 			break;
 	 	}
 	 	
@@ -3311,5 +3463,205 @@
 			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);
+			}
+			
+		});
+		
+		
+		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-info-detail .map-panel-hide').click(function() {
+			$('.map-info-detail').slideUp();
+		});
+		
+		// 閬嶅巻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);
+		});
+		
+		// 璁剧疆鍦板浘鐨勫彲瑙嗗尯鍩�
+		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> 
 </html>

--
Gitblit v1.9.1