From 03736d1a960da50232bcaadd983496785a50500f Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 10:07:55 +0800
Subject: [PATCH] 修复显示错误提示的逻辑
---
gx_tieta/WebRoot/control.jsp | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index bd79f4e..6d095b9 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 {
@@ -377,6 +376,10 @@
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
</tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
+ </tr>
</table>
</div>
<div class="con-list ele-infor" style="height: 400px;overflow-y: auto">
@@ -657,7 +660,7 @@
</tr>
<tr>
<th><s:text name="Booster"/><s:text name="Upper_limit"/><!-- 鍗囧帇涓婇檺 -->锛圴锛�</th>
- <th><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
+ <th id="ChargeCurrSetLabel"><s:text name="Charging_current"/><!-- 鍏呯數鐢垫祦 -->锛圓锛�</th>
</tr>
<tr>
<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
@@ -676,7 +679,7 @@
</div>
</div>
<div class="popup-footer">
- <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 -->
+ <input type="button" name="" id="btn_start_test" class="status-change-btn whyc-btn-disabled no-remove-disabled" value="鍚姩娴嬭瘯" > <!-- 鍚姩娴嬭瘯 -->
<input type="button" name="" id="btn_flush" value="璇诲彇" > <!-- 璇诲彇 -->
<input type="button" name="" id="btn_ensure" class="status-change-btn whyc-btn-disabled" value="璁惧畾" > <!-- 璁惧畾 -->
<!-- <input type="button" name="" id="bts_graph" value="鎷撴墤鍥�"> -->
@@ -1130,6 +1133,8 @@
<!-- 鏁翠綋鐨勯伄缃╁眰 -->
<div id="allShade"></div>
<div class="clear"></div>
+ <!-- iframe鏁版嵁涓存椂瀛樺偍浣嶇疆 -->
+ <div id="homeInfoIframeData"></div>
<!-- 寮曞叆layui妗嗘灦 -->
<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
@@ -1155,6 +1160,7 @@
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
+ <script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -4429,13 +4435,15 @@
// 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
var menuItems = [
- {txt: '鏈烘埧鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
- {txt: '鏈烘埧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
+ {txt: '鍩虹珯鏈哄巻鍗�', cla: 'home-info-card'},
+ {txt: '鏈烘埧瀹炴椂鐘舵�佹煡璇�', cla: 'target', data:{target: 'batt-state-manage.jsp'}},
+ {txt: '璁惧娴侀噺缁熻鏌ヨ', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},
{txt: '鏈烘埧缁埅鑳藉姏鏌ヨ', cla: 'target', data: {target: 'batt-life-manage.jsp'}},
{txt: '璁惧鍏呮斁鐢垫ā鍧楃姸鎬�', cla:'target', data: {target: 'equip-charge-param.jsp'}},
+ {txt: '鏈烘埧鍘嗗彶浜嬩欢鏌ヨ', cla:'target', data: {target: 'batt-state-statistical.jsp'}},
];
// 缁欒〃鏍兼坊鍔犺嚜宸辩殑鍙抽敭鑿滃崟
- $('#contai').on('mousedown','.ele-circle',function(e){
+ $('#contai').on('mousedown','.ele-circle canvas',function(e){
var batt = getBatt();
if (e.which == 3) {
var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
@@ -4445,6 +4453,7 @@
}
});
+ // 鐐瑰嚮鍙抽敭鑿滃崟璺宠浆
$('body').on('click', '#rightMenu .target', function() {
var batt = getBatt();
var pageName = $(this).data('data').target;
@@ -4453,8 +4462,16 @@
var county = batt.StationName5;
var home = batt.StationName;
var battid = batt.BattGroupId;
+
// 瀹炵幇璺宠浆
window.open(skipUrl(pageName, province, city, county, home, battid));
+ });
+
+ // 鐐瑰嚮鍩虹珯鏈哄巻鍗�
+ $('body').on('click', '#rightMenu .home-info-card', function() {
+ var batt = getBatt();
+ // 鏄剧ず鍩虹珯鏈哄巻鍗�
+ showHomeInfo(batt.StationId);
});
// 宸ュ叿鏉℃暣浣撴牱寮�
@@ -4860,14 +4877,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