From 5b91f290dea4d6b6c1f159e28e0159e32aa5ac53 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 14 十一月 2018 10:37:03 +0800
Subject: [PATCH] 更改检测服务器状态的函数位置

---
 gx_tieta/WebRoot/Top.jsp |   52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/gx_tieta/WebRoot/Top.jsp b/gx_tieta/WebRoot/Top.jsp
index 25704cc..04816b8 100644
--- a/gx_tieta/WebRoot/Top.jsp
+++ b/gx_tieta/WebRoot/Top.jsp
@@ -64,7 +64,7 @@
 			<div class="batt-state">
 			
 				<div class="list">
-					<div class="list-contain"><s:text name='Computer_room'/><s:text name='Power_cut'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div>		<!-- 鏈烘埧鍋滅數鏁� -->
+					<div class="list-contain"><s:text name='Power_cut'/><s:text name='Computer_room'/><s:text name='Num'/>:<a href="batt-state-manage.jsp?station_state=2" class="badge default" id="poweroff_num">0</a></div>		<!-- 鏈烘埧鍋滅數鏁� -->
 				</div>
 				<div class="list">
 					<div class="list-contain"><s:text name="Batt"/><s:text name="Alarm"/><s:text name="Num"/>:<a href="elewarn.jsp" class="badge danger" id="batt_alarm_num">0</a></div>								<!-- 鐢垫睜鍛婅鏁� -->
@@ -127,9 +127,9 @@
 				<div class="cell-list plan-ele">
 					<img src="image/webStatus/plan_normal.gif" alt="鏀剧數璁″垝鐩戞祴绾跨▼" title="鏀剧數璁″垝鐩戞祴绾跨▼锛氭甯�">
 				</div>
-				<!-- <div class="cell-list break-ele">
+				<div class="cell-list break-ele" style="display: none;">
 					<img src="image/webStatus/break_ele_normal.gif" alt="鏈烘埧鍋滅數鐩戞祴绾跨▼" title="鏈烘埧鍋滅數鐩戞祴绾跨▼锛氭甯�">
-				</div>	 -->
+				</div>	 
 				<div class="cell-list control">
 					<img src="image/webStatus/control_normal.gif" alt="绾跨▼鐩戞帶绋嬪簭" title="绾跨▼鐩戞帶绋嬪簭杩愯锛氭甯�">
 				</div>			
@@ -778,5 +778,51 @@
 	    	return str;
 	    }
 	});
+	
+	/**
+	  妫�娴嬫湇鍔″櫒杩炴帴鏄惁姝e父
+	  绋嬪簭鍔熻兘: 閫氳繃璇锋眰鍚庡彴绋嬪簭濡傛灉涓夋閮借姹傚け璐ヨ涓烘湇鍔″櫒鎸傛帀,璺宠浆鍒扮櫥闄嗛〉闈�
+	*/
+	;(function ($) {
+		var url = window.location.href;
+		var loginPatt = /\/login.jsp/;
+		
+		// 鍒ゆ柇褰撳墠椤甸潰涓嶆槸鐧婚檰椤甸潰寮�濮嬫墽琛屾娴嬫湇鍔″櫒鐘舵��
+		if(!loginPatt.test(url)) {
+			checkServer();
+		}
+		
+		var linkNum = 0;    // 娴嬭瘯鏈嶅姟鍣ㄨ繛鎺ヨ鏁� =3 璺宠浆鍒扮櫥闄嗛〉闈�
+		function checkServer() {
+		    $.ajax({
+		        url:'User_infAction!checkService',
+		        type: 'post',
+		        async: true,
+		        success: function(rs) {
+		            linkNum = 0;    // 鍒濆鍖栨祴璇曡繛鎺�
+		            setTimeout(checkServer, 200);
+		        },
+		        error:function() {
+		             // 缃戠粶杩炴帴涓嶆甯�
+		            if(!navigator.onLine) {
+		                 linkNum = 0;
+		                 setTimeout(checkServer, 200);
+		            }else{
+		            	 linkNum++;
+		                 // 鏈嶅姟鍣ㄨ繛鎺ヤ笉姝e父
+		                 if(linkNum == 3) {
+		                	 console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛佽烦杞埌鐧婚檰");
+		                	 // 缃戠粶姝e父浣嗘湇鍔″櫒杩炵画澶氭妫�娴嬩笉姝e父璺宠浆鍒扮櫥闄嗛〉闈�
+			            	 alert('缃戠粶杩炴帴寮傚父锛岃妫�鏌ョ綉缁滆繛鎺ユ槸鍚︽甯革紒');
+			                 window.location.replace("login.jsp");
+		                 }else {
+		                	 console.info('鍑虹幇绗�'+linkNum+"娆℃祴璇曟湇鍔″櫒杩炴帴澶辫触锛�");
+		                	 checkServer();
+		                 }
+		            }
+		        }
+		    });
+		}
+	})(jQuery);
   </script>
 </html>

--
Gitblit v1.9.1