From aa39b7fa5eb2eb2f65e00d134c82eaa958900813 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 22 十一月 2018 10:58:33 +0800
Subject: [PATCH] 修改范围电流范围内容
---
gx_tieta/WebRoot/control.jsp | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 107 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index bd79f4e..796836d 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 {
@@ -121,6 +120,19 @@
.mr250 {
margin-left: -250px;
}
+ .page-link {
+ cursor: pointer;
+ }
+ .page-link:hover {
+ color: #1495E7;
+ }
+ .page-link:active {
+ color: #FF0000;
+ }
+ i.fa.f-size16 {
+ font-size: 16px;
+ vertical-align: middle;
+ }
</style>
</head>
@@ -376,6 +388,10 @@
<tr>
<td><s:text name="Head"/></td> <!-- 璐熻矗浜� -->
<td></td>
+ </tr>
+ <tr>
+ <td>瀹夎浜哄憳</td> <!-- 璐熻矗浜� -->
+ <td id="installUser"></td>
</tr>
</table>
</div>
@@ -657,7 +673,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"/><!-- 鍏呯數鐢垫祦 -->锛�<span class="val-range"></span>A锛�<i class="fa fa-edit page-link f-size16" title="淇敼鍏呯數鐢垫祦鑼冨洿"></i></th>
</tr>
<tr>
<td><input id="DCVolHighLimit" type="text" value="0"><i class="fa fa-frown-o error-img" title="鏁版嵁鏍煎紡閿欒"></i></td>
@@ -676,7 +692,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 +1146,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 +1173,10 @@
<!-- 寮曞叆鐢佃矾鍥� -->
<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/html" id="setChargeCurrTpl">
+
+ </script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -1265,6 +1287,69 @@
sysSet_popup.hidePopup(); // 闅愯棌sysSet_popup寮瑰嚭妗嗗拰閬僵灞�
});
+ // bts闈㈡澘鍏呯數鐢垫祦缂栬緫
+ $('#ChargeCurrSetLabel .fa-edit').click(function() {
+ var batt =getBatt();
+ //console.log(batt);
+ // 璁剧疆闈㈡澘
+ layer.open({
+ type: 1
+ ,title: '璁剧疆鍏呯數鐢垫祦闃�鍊�'
+ , content: '<div style="width:300px; height: 50px;"><div style="margin-top: 20px;margin-left: 8px; margin-right: 8px;">'+
+ '<input type="text" style="width: 100%; height:32px; border: 1px solid #ccc;" id="setChargeCurrVal" value="">'+
+ '</div></div>'
+ ,btn:['璁剧疆', '鍙栨秷']
+ ,yes: function(index) {
+ var chargeCurrVal = $('#setChargeCurrVal').val();
+ var num = Number(chargeCurrVal);
+ if(isNaN(num) || num==0) {
+ layer.msg('璇疯緭鍏ユ暟瀛�');
+ return;
+ }
+ var tmp = {
+ charge_curr_max: num
+ ,BattGroupId: batt.BattGroupId
+ };
+ var load;
+ // 璇锋眰璁剧疆鐢垫祦鐨勫悗鍙�
+ $.ajax({
+ type: 'post'
+ ,async: true
+ ,url: 'BattInfAction!update_charge'
+ ,data: 'json='+JSON.stringify(tmp)
+ ,dataType: 'json'
+ ,beforeSend: function(){
+ load = layer.load(1);
+ }
+ ,success: function(res) {
+ var rs = JSON.parse(res.result);
+ // 鍏抽棴绛夊緟妗�
+ layer.close(load);
+ //console.log(rs);
+ if(rs.code == 1) {
+ // 璁剧疆寮瑰嚭妗嗕俊鎭�
+ layer.msg('璁剧疆鎴愬姛锛�');
+ layer.close(index);
+ // 鍏呯數鐢垫祦
+ $('#ChargeCurrSet').testVal('option', 'allOpts', {
+ regVal: true
+ ,update: true
+ ,min: 0
+ ,max: num
+ ,msg: '鍙栧�艰寖鍥�0~'+num+'A'
+ });
+
+ // 璁剧疆鏂囨湰鍊�
+ $('#ChargeCurrSetLabel .val-range').text('0~'+num);
+ }else {
+ layer.msg('璁剧疆澶辫触!璇烽噸鏂拌缃�');
+ }
+ }
+
+ });
+ }
+ });
+ });
// 绐楀彛澶у皬鏀瑰彉
$(window).resize(function() {
@@ -4429,13 +4514,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 +4532,7 @@
}
});
+ // 鐐瑰嚮鍙抽敭鑿滃崟璺宠浆
$('body').on('click', '#rightMenu .target', function() {
var batt = getBatt();
var pageName = $(this).data('data').target;
@@ -4453,8 +4541,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 +4956,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