From ed1aa3e700505e9c768c90e17bfbfa8e47b943d4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期一, 14 一月 2019 16:23:02 +0800
Subject: [PATCH] 修改

---
 gx_tieta/WebRoot/control.jsp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6e69e0d..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);

--
Gitblit v1.9.1