From c22971419e96c3a5acde4526741b0233291f84ab Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 16:03:44 +0800
Subject: [PATCH] 跳转
---
gx_tieta/WebRoot/control.jsp | 37 ++++++++++++++++++++++++++++++++++---
gx_tieta/WebRoot/charge-test.jsp | 4 ++--
gx_tieta/WebRoot/js/rightmenu.js | 4 ++++
gx_tieta/WebRoot/pages/js/pages/siderbar.js | 2 +-
gx_tieta/WebRoot/batt-state-manage.jsp | 12 ++++++------
5 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index c35baf9..fef79ee 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -113,11 +113,11 @@
</table>
<table class="condi-opt">
<tr>
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" /><span class="checkbox-label">鍋滅數</span></td> <!-- 鍋滅數 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class=""><span class="checkbox-label">缁埅</span></td> <!-- 鎺夌珯 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" /><span class="checkbox-label">鍙戠數</span></td> <!-- 鍙戠數 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" ><span class="checkbox-label">寮�闂ㄥ紓甯�</span></td> <!-- 寮�闂ㄥ紓甯� -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 class=""><span class="checkbox-label">鎺夌珯</span></td> <!-- 鎺夌珯 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" /><span class="checkbox-label">鍋滅數</span></td> <!-- 鍋滅數 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class=""><span class="checkbox-label">缁埅</span></td> <!-- 鎺夌珯 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" /><span class="checkbox-label">鍙戠數</span></td> <!-- 鍙戠數 -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" ><span class="checkbox-label">寮�闂ㄥ紓甯�</span></td> <!-- 寮�闂ㄥ紓甯� -->
+ <td><input type="checkbox" checked="checked" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 class=""><span class="checkbox-label">鎺夌珯</span></td> <!-- 鎺夌珯 -->
</tr>
</table>
@@ -196,7 +196,7 @@
var station_state = getQueryString('station_state');
if(station_state){
//alert(station_state);
-
+ $('#search_form .condi-opt input[type=checkbox]').prop("checked", false);
$('#search_form .condi-opt [value='+station_state+']:checkbox').attr("checked", true);
}
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 166b111..c3d6430 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -3410,8 +3410,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- var homeid = batt.BattGroupId;
- $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
+ var battid = batt.BattGroupId;
+ $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
});
});
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 9b61671..f0cb385 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -1151,6 +1151,7 @@
<script type="text/javascript" src="js/dischargetest/sysData.js"></script>
<script type="text/javascript" src="pages/js/pages/control-common.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
+ <script type="text/javascript" src="js/rightmenu.js"></script>
<!-- 寮曞叆鐢佃矾鍥� -->
<script type="text/javascript" src="js/elecircle.js"></script>
<script type="text/javascript" src="js/elecircle.content.js"></script>
@@ -3041,8 +3042,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- var homeid = batt.BattGroupId;
- $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
+ var battid = batt.BattGroupId;
+ $(this).attr('href', 'charge-test.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
});
});
@@ -4424,6 +4425,36 @@
treeView.ele.find('li').removeClass('sider-menu-open');
});
+ // 鐢佃矾鎷撴墤鍥惧彸閿彍鍗�
+ var menuItems = [
+ {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'}},
+ ];
+ // 缁欒〃鏍兼坊鍔犺嚜宸辩殑鍙抽敭鑿滃崟
+ $('#contai').on('mousedown','.ele-circle',function(e){
+ var batt = getBatt();
+ if (e.which == 3) {
+ var disX = (e || event).clientX + 10; //鑾峰彇榧犳爣鐐瑰嚮鐨勬í鍧愭爣
+ var disY = (e || event).clientY + 10; // 鑾峰彇榧犳爣鐐瑰嚮鐨勭旱鍧愭爣
+
+ rightMenu.showMenu(menuItems, disX, disY);
+ }
+ });
+
+ $('body').on('click', '#rightMenu .target', function() {
+ var batt = getBatt();
+ var pageName = $(this).data('data').target;
+ var province = batt.StationName1;
+ var city = batt.StationName2;
+ var county = batt.StationName5;
+ var home = batt.StationName;
+ var battid = batt.BattGroupId;
+ // 瀹炵幇璺宠浆
+ window.open(skipUrl(pageName, province, city, county, home, battid));
+ });
+
// 宸ュ叿鏉℃暣浣撴牱寮�
$('.siderbar-tools').tooltip();
@@ -4895,7 +4926,7 @@
data: "json = " + JSON.stringify(temp),
success: function(result) {
var rs = JSON.parse(result.result);
- console.info(rs);
+ //console.info(rs);
if(rs.code == 1){
var dcdcWarn = '';
var data = rs.data;
diff --git a/gx_tieta/WebRoot/js/rightmenu.js b/gx_tieta/WebRoot/js/rightmenu.js
index 7ecd4b8..a539f32 100644
--- a/gx_tieta/WebRoot/js/rightmenu.js
+++ b/gx_tieta/WebRoot/js/rightmenu.js
@@ -23,6 +23,10 @@
for(var i=0; i<this.items.length;i++)
{
__a[i]=$('<a href="javascript:;" class="'+this.items[i].cla+'">'+this.items[i].txt+'</a>');
+ // 鍒ゆ柇鏄惁璁剧疆data
+ if(this.items[i].data) {
+ __a[i].data('data', this.items[i].data);
+ }
__div.append(__a[i]);
}
diff --git a/gx_tieta/WebRoot/pages/js/pages/siderbar.js b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
index 8514b29..333fa50 100644
--- a/gx_tieta/WebRoot/pages/js/pages/siderbar.js
+++ b/gx_tieta/WebRoot/pages/js/pages/siderbar.js
@@ -220,7 +220,7 @@
var city = getQueryString('city'); // 甯�
var county = getQueryString('county'); // 鍖�/鍘�
var home = getQueryString('home'); // 鏈烘埧
- var homeid = getQueryString('homeid'); // 鐢垫睜缁刬d
+ var homeid = getQueryString('battid'); // 鐢垫睜缁刬d
//console.log(province);
// 鐢熸垚涓�绾у鑸�-鐪�
--
Gitblit v1.9.1