From d8289e24b58b0764df52a1eb0b9c33ef60b8efa5 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期三, 17 十月 2018 15:25:04 +0800
Subject: [PATCH] 加
---
gx_tieta/WebRoot/elegroup.jsp | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/elegroup.jsp b/gx_tieta/WebRoot/elegroup.jsp
index bed6642..1ba172c 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"/>'); /* 娌℃湁浠�涔堝彲浠ュ仛鐨� */
@@ -885,7 +891,8 @@
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
$(document).ready(function(){
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
- $.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
+ $.post("BattInfAction!serchAllStation_all",null,function(data){
+ //console.info(data);
data=data.result;
data=eval("("+data+")");
//console.info(data);
@@ -898,13 +905,13 @@
$option.html("<s:text name='All'/>(<s:text name='Common'/>"+data.data.length+"<s:text name='Species'/>)");
$option.attr("value", "");
}else{
- $option.text(data.data[i-1]);
- $option.attr("value",data.data[i-1]);
+ $option.text(data.data[i-1].StationName1);
+ $option.attr("value",data.data[i-1].StationName1);
}
$select.append($option);
}
}else{
- $("#station_name1").text('').html('<option>鏆傛棤绠＄悊鐨勭淮鎶ゅ尯</option>');
+ $("#station_name1").text('').html('<option>鏆傛湭娣诲姞鐪�</option>');
}
findCity();
});
@@ -918,7 +925,7 @@
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
- url: "BattInfAction!serchStationName2",
+ url: "BattInfAction!serchStationName2_all",
async:true,
dataType:'json',
data:"json = "+JSON.stringify(data),
@@ -962,7 +969,7 @@
};
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
- $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
+ $.post("BattInfAction!serchStationName3_all","json="+JSON.stringify(tmp),function(data){
var rs = JSON.parse(data.result);
if(rs.code==1){
var _data = rs.data;
@@ -1006,7 +1013,7 @@
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
- $.post("BattInfAction!serchBattByStation","json="+JSON.stringify(tmp),function(data){
+ $.post("BattInfAction!serchBattByStation_all","json="+JSON.stringify(tmp),function(data){
data=data.result;
//console.info(data);
data=eval("("+data+")");
@@ -1653,11 +1660,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