From 35fefed0792c40cb99b8d15fa5811bbb5992bff9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 21 一月 2019 10:42:24 +0800
Subject: [PATCH] 修改
---
gx_tieta/WebRoot/ex-battinfo.jsp | 172 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 135 insertions(+), 37 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index b139164..b84e05f 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -137,8 +137,16 @@
<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;
+ <% Object obj=session.getAttribute("permits");
+ if(obj!=null){
+ String permits =obj.toString(); %>
+ permits=<%=permits%>;
+ //console.info(json);
+ <% } %>
layui.use(['form', 'table', 'layer', 'element'], function() {
/* 椤甸潰瀵煎叆layui妯″潡 */
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
@@ -180,7 +188,7 @@
// console.log(data.index); //寰楀埌褰撳墠Tab鐨勬墍鍦ㄤ笅鏍�
// console.log(data.elem); //寰楀埌褰撳墠鐨凾ab澶у鍣�
tabsIndex = data.index; // 鏍囪瘑鏄剧ず鐨勯�夐」鍗″唴瀹�
- console.log(tabsIndex);
+ //console.log(tabsIndex);
if(tabsIndex == 0) {
pagePage.init(Page, search); // 寰呭鏍�
}else if(tabsIndex == 1){
@@ -248,6 +256,9 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ // 妫�娴嬫槸鍚﹀彲浠ュ鏍告潈闄�
+ var apprPermit = isHasPermit('install_appr_permit', permits);
+ changeApprTbl(apprPermit, tOptions);
// 寰呴獙鏀剁殑琛ㄦ牸
var acceptOptions = {
@@ -310,6 +321,9 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
+ // 妫�娴嬮獙鏀剁殑鏉冮檺
+ var checkPermit = isHasPermit('install_check_permit', permits);
+ changeCheckTbl(checkPermit, acceptOptions);
// 寰呴獙鏀剁殑琛ㄦ牸
var acceptedOptions = {
@@ -406,6 +420,21 @@
}
});
+
+ // 宸查獙鏀舵搷浣滄爮
+ table.on('tool(acceptedTbl)', function(obj) {
+ switch(obj.event) {
+ case 'accept':
+ acceptBattGroup(obj.data);
+ break;
+ case 'control':
+ controlPage(obj.data);
+ break;
+ case 'look':
+ lookHomeInfo(obj.data);
+ break;
+ }
+ });
// 鎵归噺鐢宠
$('#exBattGroups').click(function() {
@@ -574,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);
}
@@ -609,7 +662,7 @@
var resData = [];
if(rs.code == 1) {
var data = rs.data;
- // console.log(data);
+ //console.log(data);
// 閬嶅巻鏁版嵁鐨勫��
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -626,12 +679,11 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
-
+ // 鍚姩鑷姩鍒锋柊
+ updateSearch();
}
,complete: function() {
layer.close(load);
- // 鍚姩鑷姩鍒锋柊
- updateSearch();
}
});
}
@@ -649,9 +701,10 @@
}
// 鏇存柊瀹℃煡琛ㄦ牸
+ var updateSearchTimer;
function updateSearch() {
var temp = createSearchParam();
- clearInterval(updateSearch.timer);
+ clearInterval(updateSearchTimer);
// 鏌ヨ鍚庡彴
$.ajax({
type: 'post'
@@ -672,8 +725,8 @@
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = formaterResData(_data);
+ resData.push(_tmp);
if(_data.apply_note &&_data.apply_note != Page.all) {
- resData.push(_tmp);
Page.setAll(_data.apply_note);
isUpdateTbl = true;
}
@@ -688,9 +741,9 @@
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
table.render(tOptions);
}
-
+ // console.log(456);
// 瀹炴椂鍥炶皟
- updateSearch.timer = setTimeout(updateSearch, 4000);
+ updateSearchTimer = setTimeout(updateSearch, 4000);
}
});
}
@@ -734,12 +787,12 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
- // console.log(table);
+ // 鍚姩鑷姩鍒锋柊
+ updateAcceptSearch();
}
,complete: function() {
layer.close(load);
- // 鍚姩鑷姩鍒锋柊
- updateAcceptSearch();
+
}
});
}
@@ -748,7 +801,7 @@
function acceptSearchParam() {
var temp = {
apply_en: 1
- ,check_en: 0
+ ,check_en: 100
,binf: {
page: acceptPage.getPage()
}
@@ -803,16 +856,17 @@
apply_en: 1
,check_en: 1
,binf: {
- page: acceptPage.getPage()
+ page: acceptedPage.getPage()
}
};
return temp;
}
// 鏇存柊楠屾敹琛ㄦ牸
+ var updateAcceptSearchTimer;
function updateAcceptSearch() {
var temp = acceptSearchParam();
- clearInterval(updateAcceptSearch.timer);
+ clearInterval(updateAcceptSearchTimer);
// 鏌ヨ鍚庡彴
$.ajax({
type: 'post'
@@ -823,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;
// 閬嶅巻鏁版嵁鐨勫��
@@ -830,22 +885,44 @@
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);
+ 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);
+ }
+ }
}
- // 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
- for(var i=0; i<resData.length; i++) {
- var _resData = resData[i];
- _resData.doThings = '';
- layuiTbl.updateTr(i, _resData);
- }
-
+ //console.log(123);
// 瀹炴椂鍥炶皟
- updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
+ updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);
}
});
}
@@ -884,6 +961,27 @@
return num;
}
+
+ // 淇敼瀹℃壒琛ㄦ牸鏍峰紡
+ function changeApprTbl(bool, opts) {
+ var col = opts.cols[0];
+ var doThings = col[col.length-1];
+ // 绉婚櫎瀹℃壒鎸夐挳
+ if(!bool) {
+ col.length = col.length-1;
+ }
+ }
+
+ // 淇敼楠屾敹琛ㄦ牸鏍峰紡
+ function changeCheckTbl(bool, opts) {
+ var col = opts.cols[0];
+ var doThings = col[col.length-1];
+ // 绉婚櫎瀹℃壒鎸夐挳
+ if(!bool) {
+ doThings.width = 200;
+ doThings.toolbar = '#acceptedBattGroupTools';
+ }
+ }
});
</script>
</body>
--
Gitblit v1.9.1