From 67047bebb45c0426ac96df76ed18e3879ffc09b0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 18 十月 2018 11:49:59 +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 | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index b395055..c0afd76 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(); //鏄剧ず鏌ヨ澶辫触妗�
});
@@ -415,7 +427,7 @@
}
- searchstationstate();
+ searchstationstate();
});
}
@@ -468,7 +480,7 @@
}
arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
-
+ arrTd[index++]=formartTime(_data.station_poff_tlong); //鍋滅數鏃堕暱
// 鍙戠數
if(_data.station_stat_fadian) {
arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
@@ -476,8 +488,8 @@
arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
}
- arrTd[index++]=_data.station_fadian_start_time;//鍙戠數寮�濮嬫椂闂�
-
+ arrTd[index++]=_data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++]=formartTime(_data.station_fadian_tlong);
// 鎺夌珯
if(_data.station_stat_diaozhan) {
arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
@@ -486,7 +498,7 @@
}
arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
-
+ arrTd[index++]=formartTime(_data.station_diaozhan_tlong);
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
@@ -495,6 +507,7 @@
}
arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++]=formartTime(_data.station_dooropen_tlong);
arrTd[index++]=_data.station_temp; //娓╁害
arrTd[index++]=_data.station_damp; //婀垮害
@@ -509,7 +522,24 @@
})
}
-
+ //鏍煎紡鍖栨椂闂�
+ function formartTime(value){
+ value = Math.abs(parseInt(value));
+ //console.info(value);
+ var day_num = 0;
+ var hour_num = 0;
+ var min_num = 0;
+ if(value>=24*60){
+ day_num = Math.floor(value/(24*60));
+ value = value%(24*60);
+ }
+ if(value>=60){
+ hour_num = Math.floor(value/60);
+ value = value%60;
+ }
+ min_num = value;
+ return day_num+"澶�"+hour_num+"灏忔椂"+min_num+"鍒�";
+ }
//棣栭〉
$('#home').click(function(){
--
Gitblit v1.9.1