From 2e979a30ffd7fabf7e1a4d9fbd419c24603073ed Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 14:46:40 +0800
Subject: [PATCH] 添加筛选条件加载等待
---
gx_tieta/WebRoot/eleAnalyse.jsp | 94 ++++++++++++-
gx_tieta/WebRoot/css/analyse.css | 4
gx_tieta/WebRoot/dischargetest.jsp | 44 ++++-
gx_tieta/WebRoot/batt-attention.jsp | 43 ++++-
gx_tieta/WebRoot/ele-param.jsp | 41 ++++-
gx_tieta/WebRoot/dataManage.jsp | 42 ++++-
gx_tieta/WebRoot/ele_statistics.jsp | 101 ++++++++++++--
7 files changed, 305 insertions(+), 64 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-attention.jsp b/gx_tieta/WebRoot/batt-attention.jsp
index 2e9c248..fdadaf0 100644
--- a/gx_tieta/WebRoot/batt-attention.jsp
+++ b/gx_tieta/WebRoot/batt-attention.jsp
@@ -15,6 +15,7 @@
<link rel="stylesheet" type="text/css" href="css/query.css">
<link rel="stylesheet" type="text/css" href="css/nocontent.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
</head>
<body>
@@ -126,6 +127,7 @@
<script type="text/javascript" src="js/loading.js"></script>
<script type="text/javascript" src="js/rightmenu.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
+ <script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var Page = {
pageCurr:1,
@@ -332,7 +334,10 @@
});
});
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -360,10 +365,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -394,12 +403,15 @@
}
// 鏌ヨ鍖�/鍘�
- function findCounty() {
+ function findCounty(isLoad) {
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -434,21 +446,21 @@
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#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(),
@@ -483,12 +495,16 @@
// 鍒囨崲鏈烘埧鏇存柊鐢垫睜缁�
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
+ function findserchByBattGroupNamebystationname(isLoad){
var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#station_name1").val(),
@@ -531,11 +547,12 @@
});
}
+ // 鏌ヨ鐢垫睜鍗曚綋
$('#battgroup_name').change(function(){
searchBattMonNum();
});
- function searchBattMonNum(){
+ function searchBattMonNum(isLoad){
//褰撻�夋嫨钃勭數姹犵粍鏃�
var battgroup_id = $('#battgroup_name').val();
var OSingle_number = $('#Single_number');
@@ -545,7 +562,12 @@
$option.attr("value", 0);
OSingle_number.text('');
OSingle_number.append($option);
+ layer.close(filterLoad);
}else{
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏍规嵁鐢垫睜缁刬d鏌ヨ鍗曚綋鏁伴噺
$.post("BattInfAction!serchByMonNum","bif.BattGroupId="+battgroup_id,function(data){
data=data.result;
@@ -565,6 +587,7 @@
OSingle_number.append($option);
}
}
+ layer.close(filterLoad);
});
}
}
diff --git a/gx_tieta/WebRoot/css/analyse.css b/gx_tieta/WebRoot/css/analyse.css
index 5a05ff6..a7f3baf 100644
--- a/gx_tieta/WebRoot/css/analyse.css
+++ b/gx_tieta/WebRoot/css/analyse.css
@@ -62,6 +62,7 @@
overflow: hidden;
}
#tbHead table{
+ width: 100%;
position:absolute;
border-spacing: 0;
border-collapse: collapse;
@@ -89,6 +90,7 @@
overflow: scroll;
}
#tabContainer table{
+ width: 100%;
position:relative;
border-spacing: 0;
border-collapse: collapse;
@@ -123,6 +125,7 @@
overflow: hidden;
}
#tabEchartCon .tbFixed table{
+ width: 100%;
position:relative;
border-collapse:collapse;
white-space: nowrap;
@@ -144,6 +147,7 @@
overflow: scroll;
}
#tabEchartCon .secCurve table{
+ width: 100%;
position:relative;
border-collapse:collapse;
white-space: nowrap;
diff --git a/gx_tieta/WebRoot/dataManage.jsp b/gx_tieta/WebRoot/dataManage.jsp
index 8b0a7c8..dc4686e 100644
--- a/gx_tieta/WebRoot/dataManage.jsp
+++ b/gx_tieta/WebRoot/dataManage.jsp
@@ -13,6 +13,7 @@
<title><s:text name="Batt_charge_discharge_manage"/></title>
<link rel="stylesheet" type="text/css" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/dtManage.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style>
.b8cfe5{
background-color:#b8cfe5;
@@ -207,6 +208,7 @@
<script type="text/javascript" src="js/createTab.js"></script>
<script type="text/javascript" src="js/query.js"></script>
<script type="text/javascript" src="pages/js/common.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -602,7 +604,10 @@
}
}
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -630,10 +635,16 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -664,12 +675,15 @@
}
// 鏌ヨ鍖�/鍘�
- function findCounty() {
+ function findCounty(isLoad) {
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -704,26 +718,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","json="+JSON.stringify(tmp),function(data){
@@ -752,12 +770,16 @@
}
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
+ function findserchByBattGroupNamebystationname(isLoad){
var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#station_name1").val(),
@@ -797,6 +819,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
diff --git a/gx_tieta/WebRoot/dischargetest.jsp b/gx_tieta/WebRoot/dischargetest.jsp
index 8655f70..7df1b5a 100644
--- a/gx_tieta/WebRoot/dischargetest.jsp
+++ b/gx_tieta/WebRoot/dischargetest.jsp
@@ -17,6 +17,7 @@
<link rel="stylesheet" type="text/css" href="font-awesome-4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="font-awesome-4.7.0/css/font-awesome-animation.min.css">
<link rel="stylesheet" type="text/css" href="css/whyc-ui.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style>
.confirm {
z-index: 999;
@@ -538,6 +539,7 @@
<script type="text/javascript" src="js/elecircle.content.js"></script>
<script type="text/javascript" src="js/mypattern.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 arrTh = new Array();
var arrTd = new Array();
@@ -1131,8 +1133,10 @@
}
}
-
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("BattInfAction!serchAllStation",null,function(data){
data=data.result;
@@ -1157,10 +1161,16 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -1195,26 +1205,29 @@
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撳競鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findCounty();
+ findCounty(true);
});
//褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#county').change(function(){
- findStationNamebyStationname1();
+ findStationNamebyStationname1(true);
});
// 鏌ヨ鍖�/鍘�
- function findCounty() {
+ function findCounty(isLoad) {
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏌ヨ鍖哄幙
$.ajax({
type: 'post',
@@ -1248,12 +1261,16 @@
}
//鏍规嵁缁存姢鍖烘煡璇㈢珯鐐�
- 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","json="+JSON.stringify(tmp),function(data){
@@ -1282,11 +1299,11 @@
}
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁缁存姢鍖哄拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
+ function findserchByBattGroupNamebystationname(isLoad){
var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
@@ -1296,7 +1313,10 @@
StationName: $("#station_name").val(),
StationId: stationid
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
@@ -1326,6 +1346,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
// 闅愯棌琛ㄦ牸鍔熻兘鎸夐挳鍒楄〃
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);
}
});
}
diff --git a/gx_tieta/WebRoot/eleAnalyse.jsp b/gx_tieta/WebRoot/eleAnalyse.jsp
index 29e5c4d..233d130 100644
--- a/gx_tieta/WebRoot/eleAnalyse.jsp
+++ b/gx_tieta/WebRoot/eleAnalyse.jsp
@@ -14,6 +14,7 @@
<link href="css/basic.css" type="text/css" rel="stylesheet" />
<link href="css/analyse.css" type="text/css" rel="stylesheet">
<link href="css/query.css" type="text/css" rel="stylesheet">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<script type="text/javascript" src="js/echarts.js"></script>
<script type="text/javascript" src="js/eleAnalyse.js"></script>
<script type="text/javascript" src="js/frame.js"></script>
@@ -59,6 +60,8 @@
<td>鐪�</td>
<!-- 甯� -->
<td>甯�</td>
+ <!-- 鍖�/鍘� -->
+ <td>鍖�/鍘�</td>
<!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Computer_site"/></td>
<!-- 钃勭數姹犵粍 -->
@@ -87,6 +90,10 @@
</td>
<td>
<select id="city" name="bd.binf.StationName2">
+ </select>
+ </td>
+ <td>
+ <select id="county" name="bd.binf.StationName5">
</select>
</td>
<td>
@@ -233,6 +240,7 @@
<!--椤佃剼鍐呭-->
</body>
<script type="text/javascript" src="js/createTab.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -305,7 +313,9 @@
}
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -333,10 +343,16 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -361,27 +377,81 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findStationNamebyStationname1(true);
+ });
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findCounty(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5:$("#county").val()
};
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -411,20 +481,24 @@
// 鏍规嵁鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁�
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
+ function findserchByBattGroupNamebystationname(isLoad){
var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
+ StationName5:$("#county").val(),
StationName: $("#station_name").val(),
StationId: stationid
};
-
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var station_name1=$("#station_name1 option:selected").val();
//var station_name=$("#station_name option:selected").val();
@@ -455,6 +529,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index 7e7fcb1..a3bfb88 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -13,7 +13,7 @@
<title><s:text name="Batt_information_query"/></title>
<link href="css/basic.css" type="text/css" rel="stylesheet" />
<link href="css/ele_statistics.css" type="text/css" rel="stylesheet">
-
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
</head>
<body>
@@ -39,6 +39,8 @@
<td>鐪�</td>
<!-- 甯� -->
<td>甯�</td>
+ <!-- 鍖�/鍘� -->
+ <td>鍖�/鍘�</td>
<!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Computer_site"/></td>
<!-- 钃勭數姹犵粍 -->
@@ -62,6 +64,9 @@
<td>
<select id="city" name="bd.binf.StatioName2">
</select>
+ </td>
+ <td>
+ <select id="county" name="bd.binf.StatioName5"></select>
</td>
<td>
<select id="station_name" name="bd.binf.StationName">
@@ -186,9 +191,9 @@
</div>
<!-- 鍙抽敭鑿滃崟鍐呭 -->
<div id="right-menu">
- <a href="" onclick="jumpPage()" target="_blank"><s:text name="Check_battery_test_record"/></a> <!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 -->
- <a href="" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name="Check_battery_statistical_analysis_queries"/></a> <!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� -->
- <a href="" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name="Check_battery_monomer_record_behind"/></a> <!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 -->
+ <a href="javascript:;" onclick="jumpPage()" target="_blank"><s:text name="Check_battery_test_record"/></a> <!-- 鏌ョ湅鐢垫睜娴嬭瘯璁板綍 -->
+ <a href="javascript:;" onclick="jumpBattgroupStatic(this)" target="_blank"><s:text name="Check_battery_statistical_analysis_queries"/></a> <!-- 鏌ョ湅鐢垫睜缁勭粺璁″垎鏋愭煡璇� -->
+ <a href="javascript:;" onclick="jumpBattmonomertatic(this)" target="_blank"><s:text name="Check_battery_monomer_record_behind"/></a> <!-- 鏌ョ湅鐢垫睜钀藉悗鍗曚綋璁板綍 -->
<a href="eleBrdwMaint.jsp" target="_blank"><s:text name="Check_abnormal_battery_maintenance_record"/></a> <!-- 鏌ョ湅寮傚父鐢垫睜缁存姢璁板綍 -->
</div>
@@ -211,6 +216,7 @@
</body>
<script type="text/javascript" src="js/ele_statistics.js"></script>
<script type="text/javascript" src="js/createTab.js"></script>
+<script type="text/javascript" src="src/layui.all.js"></script>
<script type="text/javascript">
var permits;
<% Object obj=session.getAttribute("permits");
@@ -518,7 +524,7 @@
var batt = battinfo_list[trIndex];
console.info(batt);
//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
- $('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
+ //$('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
}
}
@@ -542,8 +548,10 @@
}
}
-
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -571,10 +579,15 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -599,27 +612,79 @@
}else {
$select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
}
- findStationNamebyStationname1();
+ findCounty();
}
});
}
+ // 鏌ヨ鍖�/鍘�
+ function findCounty(isLoad) {
+ var tmp = {
+ StationName1:$("#station_name1").val(),
+ StationName2:$("#city").val(),
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 鏌ヨ鍖哄幙
+ $.ajax({
+ type: 'post',
+ async: true,
+ url: "BattInfAction!serchStationName5",
+ data: "json="+JSON.stringify(tmp),
+ success:function(data) {
+ var rs = JSON.parse(data.result);
+ var $select = $("#county");
+ if(rs.code==1){
+ var _data = rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName5, __data.StationName5, __data, _attr);
+ optsList.push(tmp);
+ }
+
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else{
+ $select.text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
+ }
+ findStationNamebyStationname1();
+ }
+ });
+ }
+
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
$('#station_name1').change(function(){
- findCity();
+ findCity(true);
});
//褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
$('#city').change(function(){
- findStationNamebyStationname1();
+ findCounty(true);
+ });
+
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
});
//鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
+ function findStationNamebyStationname1(isLoad){
var tmp = {
StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
+ StationName2:$("#city").val(),
+ StationName5: $("#county").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
//var selectvalue=$("#station_name1 option:selected").val();
//alert(selectvalue);
$.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
@@ -648,16 +713,21 @@
}
$('#station_name').change(function(){
- findserchByBattGroupNamebystationname();
+ findserchByBattGroupNamebystationname(true);
});
//鏍规嵁鐪侊紝甯傚拰鏈烘埧鏌ヨ钃勭數姹犵粍
- function findserchByBattGroupNamebystationname(){
+ function findserchByBattGroupNamebystationname(isLoad){
var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 鏋勯�犳煡璇㈡潯浠�
var tmp = {
StationName1:$("#station_name1").val(),
StationName2:$("#city").val(),
+ StationName5: $("#county").val(),
StationName: $("#station_name").val(),
StationId: stationid
};
@@ -692,6 +762,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
@@ -909,6 +981,7 @@
binf:{
StationName1:$('#station_name1').val(),
StationName2:$('#city').val(),
+ StationName5:$('#county').val(),
StationName:$('#station_name').val(),
BattGroupId:$('#battgroup_name').val(),
BattProducer:$('#batt_producer').val(),
--
Gitblit v1.9.1