From ddd362a58e5827b123ee16778e7b6fcc4e762542 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.31>
Date: 星期三, 31 十月 2018 15:19:22 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ele-param.jsp | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/ele-param.jsp b/gx_tieta/WebRoot/ele-param.jsp
index 52ebfe6..97c5a42 100644
--- a/gx_tieta/WebRoot/ele-param.jsp
+++ b/gx_tieta/WebRoot/ele-param.jsp
@@ -19,6 +19,7 @@
<script type="text/javascript" src="jqueryui/jquery-ui.js"></script>
<link rel="stylesheet" type="text/css" href="css/confirm.css">
<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css" media="screen">
.revise{
color: #293EF6;
@@ -212,6 +213,7 @@
<script type="text/javascript" src="js/popup.js"></script>
<script type="text/javascript" src="js/myConfirm.js"></script>
<script type="text/javascript" src="js/whyc-jqueryui.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page = {
pageCurr:1,
@@ -586,7 +588,10 @@
container.addClass('revise-sel-active').removeClass('revise-sel');
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("BattInfAction!serchAllStation_all",null,function(data){
data=data.result;
@@ -610,10 +615,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -644,12 +653,15 @@
}
// 鏌ヨ鍖�/鍘�
- function findCounty() {
+ function findCounty(isLoad) {
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -684,26 +696,30 @@
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findCounty();
+ findCounty(true);
});
//褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#county').change(function(){
- findStationNamebyStationname1();
+ findStationNamebyStationname1(true);
});
//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
StationName5: $("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3_all","json="+JSON.stringify(tmp),function(data){
@@ -727,6 +743,9 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+
+ layer.close(filterLoad);
+
searchBatt();
});
}
@@ -754,7 +773,7 @@
});
arrTd = new Array();
allData = new Array();
- loading.showLoading($('#main'));
+ var load = layer.load();
$.ajax({
type: "post",
url: "BattInfAction!searchInform",
@@ -764,7 +783,7 @@
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
- console.info(model);
+ //console.info(model);
if(model.code ==1){
for(var i=0;i<model.data.length;i++){
allData.push(model.data[i]);
@@ -818,11 +837,11 @@
$('#total').text(Page.pageAll);
$('#current').text(Page.pageCurr+"/"+pageNum);
createFullTbl($('.tbl-header'), $('.tbl-body'), arrTh, arrTd);
- loading.hideLoading($('#main'));
+ layer.close(load);
},
error:function(){
noContent.showNoContent("鏌ヨ澶辫触");
- loading.hideLoading($('#main'));
+ layer.close(load);
}
});
}
--
Gitblit v1.9.1