hdw
2018-11-20 0ac46331c1829fbca7cc1873f8d143de2e5feee9
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">
@@ -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="---";
@@ -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));               //剩余容量数组
@@ -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);