From 8950b527f88b682913c4c05a5e1cdd8f18e7d468 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 25 十二月 2018 15:18:15 +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 | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 3719234..052a8a7 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -629,7 +629,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(var i=0;i<data.length;i++){
@@ -675,11 +675,11 @@
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);
+ 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_xuhang_start_time;
+ arrTd[index++] = getXunHangTimeLong(_data.station_xuhang_end_time, _data.station_xuhang_start_time, _data.station_stat_xuhang);
}
// 寮�闂ㄥ叧闂ㄥ紓甯�
@@ -708,13 +708,13 @@
$('#current').text(Page.pageCurr+"/"+pageNum);
}
layer.close(load);
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ createFullTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
// 缁欐瘡涓�琛屾坊鍔犳暟鎹�
var trList = tblBd.find('tbody tr');
// 閬嶅巻鍐呭缁檛r娣诲姞attr
- for(var i=0; i<model.data.length; i++) {
- trList.eq(i).data('attr', model.data[i]);
+ for(var i=0; i<data.length; i++) {
+ trList.eq(i).data('attr', data[i]);
}
window.clearTimeout(myTimeOut);
@@ -722,14 +722,39 @@
}
});
}
+
+ // 椤甸潰瀹瑰櫒澶у皬鏀瑰彉瑙﹀彂
+ $(window).resize(function() {
+ setTblWidth(tblHd, tblBd);
+ });
+
+ // 鑾峰彇缁埅鏃堕暱
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浼犲叆涓虹
+ var date1= value; //寮�濮嬫椂闂�
+ var date2 = new Date(); //缁撴潫鏃堕棿
+ var date3 = date2.getTime() - new Date(date1).getTime(); //鏃堕棿宸殑姣鏁�
+ var date4 = Math.floor(date3/(1000));
+ return formartTime(date4);
+ }
+
+ // 閫氳繃缁埅寮�濮嬫椂闂村拰缁撴潫鏃堕棿鑾峰彇缁埅鐨勬椂闀�
+ function getXunHangTimeLong(start, end, state) {
+ var timeLong = '';
+ if(start && end) {
+ var _timeLong = new Date(end).getTime()-new Date(start).getTime();
+ timeLong = Math.floor(_timeLong/(1000));
+ }
+
+ // 鏈�缁堟椂闂磝x澶﹛x鏃秞x鍒嗛挓
+ var rsTime = '-';
+ if(isNumber(timeLong)&&!state) {
+ rsTime = formartTime(timeLong)
+ }
+
+ return rsTime;
+ }
+
+ //鏍煎紡鍖栨椂闂磛alue浼犲叆涓虹
function formartTime(value){
value = Math.abs(parseInt(value));
//console.info(value);
--
Gitblit v1.9.1