From 5406dfa891fa58cdb0e26a245de2287b49d082a0 Mon Sep 17 00:00:00 2001
From: 星伟 <星伟@192.168.10.25>
Date: 星期三, 26 九月 2018 17:52:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/index.jsp | 47 +++++++++--------------------------------------
1 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 5f87e45..53f5b4b 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -29,6 +29,7 @@
<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" />
<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">
@@ -92,9 +93,6 @@
<div id="content">
<div class="nav-map small">
<!-- 鐢垫睜鍒嗗竷鍥� -->
- <div class="side-bar abs">
- <div class="lside"></div>
- </div>
<div class="china-map" id="map">
<div class="img-change" style="display:none;">
<div class="img-list">
@@ -309,6 +307,7 @@
<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="js/panel.js"></script>
<script type="text/javascript" src="js/search.js"></script>
<script type="text/javascript" src="js/changePinYin.js"></script>
@@ -398,11 +397,6 @@
$('#main .del-module').remove(); //绉婚櫎class="del-module"鐨勫唴瀹�
//鏍规嵁楗肩姸鍥剧殑鏁伴噺纭畾浣嶇疆鍜屽ぇ灏�
getMapHt();
-
- $('.side-bar').resizable({
- minWidth: 190,
- maxWidth: 500
- });
/* switch(pieLen){
case 0:
$('#main .china-map').remove();
@@ -674,7 +668,7 @@
createIconExplain($('#map'));
- searchAllProvince(); // 鐢熸垚缁存姢鍖哄垪琛�
+ //searchAllProvince(); // 鐢熸垚缁存姢鍖哄垪琛�
/* addCommonDotHome(commonDot);
createWarnDot(map, warnDotList);
dischargeTimeOut(map, dischargeDotList);
@@ -1600,14 +1594,12 @@
function createMapDot(map, dotList) {
// 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
mkList = [];
-
// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
for(var i = 0; i < dotList.length; i++) {
- var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
-
+ var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[0].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鐐�
+ var mk = new BMap.Marker(pt, {icon: dotIcon}); // 瀹氫箟marker鐐�
addMenu(mk, mapDel);
deletePoint(map, dotList[i].title);
// 鍚憁k鐐规坊鍔爈abel
@@ -1632,6 +1624,8 @@
map.addOverlay(mk);
}
}
+
+ //
// 鍒犻櫎鍦板浘涓婄殑鎸囧畾鐐�
function deletePoint(map, msg){
@@ -1992,12 +1986,10 @@
success: function(data){
data = eval('('+data+')');
var list = eval('('+data.result+')');
- //console.info(list);
+ console.log(list.length);
allStation = new Array();
if(list!=undefined && list.length>0){
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, //鍛婅鏁扮洰
@@ -2010,29 +2002,8 @@
//console.info(allStation);
createMapDot(map, allStation);
- setTimeout(searchStation, 4000);
+ //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]));
- }
- }
-
- // 娓呯┖瑕嗙洊鐗╁拰瀵瑰簲鐨刴k鐐�
- map.clearOverlays();
- mkList = [];
-
- addCommonDotHome(commonDot);
- createWarnDot(map, warnDotList);
- dischargeTimeOut(map, dischargeDotList);
- behindDotCell(map, behindCellList); */
}
});
}
--
Gitblit v1.9.1