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 | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index f0cb385..cfc8d57 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -4353,6 +4353,8 @@
// 鐢垫睜缁�
treeView.ele.on('click', '.eleGroup', function() {
var eleGroup = $(this).data('attr');
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
// 鏍规嵁BattGroupId鏌ヨ鏁版嵁
if(BattGroupId != eleGroup.BattGroupId) {
BattGroupId = eleGroup.BattGroupId;
@@ -4378,7 +4380,7 @@
// 璐熻浇鐢垫祦
var loadCurr = batt.Load_curr+'A';
changeEleCircleOpt(eleCircle, 'loaderCurr', {name:'鏈�澶ц礋杞界數娴侊細'+loadCurr});
- changeEleCircleOpt(eleCircle, 'signal', {isShow:false});
+
// 鏈�澶ф牳瀹圭數娴�
var disCurrMax = batt.DisCurrMax+'A';
changeEleCircleOpt(eleCircle, 'disCurrMax', {name:'鏈�澶ф牳瀹圭數娴侊細'+disCurrMax});
@@ -4811,6 +4813,9 @@
// 鐐瑰嚮鏌ョ湅褰撳墠淇″彿鐨勮川閲�
$('#signalBtn').click(function() {
var batt = getBatt();
+ var status = GLOBAL.circleStatus.status;
+ var btsOpts = GLOBAL.circleStatus.btsOpts;
+ //var btsOpts = GLOBAL.circleStatus.btsOpts;
signalSearch.dev_id = batt.FBSDeviceId;
var load = layer.load(1);
// 璇锋眰鍚庡彴鑾峰彇淇″彿鐨勮川閲�
@@ -4836,7 +4841,9 @@
// 鍥剧墖鎻忚堪
signalOpts.name = '淇″彿寮哄害锛�'+signalInfo.signal;
- changeEleCircleOpt(eleCircle, 'signal', signalOpts);
+
+ // 鏄剧ず淇″彿寮哄害
+ layer.msg(signalOpts.name, {time: 5000});
});
});
@@ -4853,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