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

hdw

2019-01-10 977715c1467694dd81a4015fdaab5f0e2aec45a4

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

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

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

        

        var Page = {

            pageSize:20,                 //每页的行数

            pageSize:100,                 //每页的行数

            pageCurr:1,                  //当前页码数

            pageAll:0,

        };


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

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

        

        var Page = {

            pageSize:20,                 //每页的行数

            pageSize:100,                 //每页的行数

            pageCurr:1,                  //当前页码数

            pageAll:0,

        };


 gx_tieta/WebRoot/mobil/hcheckAccpet-index.html

@@ -64,7 +64,14 @@
                aLi = $(this).index();

                console.info(aLi);

                console.info(stationlist);

                station = getbatt(stationlist,aLi);

                var pagecurr = $(this).find('a').attr('value');

                var index = 0;

                for(var i=0;i<(pagecurr-1);i++){

                    index +=pageindexNum[i]; 
                }

                index += aLi;

                //console.info(index);

                station = getbatt(stationlist,index);

                var arr=setarrbatt(arrdata,station);

                console.info(arr);

                if(arr){

@@ -75,7 +82,7 @@
        

        var arrTd = new Array();

        var arrdata = new Array();

		
        var pageindexNum = new Array();//由于过滤重复机房，分页失效，存储每页机房个数。

        var Page = {

            pageSize:20,                 //每页的行数

            pageCurr:1,                  //当前页码数

@@ -118,19 +125,21 @@
                             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;

                         //stationlist.push(model);

                         //console.info(model);

                         //if(Page.pageCurr==1){

                             loadclose();

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

                             createUl($('#battList'),model,Page.pageCurr);

                         //}else{

                             //addteUl($('#battList'),model);

                         //}

@@ -219,7 +228,7 @@
               setCookie("happroval",json);  //这里setcookie,若有上一条cookie则清空上一笔

            return arr;

        }

        function addteUl(ulCon,dataList){

        function addteUl(ulCon,dataList,value){

            // 创建ul

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

            

@@ -227,7 +236,7 @@
            for (var i = 0; i < dataList.length; i++){

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

                

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

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

                                

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

                _li.append(_a);

@@ -238,12 +247,13 @@
            ulCon.append(_ul).trigger('create');            

            loadclose();

        }

         function createUl(ulCon, dataList) {

         function createUl(ulCon, dataList,value) {

            //console.info(index);

            // 清理容器下的ul

            if(Page.pageCurr==1){

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

            }

            pageindexNum[value-1]=dataList.length;

            // 创建ul

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

            

@@ -251,7 +261,7 @@
            for (var i = 0; i < dataList.length; i++){

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

                

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

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

                                

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

                _li.append(_a);


 gx_tieta/WebRoot/mobil/index.html

@@ -62,22 +62,29 @@
    <script type="text/javascript" src="mobilJs/base.js"></script>

    <script>

    $(document).bind("mobileinit", function(){

		
	
        // enable i18n

        $.mobile.i18nEnabled = false;

        //$.mobile.i18nFolder = "i18n"

        $.mobile.ignoreContentEnabled = true;



        // $(document).delegate("#btn", "vclick", function(){



        //     alert( $.trim( $("#tpl").html() ) );

        // });

        /*cleanCookie("wapproval");

        cleanCookie("happroval");

        cleanCookie("batt");

        cleanCookie("station"); */ 
    });



    $(function(){

        delCookie("pages");

        delCookie("stationId");

        delCookie("wapproval");

        delCookie("happroval");

        delCookie("batt");

        delCookie("station");

        delCookie("eleparm");

        delCookie("eleparm1"); 
        $(document.body).css( "visibility", "visible") ;

    });

    


 gx_tieta/WebRoot/mobil/wapprovalBatt-index.html

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

        

        var Page = {

            pageSize:20,                 //每页的行数

            pageSize:100,                 //每页的行数

            pageCurr:1,                  //当前页码数

            pageAll:0,

        };

@@ -115,16 +115,18 @@
                                 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;

                         //stationlist=model;

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

                     }

                 }


 gx_tieta/WebRoot/mobil/wapprovalBatt.html

@@ -248,6 +248,7 @@
    // 通过审批请求

    function exBattGroupAjax(data) {

        // 请求后台

        loadshow();

        $.ajax({

            type: 'post'

            ,async: true

@@ -258,9 +259,11 @@
                var rs = JSON.parse(res.result);

                // console.log(rs);

                if(rs.code == 1) {

                    loadclose();

                    alert("确认审核成功");

                    window.location.href="wapprovalBatt-index.html";

                }else {

                    loadclose();

                    alert('确认审核失败！');

                }        

            }


 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,16 +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;

                         //stationlist=model;

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

                     }

                 }


 gx_tieta/WebRoot/mobil/wcheckAccept.html

@@ -385,6 +385,7 @@
    // 通过审批请求

    function exBattGroupAjax(data) {

        // 请求后台

        loadshow();

        $.ajax({

            type: 'post'

            ,async: true

@@ -395,9 +396,11 @@
                var rs = JSON.parse(res.result);

                // console.log(rs);

                if(rs.code == 1) {

                    loadclose();

                    alert("确认验收成功");

                    window.location.href="wcheckAccept-index.html";

                }else {

                    loadclose();

                    alert('确认验收失败');

                }        

            }