From 0ac46331c1829fbca7cc1873f8d143de2e5feee9 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 09:59:39 +0800
Subject: [PATCH] 修改内容
---
gx_tieta/WebRoot/charge-test.jsp | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 91dca38..b6a0c0a 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -484,6 +484,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">
@@ -1317,7 +1321,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 = '鍗曚綋鐢靛帇鎶樼嚎鍥�';
@@ -1332,7 +1336,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 = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -1614,7 +1618,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="---";
@@ -2298,11 +2304,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 = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -2332,8 +2338,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)); //鍓╀綑瀹归噺鏁扮粍
@@ -3313,7 +3321,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;
@@ -3325,7 +3333,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 = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -3410,8 +3418,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);
});
});
@@ -4255,10 +4263,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);
--
Gitblit v1.9.1