From 6639ea77d0cf5572e30472de3fb707ad06b9399c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 13:12:40 +0800
Subject: [PATCH] 设备状态记录查询
---
gx_tieta/WebRoot/index.jsp | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 6015b53..0a5081b 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -369,6 +369,7 @@
<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="pages/js/pages/index-common.js"></script>
+ <script type="text/javascript" src="pages/js/GPS.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>
@@ -627,7 +628,7 @@
centerMapByPoint(map); // 鏍规嵁褰撳墠鐢ㄦ埛璁惧畾鐨勪綅缃樉绀轰腑蹇冪偣
map.enableScrollWheelZoom();
map.disableDoubleClickZoom();
- map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍�
+ //map.setMapStyle({style: 'grayscale'}); // 璁剧疆鍦板浘鐨勯鏍�
// 娣诲姞鍦板浘绫诲瀷鎺т欢
map.addControl(new BMap.MapTypeControl());
// 缁欏湴鍥炬坊鍔犲伐鍏锋潯(鍦板浘-鍗槦-涓夌淮)鍜屾瘮渚嬪昂鎺т欢
@@ -1731,7 +1732,7 @@
magImgStyles.push(imgStyle);
}
});
-
+ magImgStyles.push('');
// 鏍规嵁褰撳墠鍐呭鏇存柊鍦板浘鍥炬爣
searchStation();
}
@@ -1986,6 +1987,8 @@
function getAddHomeInfo() {
var lng = $('.add-panel .lng').text(); // 鑾峰彇缁忓害
var lat = $('.add-panel .lat').text(); // 鑾峰彇绾害
+ var wgsPoint = GPS.bd2wgs(lat, lng); // 鐧惧害鍦板浘鍧愭爣杞寲涓篏PS
+
var addr = $('.add-panel .addr').text(); // 鑾峰彇鍦板潃
var homeName = $('.add-panel select option:selected').text(); // 鏈烘埧鍚嶇О
var homeId = $('.add-panel select option:selected').val(); // 鏈烘埧ID
@@ -1994,8 +1997,8 @@
StationId:homeId, //鏈烘埧缂栧彿
StationName:homeName, //鏈烘埧鍚嶇О
Address:addr, //鏈烘埧鐗╃悊淇℃伅
- longitude:lng, // 缁忓害
- latitude:lat, // 绾害
+ longitude: wgsPoint.lon, // 缁忓害
+ latitude: wgsPoint.lat, // 绾害
information:"", //澶囨敞
};
var json = JSON.stringify(temp);
@@ -2265,9 +2268,11 @@
// 鏍煎紡鍖栨煡璇㈢粨鏋�
function formatAllStation(list) {
var obj = new Object();
+ // GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+ var point = GPS.wgs2bd(list.latitude, list.longitude);
// 鏋勯�犵粨鏋滈泦
- obj.lng = list.longitude;
- obj.lat = list.latitude;
+ obj.lng = point.lon;
+ obj.lat = point.lat;
obj.title = list.StationName;
obj.sId = list.StationId;
obj.fbsId = list.FBSDeviceId;
@@ -2326,9 +2331,12 @@
function formatUpdateStation(list) {
var obj = {};
var data = list.data;
+ console.log(list);
+ // GPS鍧愭爣杞寲涓虹櫨搴﹀潗鏍�
+ var point = GPS.wgs2bd(data.latitude, data.longitude);
// 鏋勯�犵粨鏋滈泦
- obj.lng = data.longitude;
- obj.lat = data.latitude;
+ obj.lng = point.lon;
+ obj.lat = point.lat;
obj.title = data.StationName;
obj.sId = data.StationId;
obj.fbsId = data.FBSDeviceId;
@@ -2373,7 +2381,7 @@
var rs = JSON.parse(result.result);
if(rs.length != 0) {
var data = rs[0];
- console.info(data);
+ //console.info(data);
var content = '<div style="padding:6px;"><span>钃勭數姹犵粍鍛婅鏁扮洰锛�</span>'+data.code+'<a style="margin-left: 14px" href="javascript:loadToWarnPage();">璇︽儏>></a></div>'+
'<div style="padding:6px;"><span>钃勭數姹犵粍钀藉悗鏁扮洰锛�</span>'+data.sum+'<a style="margin-left: 14px" href="javascript:loadToBehindPage();">璇︽儏>></a></div>'+
'<div style="padding:6px;"><span>钃勭數姹犵粍寤舵椂鏁扮洰锛�</span>'+data.newsum+'<a style="margin-left: 14px" href="javascript:loadToDischargeDelay();">璇︽儏>></a></div>'+
--
Gitblit v1.9.1