From 2f967bc373b23a48ff986a965155361a70bd2eb0 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.112>
Date: 星期五, 04 一月 2019 15:40:25 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index c0b02b5..954e637 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/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,24 +581,30 @@
//console.log(res);
var rs = JSON.parse(res.result);
var resData = [];
+ var isUpdateTbl = false;
+ //console.log(Page.all);
if(rs.code == 1) {
var data = rs.data;
- // console.log(data);
+ //console.log(data);
// 閬嶅巻鏁版嵁鐨勫��
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 &&_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);
--
Gitblit v1.9.1