From c426db921a97e78ad9e741301bdd346b7aba6f11 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 09:27:50 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/control.jsp | 2 -
gx_tieta/WebRoot/charge-test.jsp | 64 +++++++++++++++++++++-----------
2 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 4ef382f..91dca38 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -383,8 +383,6 @@
<div id="right_menu">
<ul>
<li><a href="javascript:"><s:text name="Check_the_battery_card"></s:text></a></li> <!-- 鏌ョ湅鐢垫睜缁勬満鍘嗗崱 -->
- <li><a href="upload.jsp" target="_blank"><s:text name="Upload_FBO/IDC_data"></s:text></a></li> <!-- 涓婁紶'FBO/IDC'鏁版嵁 -->
- <li><a href="uploadresis.jsp" target="_blank"><s:text name="Upload_resistance_conductivity_data"></s:text></a></li> <!-- 涓婁紶鐢甸樆鐢靛鏁版嵁 -->
<li><a href="eleBrdwMaint.jsp" target="_blank"><s:text name="Batt_failure_maintenance_record_query" /></a></li> <!-- 鐢垫睜鏁呴殰缁存姢璁板綍鏌ヨ -->
<li><a href="javascript:targetBattReport();"><s:text name="Battery_statistical_analysis_queries"></s:text></a></li> <!-- 鐢垫睜缁熻鍒嗘瀽鏌ヨ-->
<!-- <li><a href="eleMonomer.jsp"><s:text name="Batt_statistical_analysis_query"></s:text></a></li> 鐢垫睜鍗曚綋缁熻鍒嗘瀽鏌ヨ -->
@@ -396,7 +394,6 @@
</div>
</li> -->
<li style="display:none;"><a href="javascript:"><s:text name="Search_engine_or_the_batt_group"></s:text></a></li> <!-- 鎼滅储鏈烘埧鎴栫數姹犵粍-->
- <li><a href="javascript:" id="all_show"><s:text name="Expand_all"></s:text></a></li> <!-- 鍏ㄩ儴灞曞紑 -->
<li><a href="javascript:" id="all_hide"><s:text name="Collapse_all"></s:text></a></li> <!-- 鍏ㄩ儴鏀剁缉 -->
</ul>
</div>
@@ -2235,8 +2232,8 @@
for(var i=0;i<AllTestData.length;i++){
if(AllTestData[i].record_num != test_record_num){
//console.info(AllTestData[i]);
- BattGroupVol[0].push(AllTestData[i].group_vol.toFixed(2)); //缁勭鐢靛帇
- BattGroupVol[1].push(AllTestData[i].online_vol.toFixed(2)); //鍦ㄧ嚎鐢靛帇
+ BattGroupVol[0].push(AllTestData[i].online_vol.toFixed(2)); //鍦ㄧ嚎鐢靛帇
+ BattGroupVol[1].push(AllTestData[i].group_vol.toFixed(2)); //缁勭鐢靛帇
BattGroupCurr.push(AllTestData[i].test_curr.toFixed(1)); //缁勭鐢垫祦
TestTime.push(formatSeconds(AllTestData[i].test_timelong));
batt_test_evary_record.push(AllTestData[i]);
@@ -3365,7 +3362,7 @@
var Residual_capacity = '<s:text name="Residual_capacity" />'; //鍓╀綑瀹归噺
var Actual_capacity = '<s:text name="Actual_capacity" />'; //瀹為檯瀹归噺
var Percent_total_capacity = '<s:text name="Percent_total_capacity" />'; //瀹归噺鐧惧垎姣�
- var group_vol = ['<s:text name="Group_voltage"/>','<s:text name="On-line_voltage"/>'];
+ var group_vol = ['<s:text name="On-line_voltage"/>', '<s:text name="Group_voltage"/>']; // 鍦ㄧ嚎鐢靛帇, 缁勭鐢靛帇
var batt_curr = '<s:text name="Batt_current"/>';
// 鏇存柊琛ㄦ牸绗簩鍒�
@@ -3761,8 +3758,8 @@
//璺宠浆鍒版寚瀹氱殑鐢垫睜缁勭粺璁″垎鏋愭煡璇�
function targetBattReport(){
var batt = getBattinfById();
- //console.info(batt);
- window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
+ var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+ window.open(url);
}
// 浣跨敤jquery瀹炵幇宸﹀鑸殑鏄剧ず鍜岄殣钘�
@@ -3881,16 +3878,6 @@
}
});
- });
- //鍏ㄩ儴鏀剁缉
- $('#all_hide').click(function(){
- $('.fir').next().slideUp();
- //$('.sec').next().slideUp();
- $("#lside").scrollTop(0);
- $(".arrow").removeClass("up");
- $(".arrow").addClass("down");
- $(".mark").text("+");
- $(".mark").removeClass("black");
});
});
@@ -4292,8 +4279,8 @@
specialGroupVolOpts = $.extend(true, {}, specialGroupVolOpts, {
xdata: rsData.time,
- sdata: [rsData.groupVol, rsData.onlineVol],
- lname: ['缁勭鐢靛帇', '鍦ㄧ嚎鐢靛帇']
+ sdata: [rsData.onlineVol, rsData.groupVol],
+ lname: ['鍦ㄧ嚎鐢靛帇', '缁勭鐢靛帇']
});
specialCurrOpts = $.extend(true, {}, specialCurrOpts, {
@@ -4661,8 +4648,8 @@
specialGroupVolOpts = $.extend({}, specialGroupVolOpts, {
xdata: testtiem_arr,
- sdata: [groupvol_arr, onlinevol_arr],
- lname: ['缁勭鐢靛帇', '鍦ㄧ嚎鐢靛帇']
+ sdata: [ onlinevol_arr, groupvol_arr],
+ lname: ['鍦ㄧ嚎鐢靛帇', '缁勭鐢靛帇']
});
specialCurrOpts = $.extend({}, specialCurrOpts, {
@@ -4863,6 +4850,39 @@
$('#testrecordcout').val('-1');
});
+ // 鍙抽敭鑿滃崟鏄剧ず
+ treeView.ele.on('mousedown', '.eleGroup', function(e) {
+ //鍒╃敤jquery鐨勬柟寮忚幏鍙栧綋鍓嶇偣鍑荤殑鏄惁鏄彸閿�
+ if(e.which==3)
+ {
+ BattGroupId=$(this).attr("id");
+ var disX=(e||event).clientX+10; //寰楀埌榧犳爣鐐瑰嚮X鐨勪綅缃�
+ var disY=(e||event).clientY+10; //寰楀埌榧犳爣鐐瑰嚮Y鐨勪綅缃�
+ var scrollY=$(window).scrollTop(); //鑾峰彇娴忚鍣ㄦ粴鍔ㄧ殑楂樺害
+ //console.log(scrollY);
+ var oRightMenu=document.getElementById("right_menu");
+
+ $(this).click();
+
+ //鏄剧ず鑿滃崟鍐呭
+ $("#right_menu").show();
+ $("#right_menu .more_menu").hide();
+ $("#right_menu .angle").hide();
+ //console.log(disX+"***"+disY);
+ //浣胯彍鍗曡窡闅忛紶鏍囦綅缃�
+ oRightMenu.style.left= disX+'px';
+ oRightMenu.style.top= disY+scrollY+'px';
+
+ setPosition($("#right_menu"),disX, disY);
+
+ }
+ });
+
+ //鍏ㄩ儴鏀剁缉
+ $('#all_hide').click(function(){
+ treeView.ele.find('li').removeClass('sider-menu-open');
+ });
+
// 鐢垫睜鍏呮斁鐢垫暟鎹洃鎺�
var batt_list = $('.batt-listen .batt-list');
batt_list.on('click', 'a', function(){
diff --git a/gx_tieta/WebRoot/control.jsp b/gx_tieta/WebRoot/control.jsp
index 660fdb8..9026d13 100644
--- a/gx_tieta/WebRoot/control.jsp
+++ b/gx_tieta/WebRoot/control.jsp
@@ -3130,9 +3130,7 @@
function targetBattReport(){
var batt = getBatt();
var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
- //console.info(url);
window.open(url);
- //window.open("eleAnalyse.jsp?battgroupId="+BattGroupId+"&stationId="+batt.StationId);
}
// 浣跨敤jquery瀹炵幇宸﹀鑸殑鏄剧ず鍜岄殣钘�
$(document).ready(function(){
--
Gitblit v1.9.1