From fc9dda41f3da5d6fbecf5f8faf9bff30f732d660 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 06 十一月 2018 16:35:32 +0800
Subject: [PATCH] 调整宽度
---
gx_tieta/WebRoot/control.jsp | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 6915364..8952efb 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -25,7 +25,7 @@
<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" type="text/css" href="src/css/layui.css">
- <link rel="stylesheet" type="text/css" href="pages/css/mylayui.css">
+ <!-- <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>
@@ -246,6 +246,11 @@
<a href="javascript:void(0);" id="sysSet" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
<span class="whyc-btn-icon fa fa-gear"></span>
<span class="whyc-btn-txt">绯荤粺鍙傛暟</span>
+ </a>
+ <br>
+ <a href="javascript:void(0);" id="signalBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">
+ <span class="whyc-btn-icon fa fa-signal"></span>
+ <span class="whyc-btn-txt">淇″彿璐ㄩ噺</span>
</a>
</div>
</div>
@@ -4328,7 +4333,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});
@@ -4718,6 +4723,64 @@
return rs;
}
+
+ // 鏌ヨ淇″彿璐ㄩ噺妯″潡
+ var gprs = GLOBAL.CMD.gprs;
+ var signalSearch = {
+ num: gprs.param,
+ AT_cmd: gprs.signal,
+ dev_id: ''
+ };
+ // 鐐瑰嚮鏌ョ湅褰撳墠淇″彿鐨勮川閲�
+ $('#signalBtn').click(function() {
+ var batt = getBatt();
+ signalSearch.dev_id = batt.FBSDeviceId;
+ // 璇锋眰鍚庡彴鑾峰彇淇″彿鐨勮川閲�
+ searchStationSignal(signalSearch,function(data){
+ // 鍩虹閰嶇疆
+ var signalOpts = {
+ img: signalBad,
+ isShow: true,
+ startX: 10,
+ startY: 30,
+ name: ''
+ };
+ var signalInfo = formatSignal("");
+ if(data.code == 1) {
+ var csq = data.data.ack_inf;
+ signalInfo = formatSignal(csq);
+ }
+ // 鏄剧ず鍥剧墖绫诲瀷
+ if(signalInfo.img) {
+ signalOpts.img = signalGood;
+ }
+
+ // 鍥剧墖鎻忚堪
+ signalOpts.name = '淇″彿寮哄害锛�'+signalInfo.signal;
+ changeEleCircleOpt(eleCircle, 'signal', signalOpts);
+ });
+
+ });
+
+ // 瑙ｆ瀽淇″彿璐ㄩ噺缁撴灉
+ function formatSignal(signal) {
+ var rs = {
+ signal: '鏈煡',
+ bitError: '鏈煡',
+ img: 0
+ };
+ var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");
+ var testCsq = ptn.test(signal);
+ if(testCsq) {
+ rs.signal = RegExp.$1;
+ rs.bitError = RegExp.$2;
+ if(rs.signal>20) {
+ rs.img = 1;
+ }
+ }
+
+ return rs;
+ }
});
// 鏈哄巻鍗℃ā鍧�
@@ -4737,6 +4800,29 @@
tabContents.eq(index).addClass('con-show');
});
});
+
+ var gprs = GLOBAL.CMD.gprs;
+
+ var temp = {
+ num: gprs.param,
+ AT_cmd: gprs.signal,
+ dev_id:910000577
+ };
+
+
+
+ /* searchStationSignal(temp,function(data){
+ changeEleCircleOpt(eleCircle, 'signal', {
+ img: signalBad,
+ isShow: true,
+ });
+ var csq = data.data.ack_inf;
+ var ptn = new RegExp(".*:\\s(\\d{2}),(\\d{2})");
+ var testCsq = ptn.test(csq);
+ console.log(RegExp.$1);
+ console.log(RegExp.$2);
+ console.log(data.data.ack_inf);
+ }); */
</script>
<script type="text/javascript" src="js/Title.js"></script>
<script type="text/javascript" src="js/control.js"></script>
--
Gitblit v1.9.1