From ae8238281a5f6b1d8b5045ff85d604eb2ef20a2e Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.17>
Date: 星期一, 29 十月 2018 16:42:45 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 100 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 29 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 02a2a44..bb12f73 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" />
@@ -94,7 +96,6 @@
}
</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>
@@ -108,20 +109,35 @@
<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="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>
+ </div>
+ <div class="map-info-detail">
+ <table>
+ <tbody>
+ <tr>
+ <td class="w8em alg-c">鏈烘埧鏄剧ず绫诲瀷:</td>
+ <td>
+ <select name="mapIconStyleSel" id="mapIconStyleSel">
+ <option>鍏ㄩ儴</option>
+ <option>宸插畨瑁�</option>
+ <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>
<div class="nav-map small">
<!-- 鐢垫睜鍒嗗竷鍥� -->
<div class="china-map" id="map">
@@ -598,7 +614,7 @@
centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
map.enableScrollWheelZoom();
map.disableDoubleClickZoom();
- map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍�
+ //map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍�
// 娣诲姞鍦板浘绫诲瀷鎺т欢
map.addControl(new BMap.MapTypeControl());
// 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
@@ -639,6 +655,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();
@@ -659,17 +686,13 @@
smallMap();
}
},
+
{
- text: '璁剧疆涓績鐐�',
+ text: '杩斿洖涓績鐐�',
callback: function(e) {
- myConfirm.show({
- title: '璁剧疆鍦板浘榛樿鏄剧ず浣嶇疆',
- content: '鏄惁纭淇敼鍦板浘榛樿涓績鍧愭爣',
- enfun:updateMapCenterPoint,
- enparams:[e]
- });
+ centerMapByPoint(map);
}
- }
+ },
];
//console.info(getPermit('taskchange_edit_permit', permits)+"*******");
if(getPermit('batt_map_edit_permit', permits)) {
@@ -1372,6 +1395,7 @@
});
$(window).resize(function() {
+ console.log(123);
getMapHt();
});
// 鏀瑰彉div鐨勫ぇ灏�
@@ -1609,7 +1633,7 @@
}
// 鐢熸垚鍦板浘鍥炬爣
- function createMapDot(map, dotList) {
+ function createMapDot(map, dotList, isTop) {
// 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
mkList = [];
@@ -1644,6 +1668,11 @@
//showMapPanel(target, dotList);
searchPanelInfo(target);
});
+
+ if(isTop) {
+ mk.setTop(true);
+ }
+
mkList.push(mk);
// 鍚戝湴鍥炬坊鍔犺鐩栫墿
map.addOverlay(mk);
@@ -2204,7 +2233,7 @@
data: "json="+JSON.stringify(mapPages),
success: function(result) {
var data = JSON.parse(result.result);
- console.log(data);
+ //console.log(data);
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _list = formatUpdateStation(_data);
@@ -2216,12 +2245,12 @@
}
}
- console.log(updateStationData);
- createMapDot(map, updateStationData);
+ //console.log(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;
}
@@ -3493,7 +3522,20 @@
}
});
}
-
+ var mapViewArea = GLOBAL.BMap.mapViewArea;
+ // 鏄剧ず榛樿鍖哄煙-涓浗
+ setMapViewArea(mapViewArea[0]);
+ // 璁剧疆鍦板浘鐨勫彲瑙嗗尯鍩�
+ 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);
+ try {
+ BMapLib.AreaRestriction.setBounds(map, b);
+ } catch (e) {
+ alert(e);
+ }
+ }
});
</script>
</html>
--
Gitblit v1.9.1