From 9fc29bd426176d8aad6390214cc10bf86b64ac4d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 23 十月 2018 13:54:12 +0800
Subject: [PATCH] 修改确认框点击确认不隐藏的bug
---
gx_tieta/WebRoot/batt-state-manage.jsp | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 1c4e701..25b90d4 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -447,9 +447,12 @@
StationId: stationid?stationid:0,
};
+ //console.info(temp);
return temp;
}
+ var myTimeOut;
+ //鏌ヨ鏈烘埧鐘舵��
function searchstationstate(){
var temp = createSearchParam();
arrTd = new Array();
@@ -467,7 +470,7 @@
//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; //甯�
@@ -476,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: '姝ｅ父'});
@@ -530,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; //寮�濮嬫椂闂�
@@ -675,9 +682,12 @@
{
var _index = (i+1)%eleTh.length;
var _icon = eleTd.eq(i).find('.icon');
+ var _fa = eleTd.eq(i).find('.fa');
if(_icon.length) {
ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";
- }else {
+ }else if(_fa.length){
+ ArrTd+=eleTd.eq(i).find('.fa').data('msg')+"&";
+ }else{
ArrTd+=eleTd.eq(i).text()+"&";
}
}
--
Gitblit v1.9.1