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

whyclj

2019-01-10 36dcc192d70e52978e78c9b6e6cebec62a20fa51

 gx_tieta/WebRoot/mobil/wcheckAccept-index.html

@@ -74,7 +74,7 @@
      var arrdata = new Array();

      

      var Page = {

         pageSize:20,             //每页的行数

         pageSize:100,             //每页的行数

         pageCurr:1,              //当前页码数

         pageAll:0,

      };

@@ -115,15 +115,17 @@
                         arrdata.push(data[i]);//存储数据

                         if(model.length==0){

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

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

                         }else{

                            if(model[model.length-1]!=data[i].binf.StationName){//若不重复，则PUSH进去

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

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

                            }

                         }

                         console.info(model);

                         stationlist=model;

                         console.info(model);	
                      }

                   }

                   //stationlist=model;

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

                }

             }

@@ -159,7 +161,7 @@
                  address:arrdata[i].address,//地址

                  binf:{

                     StationId : arrdata[i].binf.StationId,   // 机房编号

                     StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName5+"-"+arrdata[i].binf.StationName3),   // 拼接机房名称

                     StationName : (arrdata[i].binf.StationName1+"-"+ arrdata[i].binf.StationName2+"-"+arrdata[i].binf.StationName3+"-"+arrdata[i].binf.StationName4),   // 拼接机房名称

                     StationName1 :arrdata[i].binf.StationName1,      // 省

                     StationName2 : arrdata[i].binf.StationName2,      // 市

                     StationName5 :  arrdata[i].binf.StationName5,      // 区/县

@@ -208,11 +210,12 @@
         return arr;

      }

      

       function createUl(ulCon, dataList) {

      function createUl(ulCon, dataList) {

         //console.info(index);

         // 清理容器下的ul

         ulCon.find('ul').remove();

			
         if(Page.pageCurr==1){

            ulCon.find('ul').remove();

         }

         // 创建ul

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