修改实时和历史机历卡为基站机历卡

hdw

2018-11-26 a7adbf6bf46de9ec3753d4b6cc6c8b5cc83cdcf9

 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;

@@ -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="---";

@@ -2332,8 +2347,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 +4272,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 +4932,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);

      });