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

81041

2019-01-18 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e

 gx_tieta/WebRoot/mobil/hcheckAccpet.html

@@ -195,6 +195,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/homeinfo1.html'

                ,success: function() {

                   $('div[data-role=page]').hide();

                }

                ,end: function() {

                   $('div[data-role=page]').show();

                }

            });

            layer.full(iframePopup);

      // applyendyanshou(arr);      

@@ -220,13 +226,13 @@
    var startTime = "1980-01-01";

    var endTime = new Date().format('yyyy-MM-dd');

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

    var temp = getCookie("wapproval");

    var temp = getCookie("happroval");

   temp = JSON.parse(temp);

   console.info(temp);

    createTbl(tbl, arrTh, dataArr);

   $(document).ready(function(){

      Page.pageCurr=1;      

      console.info(temp);

      //console.info(temp);

      setBattLife();

      battnumber();

      //searchBattLife();

@@ -241,7 +247,7 @@
   

   $("#jizhandata").click(function(){

         // 查看机房信息

         var temp = getCookie("wapproval");

         var temp = getCookie("happroval");

         data = JSON.parse(temp);

         var lng = data[0].longitude;                     // 获取经度

         var lat = data[0].latitude;                     // 获取纬度

@@ -255,6 +261,7 @@
            ,lng: lng

            ,lat: lat

         }

         console.info(temp);

         // 显示暂无可设站点

         if(homeId == 0) {

            layer.msg(homeName);

@@ -271,6 +278,12 @@
                ,full: true

                ,anim: 4

                ,content: 'iframe/seenhomeinfo.html'

                ,success: function() {

                   $('div[data-role=page]').hide();

                }

                ,end: function() {

                   $('div[data-role=page]').show();

                }

            });

            layer.full(iframePopup);

   });