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/control.jsp |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 99876f5..038a294 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -28,7 +28,6 @@
 	<!-- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css"> -->
 	<script type="text/javascript" src="js/echarts.js"></script>
 	<script type="text/javascript" src="js/jquery-1.8.3.js"></script>
-	<script type="text/javascript" src="js/base.js"></script>
 	<script type="text/javascript" src="js/right-menu.js"></script>
 	<style>
 		body {
@@ -4380,11 +4379,7 @@
 					// 璐熻浇鐢垫祦
 					var loadCurr = batt.Load_curr+'A';
 					changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
-					//changeEleCircleOpt(eleCircle, 'signal', {isShow:false});
-					// 鏄剧ず淇″彿寮哄害
-					status.setText('signal', '', true);
-					// 鏇存柊閰嶇疆椤圭殑鍊�
-					status.updateOpts('signal', btsOpts, {notShow: true});
+					
 					// 鏈�澶ф牳瀹圭數娴�
 					var disCurrMax = batt.DisCurrMax+'A';
 					changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'鏈�澶ф牳瀹圭數娴侊細'+disCurrMax});
@@ -4845,12 +4840,9 @@
 					
 					// 鍥剧墖鎻忚堪
 					signalOpts.name = '淇″彿寮哄害锛�'+signalInfo.signal;
-					//console.log(signalOpts.name);
+					
 					// 鏄剧ず淇″彿寮哄害
-					status.setText('signal', signalOpts.name);
-					// 鏇存柊閰嶇疆椤圭殑鍊�
-					status.updateOpts('signal', btsOpts, {notShow: false});
-					//changeEleCircleOpt(eleCircle, 'signal', signalOpts);
+					layer.msg(signalOpts.name, {time: 5000});
 				});
 				
 			});
@@ -4867,11 +4859,17 @@
 				if(testCsq) {
 					rs.signal = RegExp.$1;
 					rs.bitError = RegExp.$2;
-					if(rs.signal>20) {
+					if(rs.signal>25) {
 						rs.img = 1;
+						rs.signal += '锛堝己锛�';
+					}else if(rs.signal>19) {
+						rs.img = 1;
+						rs.signal += '锛堜腑锛�';
+					}else {
+						rs.signal += '锛堝急锛�';
 					}
 				}
-				
+				//console.info(rs);
 				return rs;
 			}
 		});

--
Gitblit v1.9.1