Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

whyclj

2019-01-10 36dcc192d70e52978e78c9b6e6cebec62a20fa51

 gx_tieta/WebRoot/mobil/batt-approve-index.html

@@ -45,6 +45,16 @@
         </div>

      </div>

   </body>

   <div data-role="main" class="ui-content">

         <div class="tbl-container"></div>

   </div>

   <script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>

   <script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>

   <script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>

   <script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>

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

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

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

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

   <script type="text/javascript">

      var stationlist = new Array();

@@ -54,7 +64,7 @@
         setCookie("station",null);

         setCookie("batt",null);

         searchBattLife();

         getnumber();//查询所有的通讯技术并放入缓存。

		
      });

      

      // 点击机房事件

@@ -70,11 +80,29 @@
         });      

      });

      

      // 监测页面滚动到文档的底部

      $(document).on('scrollstop', function() {

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

         var loading = $('.ui-loading');

         var scrollTop = $(this).scrollTop();

         var pageNum = Math.ceil(Page.pageAll/Page.pageSize);

         //console.info(pageNum);

         if(loading.length == 0 ) {

            var winHt = $(window).height();

            var docHt = $(this).height();

            var shiftHt = docHt - winHt;

            if(shiftHt < scrollTop || shiftHt == scrollTop) {

               Page.pageCurr++;

                    searchBattLife();						
            }

         }

      });

		
      var arrTd = new Array();

      var arrdata = new Array();

      

      var Page = {

         pageSize:20,             //每页的行数

         pageSize:100,             //每页的行数

         pageCurr:1,              //当前页码数

         pageAll:0,

      };

@@ -82,30 +110,14 @@
      function getcreatArr(){

         obj = {

            apply_en : 1,

            check_en:0,

            binf : {

               page:Page,                  

            }

         }

         return obj;

      }

      function getnumber(){    //向获取所有通讯计数并存入缓存

         $.ajax({

             type: 'post',

            async: true,

            url: 'Battinf_applyAction!devCommNum',

            data: null,

            dataType: 'json',

            success:function(data) {

               data = JSON.parse(data.result);

               if(data.code==1){

                  console.info(data.data);

                  var json =JSON.stringify(data.data);

                  setCookie("numberget",json);

                  //return data.data;	
               }

            }

         });

       }	
		
      // 查询内容

      function searchBattLife(){

         var temp = JSON.stringify(getcreatArr());

@@ -119,13 +131,14 @@
            data: "json="+temp,

            dataType: 'json',

            success:function(data) {

               console.info(data);

                data = JSON.parse(data.result);

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

                   data=data.data

                   var model = new Array();

                   console.info(data);

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

                      if(data[i].check_en!=1){

                      //if(data[i].check_en!=1){

                         arrdata.push(data[i]);//存储数据

                         if(model.length==0){

                            model.push(data[i].binf.StationName);

@@ -135,10 +148,15 @@
                            }

                         }

                         console.info(model);

                         stationlist=model;

                      }

		 						
                   //   }

                   }	
                   stationlist=model;

                   if(Page.pageCurr==1){

                      createUl($('#battList'),model);

                   }else{

                      addUl($('#battList'),model);

                   }

                   createUl($('#battList'),model);

                }

             }

          });          

@@ -237,6 +255,26 @@
         ulCon.append(_ul).trigger('create');         

         loadclose();

      }

      function addUl(ulCon, dataList) {

			
         // 创建ul

         var _ul = $('<ul data-role="listview" data-inset="true"></ul>');

			
         // 遍历dataList生成li和a

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

            var _li = $('<li></li');

				
            var _a = $('<a href="#page1" value=""  data-transition="slide">'+dataList[i]+'</a>');

								
            // 将_a添加到_li，将_li添加到_ul中

            _li.append(_a);

            _ul.append(_li);

         }

			
         // 将_ul添加到容器中

         ulCon.append(_ul).trigger('create');			
         loadclose();

      }

      

      //获取当前选中的batt

      function getbatt(arr,index){