From 6b72d58686e543bc7fda3fe12d65c81765d37f86 Mon Sep 17 00:00:00 2001
From: cjj <Administrator@192.168.10.9>
Date: 星期五, 19 十月 2018 11:09:03 +0800
Subject: [PATCH] "-"
---
gx_tieta/WebRoot/batt-state-manage.jsp | 89 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 insertions(+), 26 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 03e209a..ab74871 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -1,4 +1,5 @@
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+
<%
String path = request.getContextPath();
String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
@@ -24,7 +25,7 @@
<meta http-equiv="description" content="This is my page">
<style type="text/css">
- body {
+ body {
overflow-x: hidden !important;
}
#tbHead table{
@@ -65,7 +66,8 @@
.filter a:hover {
background-color: #2f97ff;
color: #FFFFFF;
- }
+ }
+
</style>
</head>
<body>
@@ -168,7 +170,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 +195,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 +232,7 @@
$('#paging .search').click(function() {
- /* searchstationstate(); */
+ searchstationstate();
//noContent.showNoContent(); //鏄剧ず鏌ヨ澶辫触妗�
});
@@ -451,7 +464,7 @@
var index = 0;
var data = JSON.parse(data.result);
if(data.code==1&&data.data!=null){
- console.info(data.data);
+ //console.info(data.data);
var data = data.data;
//console.info(data[0].dev_id);
for(i=0;i<data.length;i++){
@@ -463,39 +476,57 @@
// 鍋滅數
if(_data.station_stat_poff) {
arrTd[index++]= create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
+ arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
+ arrTd[index++]=StringtoData(_data.station_poff_start_time); //鍋滅數鏃堕暱
}else {
arrTd[index++]= create_ali_font('icon-tingdian-', 'green', {msg: '姝ｅ父'});
+ arrTd[index++]="-";
+ arrTd[index++]=formartTime(0);
}
-
- 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: '鍙戠數寮傚父'}); //鍙戠數
+ arrTd[index++]=_data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++]=StringtoData(_data.station_fadian_start_time);
}else {
arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
+ arrTd[index++]="-"; //鍙戠數寮�濮嬫椂闂�
+ arrTd[index++]=formartTime(0);
}
-
- 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: '宸叉帀绔�'});
+ arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
+ arrTd[index++]=StringtoData(_data.station_diaozhan_start_time);
}else {
arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '姝ｅ父'});
+ arrTd[index++]="-";//鎺夌珯寮�濮嬫椂闂�
+ arrTd[index++]=formartTime(0);
+ }
+
+ //缁埅
+ if(_data.station_stat_xuhang){
+ arrTd[index++] = create_fa_font('fa-television','red',{msg: '缁埅寮傚父'});
+ arrTd[index++] =_data.station_xuhang_start_time;
+ arrTd[index++] =StringtoData(_data.station_xuhang_start_time);
+ }else{
+ arrTd[index++] = create_fa_font('fa-television','green',{msg: '姝ｅ父'});
+ arrTd[index++] ="-";
+ arrTd[index++] =formartTime(0);
}
- 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: '寮�闂�'});
+ arrTd[index++] =_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++]=StringtoData(_data.station_dooropen_start_time);
}else {
arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '鍏抽棬'});
+ arrTd[index++] ="-";//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
+ arrTd[index++]=formartTime(0);
}
-
- arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
- arrTd[index++]=formartTime(_data.station_dooropen_tlong);
arrTd[index++]=_data.station_temp; //娓╁害
arrTd[index++]=_data.station_damp; //婀垮害
@@ -504,28 +535,34 @@
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);
}
})
}
-
- //鏍煎紡鍖栨椂闂�
+ function StringtoData(value){
+ var date1= value; //寮�濮嬫椂闂�
+ var date2 = new Date(); //缁撴潫鏃堕棿
+ var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
+ var date4 = Math.floor(date3/(1000));
+ return formartTime(date4);
+ }
+ //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
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>=24*60*60){
+ day_num = Math.floor(value/(24*60*60));
+ value = value%(24*60*60);
}
- if(value>=60){
- hour_num = Math.floor(value/60);
- value = value%60;
+ if(value>=60*60){
+ hour_num = Math.floor(value/(60*60));
+ value = value%(60*60);
}
- min_num = value;
+ min_num = Math.floor(value/60);
return day_num+"澶�"+hour_num+"灏忔椂"+min_num+"鍒�";
}
--
Gitblit v1.9.1