From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改
---
gx_tieta/WebRoot/charge-test.jsp | 363 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 300 insertions(+), 63 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index e5c18e4..6dd72f4 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -24,6 +24,7 @@
<link href="css/charge_test_style.css" type="text/css" rel="stylesheet" />
<link href="css/loading.css" type="text/css" rel="stylesheet" />
<link href="jqueryui/jquery-ui.css" type="text/css" rel="stylesheet" />
+<link rel="stylesheet" href="src/css/layui.css">
<link href="css/collapse.css" type="text/css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" href="css/common.css">
@@ -63,6 +64,9 @@
height: 100%;
z-index: 99;
background-color: #FFFFFF;
+ }
+ .myconfirm {
+ z-index: 999998
}
</style>
</head>
@@ -383,8 +387,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,14 +398,19 @@
</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>
<!-- 鐢垫睜缁勬満鍘嗗崱璇︾粏淇℃伅-->
<div id="card_infor">
<span class="title-log"><s:text name="The_battery_pack_machine_through_the_card"/></span> <!-- 鐢垫睜缁勬満鍘嗗崱 -->
- <div class="con-list ele-infor con-show">
+ <div id="cardInfoTab" class="whyc-tab-card">
+ <ul class="whyc-tab-title">
+ <li class="whyc-tab-this">鐢垫睜缁勪俊鎭�</li>
+ <li class="">鍩虹珯淇℃伅</li>
+ </ul>
+ </div>
+ <div class="con-list ele-infor con-show" style="height: 400px;overflow-y: auto">
<table>
<tr>
<th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
@@ -480,6 +487,170 @@
<tr>
<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">
+ <table>
+ <tr>
+ <th id="card_infor_left"><s:text name="Parameter_name"/></th> <!-- 鍙傛暟鍚嶇О -->
+ <th><s:text name="Parameter_value"/></th> <!-- 鍙傛暟鍊� -->
+ </tr>
+ <tr>
+ <td>绔欑偣ID</td>
+ <td id="station_stationid_ex"></td>
+ </tr>
+ <tr>
+ <td>绔欑偣鍚嶇О</td>
+ <td id="station_stationname"></td>
+ </tr>
+ <tr>
+ <td>鏈烘埧ID</td>
+ <td id="station_stationid"></td>
+ </tr>
+ <tr>
+ <td>鎵�灞炵粍缁�</td>
+ <td id="station_affiliation"></td>
+ </tr>
+ <tr>
+ <td>鏁版嵁鏉ユ簮</td>
+ <td id="station_dataSources"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃绫诲瀷</td>
+ <td id="station_stationType"></td>
+ </tr>
+ <tr>
+ <td>缁忕含搴�</td>
+ <td id="station_jinweidu"></td>
+ </tr>
+ <tr>
+ <td>鎵�鍦ㄥ湴鍧�</td>
+ <td id="station_stationAddr"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鐘舵��</td>
+ <td id="station_stationstate"></td>
+ </tr>
+ <tr>
+ <td>缁存姢鍗曚綅</td>
+ <td id="station_maintenanceCompany"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍦烘櫙</td>
+ <td id="station_stationscenario"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃浜ф潈</td>
+ <td id="station_stationproperty"></td>
+ </tr>
+ <tr>
+ <td>浣跨敤鍗曚綅</td>
+ <td id="station_useUnit"></td>
+ </tr>
+ <tr>
+ <td>鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_siteCode"></td>
+ </tr>
+ <tr>
+ <td>鍘嗗彶鐗╃悊绔欏潃缂栫爜</td>
+ <td id="station_historySiteCode"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鍐呴儴缂栧彿</td>
+ <td id="station_siteInternalNumber"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎷奸煶绠�绉�</td>
+ <td id="station_sitePinyinReferred"></td>
+ </tr>
+ <tr>
+ <td>涓枃绠�绉�</td>
+ <td id="station_siteChineseReferred"></td>
+ </tr>
+ <tr>
+ <td>鏄惁寮�閫氫笟鍔�</td>
+ <td id="station_isOpenBusiness"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆浜哄憳</td>
+ <td id="station_schoolPersonnel"></td>
+ </tr>
+ <tr>
+ <td>褰曞叆鏃堕棿</td>
+ <td id="station_entryTime"></td>
+ </tr>
+ <tr>
+ <td>淇敼浜�</td>
+ <td id="station_modifyPeople"></td>
+ </tr>
+ <tr>
+ <td>淇敼鏃堕棿</td>
+ <td id="station_modifyTime"></td>
+ </tr>
+ <tr>
+ <td>澶囨敞</td>
+ <td id="station_note"></td>
+ </tr>
+ <tr>
+ <td>绔欏潃鎺ユ敹鏍囪鍙婃槸鍚︽湁鏁�</td>
+ <td id="station_receiveorvalidity"></td>
+ </tr>
+ <tr>
+ <td>绉诲姩绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCMCC"></td>
+ </tr>
+ <tr>
+ <td>鐢典俊绔欏潃鍚嶇О</td>
+ <td id="station_siteNameCTC"></td>
+ </tr>
+ <tr>
+ <td>鑱旈�氱珯鍧�鍚嶇О</td>
+ <td id="station_siteNameCUCC"></td>
+ </tr>
+ <tr>
+ <td>鍝佺墝</td>
+ <td id="station_producer"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻鏃堕暱</td>
+ <td id="station_lastTimeLong"></td>
+ </tr>
+ <tr>
+ <td>缁埅娴嬬畻绫诲埆</td>
+ <td id="station_lastTimeType"></td>
+ </tr>
+ <tr>
+ <td>缁埅鍙戠敓鏃堕棿</td>
+ <td id="station_lastTimeDate"></td>
+ </tr>
+ <tr>
+ <td>鍏变韩鎯呭喌</td>
+ <td id="station_shareInfo"></td>
+ </tr>
+ <tr>
+ <td>杩愯惀鍟嗚喘涔板彂鐢垫湇鍔＄姸鍐�</td>
+ <td id="station_electPower"></td>
+ </tr>
+ <tr>
+ <td>鏄惁鍏峰鍙戠數鏉′欢</td>
+ <td id="station_isCanElectPower"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯璺▼</td>
+ <td id="station_upperStationRoute"></td>
+ </tr>
+ <tr>
+ <td>涓婄珯闅炬槗绋嬪害</td>
+ <td id="station_upperStationDifficult"></td>
+ </tr>
+ <tr>
+ <td>瀹㈡埛闂搴撴湭瀹屾垚钃勭數姹犵淮淇�</td>
+ <td id="station_clienteleErrorService"></td>
</tr>
</table>
</div>
@@ -564,12 +735,17 @@
</div>
<input type="hidden" id="lineStatus" value="0">
<input type="hidden" id="testrecordcout" value="-1"/> <!-- 璁板綍褰撳墠鏄剧ず鐨勬暟鎹槸绗嚑绗� -->
+ <!-- iframe鏁版嵁涓存椂瀛樺偍浣嶇疆 -->
+ <div id="homeInfoIframeData"></div>
</body>
<script type="text/javascript" src="jqueryui/jquery-ui.js"></script>
+<!-- 寮曞叆layui妗嗘灦 -->
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript" src="js/collapse.js"></script>
<script type="text/javascript" src="js/charge.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script> <!-- 纭妗� -->
<script type="text/javascript" src="js/popup.js"></script>
+<script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript" src="pages/js/pages/siderbar.js"></script>
<script type="text/javascript">
var permits;
@@ -1154,7 +1330,7 @@
var min = getMinFromArr(batt_test_voldata);
var new_Monnum_list = getArrByStatus(Monnum_list);
var new_batt_test_voldata = getArrByStatus(batt_test_voldata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,max,min,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,max,min,thrname, 'V'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋鐢靛帇鎶樼嚎鍥�';
@@ -1169,7 +1345,7 @@
var min = getMinFromArr(batt_test_tmpdata);
var new_Monnum_list = getArrByStatus(Monnum_list);
var new_batt_test_tmpdata = getArrByStatus(batt_test_tmpdata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max,min,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max,min,thrname, '鈩�'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -1451,7 +1627,9 @@
var battinf=getBattinfById();
var arr = batt_test_data[slide_index];
//console.info("MonCapStd:"+battinf.MonCapStd+";test_curr:"+list.test_curr+";test_cap:"+list.test_cap+";maxvol:"+Math.max.apply(null, Monvol_list)+";minvol:"+Math.min.apply(null, Monvol_list)+";monvolstd:"+battinf.MonVolStd);
- var over_cap=GetMonomerCap(battinf.MonCapStd,GetHourRate(battinf.MonCapStd,list.test_curr),list.test_cap,Math.max.apply(null, arr),Math.min.apply(null, arr),battinf.MonVolStd,CapType_Rest);
+ //console.info(list);
+ var avg_curr = list.test_timelong>0?list.test_cap*3600/list.test_timelong:list.test_curr;
+ var over_cap=GetMonomerCap(battinf.MonCapStd,GetHourRate(battinf.MonCapStd,avg_curr),list.test_cap,Math.max.apply(null, arr),Math.min.apply(null, arr),battinf.MonVolStd,CapType_Rest);
//console.info(over_cap);
if(list.test_type == 2){
over_content.value="---";
@@ -1488,25 +1666,30 @@
var oChargeThrInfor=document.getElementById("charge_thr_infor");
var batteststopDataList = new Array();
//鏍规嵁鎸囧畾鐨勬祴璇曟暟鎹煡璇㈢粨鏉熸椂鐨勬寚瀹氱數姹犵粍鐨勬暟鎹�
- function findtestdatastop(record_count){
+ function findtestdatastop(record_count){
+ Monnum_list = new Array(); //鍒濆鍖栫數姹犵紪鍙锋暟缁�
+ Monvol_list = new Array(); //鍒濆鍖栫數姹犵數鍘嬫暟缁�
+ checkArray = new Array();
+ var arr = new Array();
+ var batt = getBattinfById();
+ //console.info(batt);
+ for(var i=0;i<batt.MonCount;i++){
+ Monnum_list[i]="#"+(i+1);
+ Monvol_list[i]= (0).toFixed(3);
+ checkArray.push(1);
+ arr[i] = (0).toFixed(3);
+ }
$ajax("post","BatttestdatastopAction_findByInfo","btds.BattGroupId="+BattGroupId+"&btds.test_record_count="+record_count, function(data){
data=eval("("+data+")");
data=data.result;
data=eval("("+data+")");
+ //console.info(data);
if(data.code==1){
data=data.data;
- batteststopDataList = data;
-
- var batt = getBattinfById();
+ batteststopDataList = data;
//console.info(batt);
var moncount = batt.MonCount;
-
- Monnum_list = new Array(); //鍒濆鍖栫數姹犵紪鍙锋暟缁�
- Monvol_list = new Array(); //鍒濆鍖栫數姹犵數鍘嬫暟缁�
- checkArray = new Array();
- var arr = new Array();
- for(var i=0;i<moncount;i++){
-
+ for(var i=0;i<moncount;i++){
Monnum_list[i]="#"+(i+1);
if(data[i] != undefined){
Monvol_list[i]=data[i].mon_vol.toFixed(3);
@@ -1514,21 +1697,20 @@
Monvol_list[i]= (0).toFixed(3);
}
arr[i]=Monvol_list[i];
- checkArray.push(1);
}
//console.info(arr);
//console.info(arrTh[li_index]);
$('#charge_thr_th').find('tr th').eq(1).text(arrTh[li_index]);
//updataSecCol($('#charge_thr_th'), arrTh[li_index], arr);
- createBattVoltable(arr);
//reflushBattStatus(data[0]);
}else{
var obj = getBattinfById();
for(var i = 1;i<=obj.MonCount;i++){
- Monnum_list.push("#"+i);
+ Monnum_list[i-1] = "#"+i;
}
}
+ createBattVoltable(arr);
});
@@ -1847,7 +2029,8 @@
//console.info(batt);
for(var i=0;i<list.length;i++){
index = (list[i].mon_num/10).toFixed(0)-1;
- Monnum_list[index]="#"+(index+1);
+ //Monnum_list[index]="#"+(index+1);
+ console.info(index);
//percentage_list[index]=list[i].conn_res.toFixed(1);
monres_list[index]=list[i].mon_res.toFixed(3);
montmp_list[index]=list[i].mon_tmp.toFixed(1);
@@ -2048,45 +2231,48 @@
batt_test_evary_record = new Array(); //璁板綍褰撳墠娴嬭瘯璁板綍鐨勬瘡绗旂殑缁勭娴嬭瘯鍊�
batt_tmp_data = new Array();
//console.info(AllTestData);
-
- if(AllTestData!=undefined){
+ var batt = getBattinfById();
+ if(AllTestData!=undefined && AllTestData.length>0){
if(Monnum_list != undefined && Monnum_list.length>0){
AllData=new Array();
//console.info(Monnum_list);
- for(var i=0;i<Monnum_list.length;i++){
+ for(var i=0;i<batt.MonCount;i++){
batt_test_voldata[i] = new Array();
batt_test_tmpdata[i] = new Array();
}
max=Number.NEGATIVE_INFINITY; //鏃犵┓灏忓��
min=Number.POSITIVE_INFINITY; //鏃犵┓澶у��
var test_record_num = 0;
- //console.info(AllTestData.length);
var batt_index = -1;
+ //console.info(Monnum_list);
//console.info("***************");
+
+ var start_record_num = AllTestData[0].record_num;
BattGroupVol[0] = new Array();
BattGroupVol[1] = new Array();
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]);
batt_test_data[++batt_index] = new Array();
test_record_num = AllTestData[i].record_num;
- if(test_record_num > 1){
+ if(test_record_num > start_record_num){
batt_test_data[batt_index]=batt_test_data[batt_index-1].slice(0);
setArrayvalue(batt_test_voldata,batt_index);
setArrayvalue(batt_test_tmpdata,batt_index);
}else{
+ //绗竴绗斿厖鏀剧數鏁版嵁
var batt = getBattinfById();
for(var k =0;k<batt.MonCount;k++){
- batt_test_data[batt_index][k] = 0;
- batt_test_voldata[k][batt_index] = 0;
- batt_test_tmpdata[k][batt_index] = 0;
+ batt_test_data[0][k] = 0;
+ batt_test_voldata[k][0] = 0;
+ batt_test_tmpdata[k][0] = 0;
}
}
}
@@ -2115,7 +2301,7 @@
var title=getTitle(Monvol_list,"Voltage");
reflushBattStatus(AllTestData[AllTestData.length-1]);
- var batt = getBattinfById();
+
//console.info(Monvol_list);
var tempmin = Math.floor(getMinFromArr(Monvol_list)*0.9);
//var tempmax = (batt.MonVolStd*1.25).toFixed(3);
@@ -2135,11 +2321,11 @@
if(line_status == 0) { // 鐢熸垚鍗曚綋鐢靛帇鎶樼嚎鍥�
max = getMaxFromArr(batt_test_voldata);
min = getMinFromArr(batt_test_voldata);
- CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_voldata,max,min,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_voldata,max,min,thrname, 'V'); //鐢熸垚鍙充笅鎶樼嚎鍥�
}else { // 鐢熸垚鍗曚綋
max = getMaxFromArr(batt_test_tmpdata);
min = getMinFromArr(batt_test_tmpdata);
- CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_tmpdata,max+20,0,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_tmpdata,max+20,0,thrname, '鈩�'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -2169,8 +2355,10 @@
var vol_list = batt_test_data[i];
var max_vol = Math.max.apply(null, vol_list);
for(var j=0;j<vol_list.length;j++){
- var actionvalue = GetMonomerCap(batt.MonCapStd,GetHourRate(batt.MonCapStd,batt_test_evary_record[i].test_curr),batt_test_evary_record[i].test_cap,max_vol,vol_list[j],batt.MonVolStd,CapType_Real);
- var restvalue = GetMonomerCap(batt.MonCapStd,GetHourRate(batt.MonCapStd,batt_test_evary_record[i].test_curr),batt_test_evary_record[i].test_cap,max_vol,vol_list[j],batt.MonVolStd,CapType_Rest);
+ //console.info(batt_test_evary_record[i]);
+ var avg_curr = batt_test_evary_record[i].test_timelong>0?batt_test_evary_record[i].test_cap*3600/batt_test_evary_record[i].test_timelong:batt_test_evary_record[i].test_curr;
+ var actionvalue = GetMonomerCap(batt.MonCapStd,GetHourRate(batt.MonCapStd,avg_curr),batt_test_evary_record[i].test_cap,max_vol,vol_list[j],batt.MonVolStd,CapType_Real);
+ var restvalue = GetMonomerCap(batt.MonCapStd,GetHourRate(batt.MonCapStd,avg_curr),batt_test_evary_record[i].test_cap,max_vol,vol_list[j],batt.MonVolStd,CapType_Rest);
//console.info(vol_list);
batt_actionCap_list[i].push(actionvalue.toFixed(0)); //瀹為檯瀹归噺 鏁扮粍
batt_restCap_list[i].push(restvalue.toFixed(0)); //鍓╀綑瀹归噺鏁扮粍
@@ -2870,7 +3058,8 @@
//console.info(title);
}else{
if("Voltage"==units){
- Titleobj.setAvg((sum/array.length).toFixed(3));
+ Titleobj.setAvg((sum/array.length).toFixed(3));
+ Titleobj.setSum(sum);
var low=getLow(1,1);
if(low.low_method==0){
//鏍规嵁鏍囩О鍊艰绠�
@@ -3150,7 +3339,7 @@
// 鑾峰彇鍏ㄩ儴鍗曚綋鐢靛帇鏁版嵁鐨勬渶鍊�
var lineMax = getMaxFromArr(new_batt_test_voldata);
var lineMin = getMinFromArr(new_batt_test_voldata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,lineMax,lineMin,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,lineMax,lineMin,thrname, 'V'); //鐢熸垚鍙充笅鎶樼嚎鍥�
$('#lineStatus').val('0');
//console.info(Monvol_list);
};break;
@@ -3162,7 +3351,7 @@
// 鏇存柊鍙充笅鏂圭殑鎶樼嚎鍥句负鍗曚綋娓╁害鎶樼嚎鍥�
var new_Monnum_list = getArrByStatus(Monnum_list);
var new_batt_test_tmpdata = getArrByStatus(batt_test_tmpdata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max+10,0,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max+10,0,thrname, '鈩�'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -3199,7 +3388,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"/>';
// 鏇存柊琛ㄦ牸绗簩鍒�
@@ -3247,7 +3436,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home);
+ var battid = batt.BattGroupId;
+ $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
});
});
@@ -3594,8 +3784,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瀹炵幇宸﹀鑸殑鏄剧ず鍜岄殣钘�
@@ -3714,16 +3904,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");
});
});
@@ -3992,7 +4172,7 @@
function getBattStr() {
var battInfo = getBattinfById();
//console.info(battInfo);
- var battStr = battInfo.StationName+'-'+battInfo.BattGroupName;
+ var battStr = battInfo.StationName+'-'+battInfo.BattGroupName+'-鏍囩О瀹归噺'+battInfo.MonCapStd+'AH';
$('#address_infor').text(battStr);
}
@@ -4101,10 +4281,10 @@
var test_groupvol_arr = new Array();
var test_onlinevol_arr = new Array();
var test_testcurr_arr = new Array(); */
- console.info(model.data);
+ //console.info(model.data);
var rsData = analyzeLD9SearchData(model.data);
- console.info(rsData);
+ //console.info(rsData);
/* for(var i=0;i<model.data.length;i++){
var obj = model.data[i];
//console.info(obj);
@@ -4125,8 +4305,8 @@
specialGroupVolOpts = $.extend(true, {}, specialGroupVolOpts, {
xdata: rsData.time,
- sdata: [rsData.groupVol, rsData.onlineVol],
- lname: ['缁勭鐢靛帇', '鍦ㄧ嚎鐢靛帇']
+ sdata: [rsData.onlineVol, rsData.groupVol],
+ lname: ['鍦ㄧ嚎鐢靛帇', '缁勭鐢靛帇']
});
specialCurrOpts = $.extend(true, {}, specialCurrOpts, {
@@ -4494,8 +4674,8 @@
specialGroupVolOpts = $.extend({}, specialGroupVolOpts, {
xdata: testtiem_arr,
- sdata: [groupvol_arr, onlinevol_arr],
- lname: ['缁勭鐢靛帇', '鍦ㄧ嚎鐢靛帇']
+ sdata: [ onlinevol_arr, groupvol_arr],
+ lname: ['鍦ㄧ嚎鐢靛帇', '缁勭鐢靛帇']
});
specialCurrOpts = $.extend({}, specialCurrOpts, {
@@ -4696,6 +4876,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(){
@@ -4728,7 +4941,11 @@
homeid: batt.StationId,
battid: batt.BattGroupId
};
- findBattinfByBattGroupId(batt.BattGroupId);
+ // findBattinfByBattGroupId(batt.BattGroupId);
+ // findStationInfoByStation(batt);
+ // 鏄剧ず鍩虹珯鏈哄巻鍗�
+ console.log(batt);
+ showHomeInfo(batt.StationId);
// 鏍规嵁鏁版嵁瀹氫綅
localSideBar(treeView, treeView.container, tmp);
});
@@ -4773,7 +4990,8 @@
function findHome() {
var tmp = {
StationName1:'',
- StationName2: ''
+ StationName2: '',
+ StationName5: ''
};
// 鏌ヨ灏嗕俊鎭�
@@ -4788,6 +5006,7 @@
label: _data.StationName+'('+_data.StationId+')',
province: _data.StationName1,
city: _data.StationName2,
+ county: _data.StationName5,
home: _data.StationName,
homeid: _data.StationId,
battid: undefined
@@ -4801,5 +5020,23 @@
});
}
});
+
+ // 鏈哄巻鍗℃ā鍧�
+ $(function() {
+ // 鑾峰彇閫夐」鍗″垪琛�
+ var tabs = $('#cardInfoTab .whyc-tab-title li');
+ var tabContents = $('#card_infor .con-list');
+ // 鐐瑰嚮tabs瑙﹀彂
+ tabs.click(function() {
+ var index = $(this).index();
+ // 绉婚櫎鐗规晥
+ tabs.removeClass('whyc-tab-this');
+ tabContents.removeClass('con-show');
+
+ // 鏄剧ず鐗规晥
+ $(this).addClass('whyc-tab-this');
+ tabContents.eq(index).addClass('con-show');
+ });
+ });
</script>
</html>
--
Gitblit v1.9.1