From 1a6b003aae5975547bda372a1a6289554af7f9e1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 14 十一月 2018 10:37:25 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/control.jsp | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index bd79f4e..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 {
@@ -4860,14 +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);
+ //console.info(rs);
return rs;
}
});
--
Gitblit v1.9.1