From 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 18 一月 2019 09:01:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/iframe/homeinfo.html | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/iframe/homeinfo.html b/gx_tieta/WebRoot/iframe/homeinfo.html
index 4a8eeb3..623d4a1 100644
--- a/gx_tieta/WebRoot/iframe/homeinfo.html
+++ b/gx_tieta/WebRoot/iframe/homeinfo.html
@@ -9,7 +9,11 @@
<link rel="stylesheet" href="../src/css/layui.css">
<link rel="stylesheet" href="../css/common.css">
<link rel="stylesheet" href="../pages/css/mylayui.css">
- <link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.css">
+ <link rel="stylesheet" href="../font-awesome-4.7.0/css/font-awesome.css">
+ <!-- 瀵煎叆鐧惧害鍦板浘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>
<style>
body.homeinfo-tab .layui-tab {
margin: 0;
@@ -288,7 +292,7 @@
</table>
</div>
{{# }else if(item.type == 'env'){ }}
- <div class="layui-tab-item">
+ <div class="layui-tab-item {{ item.cshow }}">
<div id="video" style="width: 100%;height: 100%;"></div>
<div id="videos" class="video-list">
<div class="video-list-container">
@@ -338,7 +342,7 @@
</div>
</div>
{{# }else if(item.type == 'envImg'){ }}
- <div class="layui-tab-item">
+ <div class="layui-tab-item {{ item.cshow }}">
<div class="layui-carousel" id="imgCarousel" lay-filter="imgCarousel">
<div carousel-item="" class="carousel-item" id="carouselItems"></div>
</div>
@@ -373,6 +377,10 @@
</div>
</div>
</div>
+ {{# }else if(item.type=='homeMap'){ }}
+ <div class="layui-tab-item {{ item.cshow }}">
+ <div id="BMap" style="width: 100%; height: 100%;"></div>
+ </div>
{{# } }}
{{# }); }}
</div>
@@ -387,7 +395,7 @@
var tabTpl = $('#homeTab').html();
var homeInfo = parent.$('#homeInfoIframeData').data('data');
- //console.log(homeInfo);
+ console.log(homeInfo);
updatehomeInfoTab(homeInfo);
// 閲嶆柊娓叉煋
@@ -455,6 +463,7 @@
VideoOrImage: 'video'
})
}
+ ,exts: 'mp4|MOV|avi|rmvb'
,accept: 'video' //瑙嗛
,choose: function(obj) {
var files = this.files = obj.pushFile();
@@ -704,6 +713,74 @@
carousel.reload(options);
}
+
+ // 鏈烘埧鍦板浘妯″潡
+ var bMap = $('#BMap');
+ // 鍒ゆ柇鍦板浘瀹瑰櫒鏄惁瀛樺湪
+ if(bMap.length != 0) {
+ // 鍒涘缓鍦板浘
+ let map = createMap();
+ // 鐢熸垚鍦板浘鍥炬爣
+ createMapPoint(map);
+ }
+
+ // 鐢熸垚鍦板浘
+ function createMap() {
+ let map = new BMap.Map('BMap');
+ var point = new BMap.Point(125.3192,43.8090);
+ map.centerAndZoom(point, 11); // 鐢ㄥ煄甯傚悕璁剧疆鍦板浘涓績鐐�
+ map.enableScrollWheelZoom();
+ map.disableDoubleClickZoom();
+ // 娣诲姞鍦板浘绫诲瀷鎺т欢
+ map.addControl(new BMap.MapTypeControl());
+ // 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
+ let bottom_left_control = new BMap.ScaleControl({anchor:BMAP_ANCHOR_BOTTOM_LEFT});
+ map.addControl(bottom_left_control); // 娣诲姞姣斾緥灏哄埌鍦板浘
+
+ return map;
+ }
+
+ // 鐢熸垚鍦板浘鍥炬爣骞剁Щ鍔ㄥ埌涓績浣嶇疆
+ function createMapPoint(map) {
+ var homeData = getTabCItem('homeMap', homeInfo.tabc);
+ // 鍒ゆ柇鏄惁鑾峰彇鍒颁簡
+ if(homeData.code == 1) {
+ console.log(homeData);
+ var point = new BMap.Point(homeData.data.lng, homeData.data.lat);
+ var mk = new BMap.Marker(point);
+ var label = new BMap.Label("鏂版満鎴�",{offset:new BMap.Size(20,-10)});
+ label.setStyle({display: 'none', padding: '4px 2px'});
+ mk.disableDragging(); // 璁剧疆涓嶅彲鎷栧姩
+ map.addOverlay(mk); // 灏嗚鐩栫墿娣诲姞鍒板湴鍥句腑
+ mk.setLabel(label); // 缁欒鐩栫墿娣诲姞label鎻愮ず
+ map.panTo(point); // 灏嗗湴鍥剧Щ鍔ㄥ埌娣诲姞鐨勭偣浣嶇疆
+ map.setZoom(20); // 璁剧疆鍦板浘鐨勭缉鏀剧瓑绾�
+ }else {
+ layer.msg('鑾峰彇鏈烘埧淇℃伅澶辫触');
+ }
+ }
+
+ // 鑾峰彇鎸囧畾鐨則abC鍐呭
+ function getTabCItem(type, tabs) {
+ let rs = {
+ code: 0
+ ,data: {}
+ ,msg: '鏈娴嬪埌淇℃伅'
+ };
+ // 閬嶅巻tabs
+ for(let i=0; i<tabs.length;i++) {
+ let _tab = tabs[i];
+ if(_tab.type == type) {
+ rs.code = 1;
+ rs.data = _tab;
+ rs.msg = '鑾峰彇鎴愬姛' ;
+ break;
+ }
+ }
+
+ return rs;
+ }
+
});
</script>
</body>
--
Gitblit v1.9.1