Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

hdw

2019-01-16 cdd5fe1813e63adcddd61581cb886b9d154e5a3c

 gx_tieta/WebRoot/mobil/ele-param2.html

@@ -224,6 +224,7 @@
    <!-- 存在机房信息 -->

    <div id="homeInfoIframe"></div>

    <input id="handle_status" value="" type="hidden">

    <input id="jifangname" value="" type="hidden">

    <script src="src/layui.all.js"></script>

    <script type="text/javascript" src="js/tbl.js"></script>

    <script type="text/javascript" src="mobilJs/base.js"></script>

@@ -300,8 +301,8 @@
            StationName1:'',

            StationName2: '',

            StationName5:''

         };

			
         };	
         loadshow();

         // 查询机房信息

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

            var rs = JSON.parse(result.result);

@@ -325,6 +326,7 @@
               //console.log(homeSource)

               // 设置资源内容

               $('#searchHomeIframe').data('homeSource', homeSource);

               loadclose();

            }

         });

         

@@ -364,6 +366,11 @@
       }else{

             setcookieCreat(Page.pageSize-1);

          }

          var test=getCookie("eleparm2newbatt");

                        console.info(test);

         var jiafangname = $("#jifangname").val();

         console.info($("#jifangname").val());

         console.info(test);

        window.location.href="batt-infor-conf-temp1.html";   

    });

    

@@ -374,6 +381,7 @@
    var endTime = new Date().format('yyyy-MM-dd');

    var tbl = $('.tbl-container');

    createTbl(tbl, arrTh, dataArr);

    serchProducer();

   $(document).ready(function(){

      setPage();   

      //newbattnum;      

@@ -554,6 +562,7 @@
            getEditButIndex(0);      

         }   

      });     





   }

   //构造查询条件

@@ -815,9 +824,33 @@
      

   }

      





 
   function serchProducer(){

   var battproducer = new Array();  	
        $.ajax({

         type: 'post'

         ,async: false

         ,url: 'BattInfAction!serchByBattProducer'

         ,data: null

         ,dataType: 'json'

         ,success:function(res) {

            //console.info(res);

            data = JSON.parse(res.result);

            console.info(data.data);

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

               data = data.data;

               for(var i=0;i<data.length;i++){

                  //console.info(data);

                  battproducer.push(data[i].BattProducer);				
               }	
            }

         var   json = window.JSON.stringify(battproducer);

         setCookie("producer",json);

         //var battproduce = getCookie("producer");

           //battproduce1 = JSON.parse(battproduce);

           //console.info(battproduce1);

         }		
      });

   }