From f196bbea81977c5e0cf5906cba2609a547fd6a3b Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期六, 29 十二月 2018 15:30:54 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/map.html | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/map.html b/gx_tieta/WebRoot/mobil/map.html
index 1484298..5b09b61 100644
--- a/gx_tieta/WebRoot/mobil/map.html
+++ b/gx_tieta/WebRoot/mobil/map.html
@@ -280,6 +280,7 @@
,anim: 4
,content: 'iframe/homeinfo.html'
});
+ layer.full(iframePopup);
}
// 鐐瑰嚮绛涢�夊脊鍑哄唴瀹�
@@ -293,6 +294,7 @@
,anim: 4
,content: 'iframe/homeinfo.html'
});
+ layer.full(iframePopup);
});
// 鎼滅储鏈烘埧鑾峰彇鐒︾偣
@@ -307,6 +309,7 @@
,anim: 5
,content: 'iframe/searchHome.html'
});
+ layer.full(iframePopup);
});
// 鏌ヨ鏈烘埧
@@ -472,7 +475,7 @@
'<br>'+
'<div class="t-align-right">'+
'<a href="javascript:seenHomeInfo();" class="map-panel-seen-btn mrl8">鏌ョ湅</a>'+
- /* '<a href="javascript:editHomeInfo();" class="map-panel-seen-btn mrl8">淇敼</a>'+ */
+ '<a href="javascript:editHomeInfo();" class="map-panel-seen-btn mrl8">淇敼</a>'+
'<a href="javascript:showTempMap();" class="map-panel-seen-btn mrl8">閲嶆柊瀹氫綅</a>'+
'<a href="javascript:delHomeInfo();" class="map-panel-seen-btn mrl8">鍒犻櫎</a>'+
'</div>'+
@@ -530,6 +533,7 @@
,anim: 4
,content: 'iframe/homeinfo.html'
});
+ layer.full(iframePopup);
}
// 鍒犻櫎鍦板浘鍥炬爣
@@ -695,6 +699,8 @@
});
map.addOverlay(mk); // 娣诲姞瑕嗙洊鐗�
+ // 鏇存柊鍐呭
+ updateAllStationData(name, lng, lat);
locationByHomeName(map, name);
@@ -736,6 +742,7 @@
,anim: 4
,content: 'iframe/seenhomeinfo.html'
});
+ layer.full(iframePopup);
}
// 鏄剧ず鍦板浘鎻愮ず闈㈡澘
@@ -869,6 +876,20 @@
history.pushState(null, null, location.href );
//姝ゅ鍔犲叆鍥為��鏃朵綘瑕佹墽琛岀殑浠ｇ爜
});
+
+ // 鏇存柊鎵�鏈夋満鎴跨殑淇℃伅
+ function updateAllStationData(name, lng, lat) {
+ console.log(allStation);
+ for(var i=0; i<allStation.length; i++) {
+ var _data = allStation[i];
+ if(_data.title == name) {
+ _data.lng = lng;
+ _data.lat = lat;
+ }
+ }
+ }
+
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1