From e28496f652b3914e70d8a5075e4ad0ee04e2f2a5 Mon Sep 17 00:00:00 2001 From: hdw <hdw@192.168.7.127> Date: 星期一, 14 一月 2019 18:04:13 +0800 Subject: [PATCH] 机房信息面板中添加机房地图信息 --- gx_tieta/WebRoot/ex-battinfo.jsp | 51 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 38 insertions(+), 13 deletions(-) diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp index b40fef5..b84e05f 100644 --- a/gx_tieta/WebRoot/ex-battinfo.jsp +++ b/gx_tieta/WebRoot/ex-battinfo.jsp @@ -137,6 +137,7 @@ <script type="text/javascript" src="src/layui.js"></script> <script type="text/javascript" src="pages/js/mylayui.js"></script> <script type="text/javascript" src="pages/js/common.js"></script> + <script type="text/javascript" src="pages/js/GPS.js"></script> <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script> <script type="text/javascript"> var permits; @@ -602,20 +603,44 @@ // 鏌ョ湅鏈烘埧淇℃伅 function lookHomeInfo(data) { var sid = data.StationId; - var tabC = [ - { - type: 'env' - ,title: '鍩虹珯鐜鐭棰�' - ,tshow: '' - ,cshow: '' - } - ,{ - type: 'envImg' - ,title: '鍩虹珯鐜鍥鹃泦' - ,tshow: 'layui-this' + var lng = data.longitude; // 缁忓害 + var lat = data.latitude; // 绾害 + var addr = data.address; // 鍦板潃 + var bdPoint = GPS.wgs2bd(lat, lng); // 鐧惧害鐨勭粡绾害 + // console.log(data); + // 璁剧疆璇诲彇鍚庡彴鐨勬暟鎹� + var tabC = []; + var isHomeMap = false; + // 鍒ゆ柇缁忕含搴︽槸鍚﹀瓨鍦� + if(lat != 0 && lng != 0) { + isHomeMap = true; + // 娣诲姞homeMap妯″潡 + tabC.push({ + type: 'homeMap' + ,title: '鏈烘埧瀹氫綅' + ,tshow: 'layui-this' ,cshow: 'layui-show' - } - ]; + ,homeName: '' + ,lat: bdPoint.lat + ,lng: bdPoint.lon + ,addr: addr + }); + } + + // 娣诲姞鍩虹珯鐜鐭棰戞ā鍧� + tabC.push({ + type: 'env' + ,title: '鍩虹珯鐜鐭棰�' + ,tshow: '' + ,cshow: '' + }); + // 娣诲姞鍩虹珯鐜鍥鹃泦妯″潡 + tabC.push({ + type: 'envImg' + ,title: '鍩虹珯鐜鍥鹃泦' + ,tshow: isHomeMap?'': 'layui-this' + ,cshow: isHomeMap?'': 'layui-show' + }); showHomeInfoIframe(sid, tabC); } -- Gitblit v1.9.1