From 5c3f918cb9e6b04710a92c69fedf36bb1d9c81aa Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 18 十月 2018 16:26:06 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-manage.jsp | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 03e209a..1931477 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -24,7 +24,7 @@
<meta http-equiv="description" content="This is my page">
<style type="text/css">
- body {
+ body {
overflow-x: hidden !important;
}
#tbHead table{
@@ -65,7 +65,8 @@
.filter a:hover {
background-color: #2f97ff;
color: #FFFFFF;
- }
+ }
+
</style>
</head>
<body>
@@ -168,7 +169,7 @@
var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['鐪�','甯�', '鏈烘埧鍚嶇О','鍋滅數','鍋滅數寮�濮嬫椂闂�','鍋滅數鏃堕暱','鍙戠數','鍙戠數寮�濮嬫椂闂�','鍙戠數鏃堕暱','鎺夌珯','鎺夌珯寮�濮嬫椂闂�', '鎺夌珯鏃堕暱','寮�闂�/鍏抽棬寮傚父','寮�闂�/寮�鍏崇數婧愬紓甯稿紑濮嬫椂闂�','寮�闂�/寮�鍏崇數婧愬紓甯告椂闀�', '娓╁害寮傚父','婀垮害寮傚父'];
+ arrTh = ['鐪�','甯�', '鏈烘埧鍚嶇О','鍋滅數','鍋滅數寮�濮嬫椂闂�','鍋滅數鏃堕暱','鍙戠數','鍙戠數寮�濮嬫椂闂�','鍙戠數鏃堕暱','鎺夌珯','鎺夌珯寮�濮嬫椂闂�', '鎺夌珯鏃堕暱','缁埅','缁埅寮�濮嬫椂闂�','缁埅鏃堕暱','寮�闂�/鍏抽棬寮傚父','寮�闂�/鍏抽棬寮傚父寮�濮嬫椂闂�','寮�闂�/鍏抽棬寮傚父鏃堕暱', '娓╁害寮傚父','婀垮害寮傚父'];
//tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -193,6 +194,17 @@
createCard(cardHd, tblOptsHd, tblOptsBd);
createCard(cardBd, tblOptsHd, tblOptsBd);
});
+
+
+ $(document).ready(function(){
+ $('#tbBrdw').scroll(function(){
+ var scrollX=$(this).scrollLeft();
+ $('#tbHead table').css('left',-scrollX+'px');
+ });
+
+ });
+
+
// 鐐瑰嚮鏉′欢绛涢�夋洿鏀硅〃鏍肩殑楂樺害
$(function() {
@@ -219,7 +231,7 @@
$('#paging .search').click(function() {
- /* searchstationstate(); */
+ searchstationstate();
//noContent.showNoContent(); //鏄剧ず鏌ヨ澶辫触妗�
});
@@ -484,9 +496,14 @@
}else {
arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '姝ｅ父'});
}
-
+ //缁埅
arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
arrTd[index++]=formartTime(_data.station_diaozhan_tlong);
+
+ arrTd[index++]=_data.station_stat_xuhang;
+ arrTd[index++]=_data.station_xuhang_start_time;
+ arrTd[index++]=_data.station_xuhang_tlong;
+
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
@@ -504,8 +521,8 @@
var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
$('#total').text(Page.pageAll);
$('#current').text(Page.pageCurr+"/"+pageNum);
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
}
+ createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
}
})
}
--
Gitblit v1.9.1