From 13204c80645abbacd5d10e831ae456c84263361b Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期四, 10 一月 2019 11:47:39 +0800
Subject: [PATCH] 解决分页失效问题，审批等待框，首页清除缓存。
---
gx_tieta/WebRoot/control.jsp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 771ee6c..0c85e8a 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1933,11 +1933,13 @@
//鏌ヨ鐢垫睜缁勭殑瀹炴椂鐘舵�佷俊鎭�
function showtable(){
//searbattrealInfomation();
- searchDevStatusByDev_id();
findrtstate();
findrtdata();
//鏌ヨ璁惧鐨刣cdc鐘舵��
searchDevDcDcState();
+
+ // 鏇存柊鎷撴墤鍥剧姸鎬�
+ searchDevStatusByDev_id();
}
//鏍规嵁璁惧id鏌ヨ璁惧褰撳墠鐨勫紑鍏崇姸鎬�
@@ -1980,8 +1982,7 @@
//console.info("涓婁竴娆℃牳瀹规祴璇曞仠姝㈠師鍥狅細"+lastStopReason);
//console.info("閫氫俊璁℃暟锛�"+_data.dev_commcount);
//console.info("閫氫俊涓㈠寘鐜囷細"+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));
-
- var nowTime = new Date().getTime(); //褰撳墠鏃堕棿
+ var nowTime = new Date(model.data[0].note).getTime(); //褰撳墠鏃堕棿
var record = new Date(model.data[0].record_datetime).getTime();
//console.info(Math.abs(nowTime-record)/1000);
@@ -2289,6 +2290,7 @@
table_index = 0;
createAllTbl(tbHd, tbBd, thVol, mon_vol_table_list);
title.setAvg(parseFloat(sum/array.length).toFixed(3));
+ title.setSum(sum);
getBattAlarmTitle(batt,"Voltage",title);
//title.alow = temp.alow; //璁剧疆鐢靛帇鍛婅浣庡��
//title.ahight = temp.ahight; //璁剧疆鐢靛帇鍛婅楂樺��
@@ -4606,6 +4608,7 @@
// 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
var menuItems = [
{txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'},
+ {txt: '鏈烘埧闂璁板綍', cla: 'target', data:{target: 'batt-fault-manage.jsp'}},
{txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
{txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
{txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
--
Gitblit v1.9.1