From c0f92d69184f4764559c6d69e6101a2f50003aa8 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 22 十月 2018 16:31:07 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-manage.jsp | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index f25de4d..25b90d4 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -447,10 +447,12 @@
StationId: stationid?stationid:0,
};
- console.info(temp);
+ //console.info(temp);
return temp;
}
+ var myTimeOut;
+ //鏌ヨ鏈烘埧鐘舵��
function searchstationstate(){
var temp = createSearchParam();
arrTd = new Array();
@@ -465,10 +467,10 @@
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++){
+ for(var i=0;i<data.length;i++){
var _data = data[i];
arrTd[index++] = _data.stationName1; //鐪�
arrTd[index++] = _data.stationName2; //甯�
@@ -477,7 +479,7 @@
// 鍋滅數
if(_data.station_stat_poff) {
arrTd[index++] = create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
- arrTd[index++] = _data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
+ 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: '姝ｅ父'});
@@ -531,15 +533,19 @@
arrTd[index++] = _data.station_temp; //娓╁害
arrTd[index++] = _data.station_damp; //婀垮害
+
+ Page.pageAll = _data.page.pageAll;
}
- Page.pageAll = data.length;
var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
$('#total').text(Page.pageAll);
$('#current').text(Page.pageCurr+"/"+pageNum);
}
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+
+ window.clearTimeout(myTimeOut);
+ myTimeOut = window.setTimeout(searchstationstate, 8000);
}
- })
+ });
}
function StringtoData(value){
var date1= value; //寮�濮嬫椂闂�
--
Gitblit v1.9.1