~whychwj/haha.git

			@@ -114,37 +114,15 @@
			<!-- 地图内容筛选 -->
			<div class="map-info-panel-left w300">
			<div class="map-info-panel-content">
			<div class="map-info">
			<div class="map-info" id="showMapInfoDetail">
			<span>地图工具</span>
			<span class="map-info-btn-icon" id="showMapInfoDetail" title="详情"><i class="fa fa-angle-double-down"></i></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="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 colspan="2" class="alg-r btn-container">
			<button type="button" value="添加" id="mapToolAddHome" class="mrr8">添加</button>
			</td>
			</tr>
			</tbody>
			</table>
			</div>
			</div>
			<div class="layui-colla-item">
			<h2 class="layui-colla-title">定位机房</h2>
			<div class="layui-colla-content">
			<div class="layui-colla-content layui-show">
			<table>
			<tbody>
			<tr>
			@@ -159,6 +137,36 @@
			</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>
			@@ -379,6 +387,7 @@
			</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>
			@@ -393,6 +402,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");
			@@ -2458,11 +2469,13 @@
			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 = {
			@@ -3623,6 +3636,13 @@
			});
			}

			// 根据权限更新地图工具内容
			var permitAddHome = getPermit('batt_map_edit_permit', permits); // 添加机房的权限
			// 没有添加机房的权限
			if(!permitAddHome) {
			$('#permitAddHome').remove();
			}

			// 地图左上方面板模块-点击面板上方的小图标显示设定信息
			$('#showMapInfoDetail').click(function() {
			$('.map-info-detail').slideToggle();
			@@ -3658,6 +3678,55 @@
			}
			});

			/* 地图工具添加地图图标 */
			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;
			}
			});

			// 更新地图工具搜索机房