未审批可更改

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-18 2fe250ece8de95b3f70172fe5b45793ab6a3084a

 gx_tieta/WebRoot/eleMonomer.jsp

@@ -627,10 +627,12 @@
      });

   });

   

   var isNewLoad = true;

   // 省-市-机房-电池组

   var filterLoad;

   $(document).ready(function(){

      filterLoad = layer.load();

      var pre_province = getQueryString("province");

      //页面加载时查询维护区中的枢纽类型

      $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){

         data=data.result;

@@ -646,7 +648,10 @@
                  $option.attr("value", "");         

               }else{

                  $option.text(data.data[i-1]);

                  $option.attr("value",data.data[i-1]);	
                  $option.attr("value",data.data[i-1]);

                  if(pre_province == data.data[i-1] && isNewLoad){

                     $option.attr('selected',true);

                  }	
               }               

               $select.append($option);

            }

@@ -666,6 +671,7 @@
      if(isLoad) {

         filterLoad = layer.load();

      }

      var pre_city = getQueryString("city");

      // 请求获取当前省下的市

      $.ajax({    

           type: "post",             

@@ -683,6 +689,9 @@
               for(var i=0;i<_data.length;i++){

                  var __data = _data[i];

                  var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);

                  if(pre_city == __data.StationName2 && isNewLoad){

                     tmp = getOptionsData(__data.StationName2, __data.StationName2, __data,{},true);

                  }

                  optsList.push(tmp);

               }

               // 根据数据生成下拉列表

@@ -706,7 +715,7 @@
      if(isLoad) {

         filterLoad = layer.load();

      }

		
      var pre_county = getQueryString("county");

      // 查询区县

      $.ajax({

         type: 'post',

@@ -726,6 +735,9 @@
                     StationId: __data.StationId

                  };

                  var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);

                  if(pre_county == __data.StationName5 && isNewLoad){

                     tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr,{},true);

                  }

                  optsList.push(tmp);

               }

               

@@ -765,6 +777,7 @@
      if(isLoad) {

         filterLoad = layer.load();

      }

      var pre_home = getQueryString('home');

      //var selectvalue=$("#station_name1 option:selected").val();

      //alert(selectvalue);

      $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){

@@ -780,6 +793,9 @@
                  StationId: __data.StationId

               };

               var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);

               if(pre_home == __data.StationName && isNewLoad){

                  tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr,{},true);

               }

               optsList.push(tmp);

            }

            

@@ -812,6 +828,7 @@
      if(isLoad) {

         filterLoad = layer.load();

      }

      var pre_battid = getQueryString("battid");

      //var station_name1=$("#station_name1 option:selected").val();

      //var station_name=$("#station_name option:selected").val();

      

@@ -833,6 +850,10 @@
               };

               var txt = _data.BattGroupName+'-'+_data.MonCount+"<s:text name='Section'/>";

               var tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr);

               if(pre_battid == _data.BattGroupId && isNewLoad){

                  tmp = getOptionsData(txt, _data.BattGroupId, _data, _attr,{},true);

               }

					
               optsList.push(tmp);

            }

            

@@ -842,7 +863,6 @@
         }else{

            $("#battgroup_name").text('').html('<option>暂无可测蓄电池组</option>');

         }

			
         searchBattMonNum();

      });

   }

@@ -864,11 +884,12 @@
         OSingle_number.append($option);

         layer.close(filterLoad);

      }else{

         console.info(battgroup_id);

         var pre_monnum = getQueryString("monnum");

         //console.info(battgroup_id);

         $.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){

            data=data.result;

            data=eval("("+data+")");

            console.log(data);

            //console.log(data);

            if(data.code==1 && data.data.length>0){

               data=data.data[0];

               OSingle_number.text('');

@@ -877,8 +898,9 @@
                  if(i!=0){

                     $option.html(i);

                     $option.attr("value", i);

                     if(mon_num == i && isNewload){

                        isNewload = false;

                     //console.info(pre_monnum +"==="+ i +"***"+isNewLoad);

                     if(pre_monnum == i && isNewLoad){

								
                        $option.attr('selected','selectted');

                     }

                  }else{

@@ -889,9 +911,11 @@
               }

            }

            layer.close(filterLoad);

            isNewLoad = false;

            searchMonomer();

         });

      }

		
   }

   

   $('#container .search').click(function(){

@@ -938,7 +962,7 @@
      //创建等待的框框

      loading.showLoading($('#main'));

      var monNum = $('#Single_number').val()?$('#Single_number').val():0;

      console.log($("#search_form").serialize());

      //console.log($("#search_form").serialize());

      var temp ={

         binf:{

            StationName1:$('#station_name1').val(),

@@ -960,7 +984,7 @@
            data=data.result;

            var model = eval("("+data+")");

            //alert(battgroupid);

            console.info(model);

            //console.info(model);

            var totalcount = 0;

            if(model.code==1 && model.data.length>0){               

               data = model.data;

@@ -996,7 +1020,10 @@
                     arrChargeTd.push(testdata.sdata.test_cap.toFixed(1));         //测试容量

                     arrChargeTd.push(testdata.sdata.mon_num);                  //单体编号

                     arrChargeTd.push(testdata.sdata.mon_vol.toFixed(3));            //单体电压

                     var realCap=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,testdata.sdata.test_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Real));      //实际容量

                     console.info(testdata.sdata.test_curr);

                     var avg_curr = testdata.sdata.test_timelong>0?testdata.sdata.test_cap*3600/testdata.sdata.test_timelong:testdata.sdata.test_curr;         //计算平均的放电电流 
                     //console.info("avg="+avg_curr);

                     var realCap=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,avg_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Real));      //实际容量

                     //console.info(data[i].data.tdata.max_monvol);

                     arrChargeTd.push(realCap);

                     

@@ -1005,7 +1032,7 @@
                     RealCaplist[testdata.sdata.mon_num-1].push(realCap);               

                     

                     

                     var rest=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,testdata.sdata.test_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Rest));      //剩余容量

                     var rest=Math.round(GetMonomerCap(testdata.binf.MonCapStd,GetHourRate(testdata.binf.MonCapStd,avg_curr),testdata.sdata.test_cap,testdata.tdata.max_monvol,testdata.sdata.mon_vol,testdata.binf.MonVolStd,CapType_Rest));      //剩余容量

                     arrChargeTd.push(rest);

                     arrChargeTd.push((realCap*100/testdata.binf.MonCapStd).toFixed(0)+"%");      //容量百分比

                     if(realCap >= testdata.binf.MonCapStd*lowCA){

@@ -1137,7 +1164,7 @@
            }else{

               noContent.showNoContent("暂无查询数据");

            }

            console.info(Conductpercentlist);

            //console.info(Conductpercentlist);

            $('#total').text(totalcount);

            var tblScroll=$('#eleInforTab').scrollLeft();

            $('#tbHead table').css('left',-tblScroll);