From 79fc28047fe73a2500fb5cf6cfbf8b80f09d2cf0 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.26>
Date: 星期四, 18 十月 2018 17:31:58 +0800
Subject: [PATCH] 详情不加分页
---
gx_tieta/WebRoot/batt-state-manage.jsp | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index d85bcdf..2631575 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+"/";
@@ -463,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++){
@@ -480,7 +481,11 @@
}
arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
- arrTd[index++]=formartTime(_data.station_poff_tlong); //鍋滅數鏃堕暱
+ if(_data.station_stat_poff){
+ arrTd[index++]=StringtoData(_data.station_poff_start_time); //鍋滅數鏃堕暱
+ }else{
+ arrTd[index++]=formartTime(0);
+ }
// 鍙戠數
if(_data.station_stat_fadian) {
arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
@@ -489,7 +494,11 @@
}
arrTd[index++]=_data.station_fadian_start_time; //鍙戠數寮�濮嬫椂闂�
- arrTd[index++]=formartTime(_data.station_fadian_tlong);
+ if(_data.station_stat_fadian){
+ arrTd[index++]=StringtoData(_data.station_fadian_start_time);
+ }else{
+ arrTd[index++]=formartTime(0);
+ }
// 鎺夌珯
if(_data.station_stat_diaozhan) {
arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
@@ -498,7 +507,24 @@
}
arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
- arrTd[index++]=formartTime(_data.station_diaozhan_tlong);
+ if(_data.station_stat_diaozhan){
+ arrTd[index++]=StringtoData(_data.station_diaozhan_start_time);
+ }else{
+ arrTd[index++]=formartTime(0);
+ }
+
+ //缁埅
+ if(_data.station_stat_xuhang){
+ arrTd[index++]=_data.station_stat_xuhang;
+ }else{
+ arrTd[index++]=_data.station_stat_xuhang;
+ }
+ arrTd[index++]=_data.station_xuhang_start_time;
+ if(_data.station_stat_xuhang){
+ arrTd[index++]=StringtoData(_data.station_xuhang_start_time);
+ }else{
+ arrTd[index++]=formartTime(0);
+ }
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
@@ -507,8 +533,11 @@
}
arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
- arrTd[index++]=formartTime(_data.station_dooropen_tlong);
-
+ if(_data.station_stat_dooropen) {
+ arrTd[index++]=StringtoData(_data.station_dooropen_start_time);
+ }else{
+ arrTd[index++]=formartTime(0);
+ }
arrTd[index++]=_data.station_temp; //娓╁害
arrTd[index++]=_data.station_damp; //婀垮害
}
@@ -516,12 +545,18 @@
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/(24*3600*1000));
+ return formartTime(date4);
+ }
//鏍煎紡鍖栨椂闂�
function formartTime(value){
value = Math.abs(parseInt(value));
--
Gitblit v1.9.1