From e54aa16987b0a62106fb80dd8901af76ee4002ba Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.127>
Date: 星期五, 18 一月 2019 12:31:27 +0800
Subject: [PATCH] 查看机房信息
---
gx_tieta/WebRoot/ex-battinfo.jsp | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 67 insertions(+), 26 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 3f28b68..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);
}
@@ -714,11 +739,7 @@
if(isUpdateTbl) {
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
-
- // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
- if(tabsIndex != 0) {
- table.render(tOptions);
- }
+ table.render(tOptions);
}
// console.log(456);
// 瀹炴椂鍥炶皟
@@ -856,6 +877,7 @@
,success: function(res) {
var rs = JSON.parse(res.result);
var resData = [];
+ var isUpdateTbl = false; // 鍒ゆ柇鏄惁娣诲姞/鍒犻櫎寰呴獙鏀惰〃鏍�
if(rs.code == 1) {
var data = rs.data;
// 閬嶅巻鏁版嵁鐨勫��
@@ -863,22 +885,41 @@
var _data = data[i];
var _tmp = formaterResData(_data);
resData.push(_tmp);
- acceptPage.setAll(_data.apply_note);
+
+ // 鍒ゆ柇鏄惁娣诲姞/鍒犻櫎寰呴獙鏀惰〃鏍�
+ if(_data.apply_note &&_data.apply_note != Page.all) {
+ acceptPage.setAll(_data.apply_note);
+ isUpdateTbl = true;
+ }
}
//console.log(resData);
}else {
acceptPage.setAll(0);
+ isUpdateTbl = true;
}
layuiTbl.setCache(table.cache.acceptTbl);
- // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
- for(var i=0; i<resData.length; i++) {
- var _resData = resData[i];
- _resData.doThings = '';
- // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
- if(tabsIndex != 1) {
- layuiTbl.updateTr(i, _resData);
+ if(isUpdateTbl) {
+ // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
+ for(var i=0; i<resData.length; i++) {
+ var _resData = resData[i];
+ _resData.doThings = '';
+ }
+ acceptTbl.data = resData; // 璁剧疆琛ㄦ牸鏁版嵁
+ // 鏇存柊琛ㄦ牸
+ table.render(acceptTbl); // 閲嶆柊鍔犺浇琛ㄦ牸
+ layuiTbl.setCache(table.cache.acceptTbl);
+ }else {
+ // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
+ for(var i=0; i<resData.length; i++) {
+ var _resData = resData[i];
+ _resData.doThings = '';
+ // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
+ if(tabsIndex != 1) {
+ layuiTbl.updateTr(i, _resData);
+ }
}
}
+
//console.log(123);
// 瀹炴椂鍥炶皟
updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);
--
Gitblit v1.9.1