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 | 111 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 41 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 91dca38..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>
@@ -484,6 +488,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">
@@ -727,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;
@@ -1317,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 = '鍗曚綋鐢靛帇鎶樼嚎鍥�';
@@ -1332,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 = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -1614,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="---";
@@ -1651,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);
@@ -1677,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);
});
@@ -2010,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);
@@ -2211,22 +2231,24 @@
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++){
@@ -2240,16 +2262,17 @@
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;
}
}
}
@@ -2278,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);
@@ -2298,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 = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -2332,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)); //鍓╀綑瀹归噺鏁扮粍
@@ -3033,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){
//鏍规嵁鏍囩О鍊艰绠�
@@ -3313,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;
@@ -3325,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 = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -3410,8 +3436,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);
});
});
@@ -4146,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);
}
@@ -4255,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);
@@ -4915,8 +4941,11 @@
homeid: batt.StationId,
battid: batt.BattGroupId
};
- findBattinfByBattGroupId(batt.BattGroupId);
- findStationInfoByStation(batt);
+ // findBattinfByBattGroupId(batt.BattGroupId);
+ // findStationInfoByStation(batt);
+ // 鏄剧ず鍩虹珯鏈哄巻鍗�
+ console.log(batt);
+ showHomeInfo(batt.StationId);
// 鏍规嵁鏁版嵁瀹氫綅
localSideBar(treeView, treeView.container, tmp);
});
--
Gitblit v1.9.1