From b040ac179af00dfe38204ebb708aed8c87f285ad Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.132>
Date: 星期三, 26 十二月 2018 17:27:21 +0800
Subject: [PATCH] 修改内容

---
 gx_tieta/WebRoot/js/base.js |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 7ff1c73..6e0c50b 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -19,14 +19,14 @@
 function exitUser(){
 	$.post("LoginAction!exitUser",null,function(data){
 		//console.info(data);
-		window.location.replace("login.jsp");
 	});
+	window.location.replace("login.jsp");
 }
 
 
 // 妫�鏌ュ綋鍓嶇敤鎴锋槸鍚﹀湪鍙︿竴涓绘満鐧婚檰
 function checkUserlogin(){
-	//console.info("check");
+	console.info("check***********************");
 	$.post("LoginAction_check",null,function(data){
 		data = eval("(" + data.result + ")");
 		user=data.uinf;
@@ -38,7 +38,7 @@
 			window.location.href="login.jsp";			
 		}else{
 			clearInterval(timeID);
-			timeID = setTimeout(checkUserlogin,5000);
+			timeID = setTimeout(checkUserlogin,100);
 		}
 	}).error(function(){
 		clearInterval(timeID);
@@ -617,12 +617,17 @@
 	$.post("Battalarm_dataAction!serchRealTime",null,function(data){
 		model=eval("("+data.result+")");
 		if(model.code==1){
-			$('#batt_alarm_num').text(model.sum);
+			$('#batt_alarm_num .num').text(model.sum);
 			if(totalAlm_num<model.sum){				
 				createEleWarning(model.sum-totalAlm_num);
 			}
 			totalAlm_num=model.sum;
 			
+			// 5绉掑悗鍏抽棴闈㈡澘
+			setTimeout(function() {
+				$('body').children('#eleWarning').remove();
+			}, 5000);
+			
 			self.setTimeout("searchAlm()",10000); 
 		}
 	});	

--
Gitblit v1.9.1