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

81041

2019-01-03 0afa84e6de17cda97792f3acd114fffa552ee163

 gx_tieta/WebRoot/ex-battinfo.jsp

@@ -481,7 +481,7 @@
            

            // 跳转到实时页面

            function controlPage(data) {

               console.log(data);

               // console.log(data);

               var home = data.StationName;

               var province = data.StationName1;

               var city = data.StationName2;

@@ -550,7 +550,7 @@
                  ,complete: function() {

                     layer.close(load);

                     // 启动自动刷新

                     //updateSearch();

                     updateSearch();

                  }

               });

            }

@@ -581,6 +581,7 @@
                     //console.log(res);

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

                     var resData = [];

                     var isUpdateTbl = false;

                     if(rs.code == 1) {

                        var data = rs.data;

                        // console.log(data);

@@ -588,17 +589,22 @@
                        for(var i=0; i<data.length; i++) {

                           var _data = data[i];

                           var _tmp = formaterResData(_data);

                           resData.push(_tmp);

                           Page.setAll(_data.apply_note);

									
                           if(_data.apply_note != Page.all) {

                              resData.push(_tmp);

                              Page.setAll(_data.apply_note);

                              isUpdateTbl = true;

                           }

                        }

                     }else {

                        Page.setAll(0);

                     }

                     $('#applyNum').text(Page.all);    // 设置徽章

                     tOptions.data = resData;   //  设置表格的数据

							
                     // 生成表格数据

                     table.reload('pageTbl', tOptions);

                     // console.log(isUpdateTbl);

                     if(isUpdateTbl) {

                        $('#applyNum').text(Page.all);    // 设置徽章

                        tOptions.data = resData;   //  设置表格的数据

                        table.render(tOptions);

                     }

                     

                     // 实时回调

                     updateSearch.timer = setTimeout(updateSearch, 4000);

@@ -645,7 +651,7 @@
                     

                     // 生成表格数据

                     table.render(acceptOptions);

                     console.log(table);

                     // console.log(table);

                  }

                  ,complete: function() {

                     layer.close(load);