From a098897b8b37dd9418a8840a5f89cac92757ab4a Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 13 十一月 2018 14:03:05 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 99876f5..cfc8d57 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -4380,11 +4380,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 +4841,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 +4860,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