From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/elegroup.jsp | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index bed6642..14a8051 100644
--- a/gx_tieta/WebRoot/elegroup.jsp
+++ b/gx_tieta/WebRoot/elegroup.jsp
@@ -756,12 +756,18 @@
});
}
var json=window.JSON.stringify(baoji_user);
+
+ // 鏄剧ず绛夊緟妗�
+ loading.showLoading();
+ return;
//console.info(json);
$.post('User_battgroup_baojigroup_usrAction!add',"json="+json,function(data){
var model=eval("("+data.result+")");
alert(model.msg);
var baojizuid=$('#lbottom .li-con li.b8cfe5').attr('value');
searchBaojiZuUser(baojizuid);
+ // 闅愯棌绛夊緟妗�
+ loading.showLoading();
});
}else{
alert('<s:text name="There_is_nothing_to_be_done"/>'); /* 娌℃湁浠�涔堝彲浠ュ仛鐨� */
@@ -1653,11 +1659,16 @@
// 璁╁鍣ㄥ唴鐨勮〃鏍煎搴︿竴鑷�
$('#rtop table').width(tbRoomWidth-20);
getbattStationlength();
+ //console.info(bigArrTxt);
+ if(bigArrTxt.length != 0) {
+ // 璁惧琛ㄦ牸婊氬姩鍒伴《閮�
+ scrollBottom($('#tbroom'), $('#tbroom table'));
+ // 鏈烘埧鍒楄〃婊氬姩鍒伴《閮�
+ scrollBottom($('#ltop .li-con'), $('#ltop .li-con ul'));
+ }else {
+ alert('娣诲姞鐨勫唴瀹瑰凡瀛樺湪锛�');
+ }
- // 璁惧琛ㄦ牸婊氬姩鍒伴《閮�
- scrollBottom($('#tbroom'), $('#tbroom table'));
- // 鏈烘埧鍒楄〃婊氬姩鍒伴《閮�
- scrollBottom($('#ltop .li-con'), $('#ltop .li-con ul'));
}
//娣诲姞琛ㄦ牸鐨勪竴琛�
--
Gitblit v1.9.1