From d870ab0a1c90abd28635a574a44b993a4fe1bf90 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.31>
Date: 星期三, 31 十月 2018 17:32:45 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele_statistics.jsp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index a3bfb88..9367c0d 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -260,7 +260,7 @@
$('#pageCurr').val(1);
formjson = jsontemp;
}
- loading.showLoading();
+ var load = layer.load();
//console.info($("#search_form").serialize());
var temp = createSearchForm();
var json = JSON.stringify(temp);
@@ -268,7 +268,7 @@
$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
//alert(123);
data=eval("("+data.result+")");
- //console.info(data);
+ console.info(data);
if(data.code==1 && data.data.length>0){
data=data.data;
battinfo_list = data;
@@ -377,10 +377,11 @@
$('#pageCurr').val(1);
$('#maintence_infor').text('');
}
- loading.hideLoading();
+
+ layer.close(load);
}).error(function(){
noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒");
- loading.hideLoading();
+ layer.close(load);
});
});
});
--
Gitblit v1.9.1