From 318dc392ad1575e7915a5a47c07c958f616d9534 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 14:03:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-life-manage.jsp | 137 ++++++++---
gx_tieta/WebRoot/elewarn.jsp | 113 +++++++--
gx_tieta/WebRoot/batt-state-manage.jsp | 203 ++++++++++------
gx_tieta/WebRoot/batt-state-statistical.jsp | 220 +++++++++++------
gx_tieta/WebRoot/equip-stats-change.jsp | 14 +
5 files changed, 464 insertions(+), 223 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index d7e36e2..8b93c25 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -8,19 +8,19 @@
<html>
<head>
<base href="<%=basePath%>">
-
- <title><s:text name="Station_life_query"/></title> <!--鏈烘埧缁埅鑳藉姏鏌ヨ-->
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <link href="css/basic.css" rel="stylesheet">
- <link rel="stylesheet" href="css/BrdwMaint.css">
- <link rel="stylesheet" type="text/css" href="css/loading.css">
- <link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="expires" content="0">
<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
<meta http-equiv="description" content="This is my page">
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title><s:text name="Station_life_query"/></title> <!--鏈烘埧缁埅鑳藉姏鏌ヨ-->
+ <link href="css/basic.css" rel="stylesheet">
+ <link rel="stylesheet" href="css/BrdwMaint.css">
+ <link rel="stylesheet" type="text/css" href="css/loading.css">
+ <link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css">
body {
overflow-x: hidden !important;
@@ -63,27 +63,25 @@
<form action="" id="search_form">
<table>
<tr class="fWeight">
- <td>鐪�</td> <!-- 鐪� -->
+ <td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
<td>鎺夌珯</td>
<td>瀹為檯缁埅鏃堕棿</td>
</tr>
<tr>
<td>
- <select id="station_name1">
-
- </select>
+ <select id="station_name1"></select>
</td>
<td>
- <select id="city">
-
- </select>
+ <select id="city"></select>
</td>
<td>
- <select id="station_name">
-
- </select>
+ <select id="county"></select>
+ </td>
+ <td>
+ <select id="station_name"></select>
</td>
<td>
<select id="is_stand">
@@ -149,6 +147,7 @@
<div id="allShade"></div>
<script type="text/javascript" src="js/loading.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 Page={
pageCurr:1,
@@ -192,15 +191,7 @@
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
$('#paging .search').click(function() {
- searchBattLife();
- /* loading.showLoading();
- arrTd = [
- '缁存姢鍖�1', '鏈烘埧鍚嶇О1', '鐢垫睜缁勫悕绉�1', '鏍囩О瀹归噺1', '瀹為檯瀹归噺1', '瀹炴椂鐢垫祦1', '缁埅鏃堕棿1'
- ];
- createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
- setTimeout(function() {
- loading.hideLoading();
- }, 2000); */
+ searchBattLife(true);
});
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
@@ -289,8 +280,10 @@
}
- // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -317,10 +310,14 @@
});
});
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -345,25 +342,77 @@
}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){
@@ -387,6 +436,8 @@
}else{
$("#station_name").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
+ searchBattLife(true);
+ layer.close(filterLoad);
});
}
@@ -400,6 +451,7 @@
pageCurr:Page.pageCurr,
},
stationName:$('#station_name').val(), //鏈烘埧鍚�
+ stationName5:$('#county').val(),
stationName2:$('#city').val(), //甯�
stationName1:$('#station_name1').val(), //鐪�
is_out_stand:$('#is_stand').val(), //鏄惁鎺夌珯
@@ -409,10 +461,15 @@
return temp;
}
- function searchBattLife(){
- var temp = createSearchParam();
- var json = JSON.stringify(temp);
- var arrTd = new Array();
+ // 鏌ヨ鍐呭
+ function searchBattLife(isLoad){
+ var temp = createSearchParam();
+ var json = JSON.stringify(temp);
+ var arrTd = new Array();
+ var load;
+ if(isLoad) {
+ load = layer.load(1);
+ }
$.ajax({
type:"post",
url:"Batt_enduranceAction!serchByCondition",
@@ -422,7 +479,7 @@
success:function(data){
//console.info(data);
var data = JSON.parse(data.result);
- //console.info(data);
+ layer.close(load);
if(data.code==1&&data.data.length>0){
data=data.data;
var index = 0;
@@ -451,7 +508,7 @@
}
}
- })
+ });
}
//棣栭〉
$('#home').click(function(){
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 7434bbe..a0c154d 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -9,22 +9,21 @@
<html>
<head>
<base href="<%=basePath%>">
-
- <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
+ <meta http-equiv="pragma" content="no-cache">
+ <meta http-equiv="cache-control" content="no-cache">
+ <meta http-equiv="expires" content="0">
+ <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+ <meta http-equiv="description" content="This is my page">
+ <title><s:text name="Station_statequery"/></title> <!-- 鏈烘埧鐘舵�佹煡璇� -->
<link href="css/basic.css" rel="stylesheet">
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
<link rel="stylesheet" type="text/css" href="css/basic-layout.css"/>
<link rel="stylesheet" href="css/nocontent.css">
<link rel="stylesheet" href="alifont/iconfont.css">
- <meta http-equiv="pragma" content="no-cache">
- <meta http-equiv="cache-control" content="no-cache">
- <meta http-equiv="expires" content="0">
- <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
- <meta http-equiv="description" content="This is my page">
-
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
<style type="text/css">
body {
overflow-x: hidden !important;
@@ -91,24 +90,22 @@
<tr class="fWeight">
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
</tr>
<tr>
<td>
- <select id="station_name1" name="stationname1">
-
- </select>
+ <select id="station_name1" name="stationname1"></select>
</td>
<td>
- <select id="city">
-
- </select>
+ <select id="city"></select>
</td>
<td>
- <select id="station_name3" name="stationname">
-
- </select>
+ <select id="county"></select>
+ </td>
+ <td>
+ <select id="station_name3" name="stationname"></select>
</td>
@@ -171,6 +168,7 @@
<script type="text/javascript" src="js/loading.js"></script>
<script type="text/javascript" src="js/nocontent.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" src="pages/js/common.js"></script>
<script type="text/javascript">
var Page={
@@ -245,10 +243,7 @@
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
$('#paging .search').click(function() {
-
- searchstationstate();
- //noContent.showNoContent(); //鏄剧ず鏌ヨ澶辫触妗�
-
+ searchstationstate(true);
});
// 鐐瑰嚮琛ㄦ牸閫夐」鏄剧ず琛ㄦ牸閫夐」寮瑰嚭妗�
@@ -335,8 +330,10 @@
- // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢渷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -363,10 +360,14 @@
});
});
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -391,25 +392,82 @@
}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);
+ });
+
+ // 褰撶數姹犵粍鐨勫�煎彉鍖栨椂鏇存柊鍐呭
+ $('#station_name3').change(function() {
+ searchstationstate(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){
@@ -421,13 +479,6 @@
var optsList = [];
//console.info(_data[0]);
for(var i=0;i<_data.length;i++){
- /* if(i==0){
- $select.html("<s:text name='All'/>(<s:text name='Common'/>"+data.length+"<s:text name='Species'/>)");
- $select.attr("value","");
- }else{
- $select.text(_data[i-1].StationName3);
- $select.attr("value",_data[i-1].StationId);
- }*/
var __data = _data[i];
var _attr = {
StationId: __data.StationId
@@ -441,8 +492,8 @@
$("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
-
- searchstationstate();
+ layer.close(filterLoad);
+ searchstationstate(true);
});
}
@@ -456,8 +507,9 @@
pageSize:$('#number').val(),
pageCurr:Page.pageCurr,
},
- StationName1:$('#station_name1').val(), //甯�
- StationName2:$('#city').val(),
+ StationName1:$('#station_name1').val(), // 鐪�
+ StationName2:$('#city').val(), // 甯�
+ StationName5:$('#county').val(), // 鍖�/鍘�
StationName3:$('#station_name3').val(),
StationId: stationid?stationid:0,
BattGroupNum:battgroupid,
@@ -465,43 +517,49 @@
//console.info(temp);
return temp;
}
- function batt_condition(){
- var POFF_ComError = 0;
- var XUHANG_ComError = 0;
- var FADIAN_ComError = 0;
- var DIAOZHAN = 0;
- var DOOROPEN_ComError = 0;
- var condition = 0;
- if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
- POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
- condition+=parseInt(POFF_ComError);
- }
- if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
- XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
- condition+=parseInt(XUHANG_ComError);
- }
- if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
- FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
- condition+=parseInt(FADIAN_ComError);
- }
- if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
- DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
- condition+=parseInt(DIAOZHAN);
- }
- if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
- DOOROPEN_ComError = $('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
- condition+=parseInt(DOOROPEN_ComError);
- }
- //condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
- //console.info(condition);
- return condition;
+
+ function batt_condition(){
+ var POFF_ComError = 0;
+ var XUHANG_ComError = 0;
+ var FADIAN_ComError = 0;
+ var DIAOZHAN = 0;
+ var DOOROPEN_ComError = 0;
+ var condition = 0;
+ if($('#ALM_TYPE_BTS9100S_POFF_ComError').attr("checked")){
+ POFF_ComError = $('#ALM_TYPE_BTS9100S_POFF_ComError').val();
+ condition+=parseInt(POFF_ComError);
}
+ if($('#ALM_TYPE_BTS9100S_XUHANG_ComError').attr("checked")){
+ XUHANG_ComError = $('#ALM_TYPE_BTS9100S_XUHANG_ComError').val();
+ condition+=parseInt(XUHANG_ComError);
+ }
+ if($('#ALM_TYPE_BTS9100S_FADIAN_ComError').attr("checked")){
+ FADIAN_ComError = $('#ALM_TYPE_BTS9100S_FADIAN_ComError').val();
+ condition+=parseInt(FADIAN_ComError);
+ }
+ if($('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').attr("checked")){
+ DIAOZHAN = $('#ALM_TYPE_BTS9100S_DIAOZHAN_ComError').val();
+ condition+=parseInt(DIAOZHAN);
+ }
+ if($('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').attr("checked")){
+ DOOROPEN_ComError = $('#ALM_TYPE_BTS9100S_DOOROPEN_ComError').val();
+ condition+=parseInt(DOOROPEN_ComError);
+ }
+ //condition = POFF_ComError+XUHANG_ComError+DIAOZHAN+DOOROPEN_ComError+FADIAN_ComError;
+ //console.info(condition);
+ return condition;
+ }
var myTimeOut;
//鏌ヨ鏈烘埧鐘舵��
- function searchstationstate(){
+ function searchstationstate(isLoad){
var temp = createSearchParam();
arrTd = new Array();
+ // 鏄惁娣诲姞绛夊緟
+ var load;
+ if(isLoad) {
+ load = layer.load(1);
+ }
$.ajax({
type: "post",
url: "Bts_station_stateAction_action_serchByCondition",
@@ -591,6 +649,7 @@
$('#total').text(Page.pageAll);
$('#current').text(Page.pageCurr+"/"+pageNum);
}
+ layer.close(load);
createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
window.clearTimeout(myTimeOut);
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index cb2e315..512da1e 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -43,6 +43,7 @@
<tr>
<th>鐪�</th> <!-- 鐪� -->
<th>甯�</th> <!-- 甯� -->
+ <th>鍖�/鍘�</th> <!-- 鍖�/鍘� -->
<th><s:text name="Computer_site"/></th> <!-- 鏈烘埧绔欑偣 -->
<th colspan="2" style="width: 30%;">鏃堕棿</th> <!-- 寮�濮嬪憡璀︽棩鏈� -->
@@ -50,21 +51,17 @@
</tr>
<tr>
<td>
- <select name="" id="station_name1">
-
- </select>
+ <select name="" id="station_name1"></select>
</td>
<td>
- <select name="" id="city">
-
- </select>
+ <select name="" id="city"></select>
</td>
<td>
- <select name="" id="station_name3">
-
- </select>
+ <select name="" id="county"></select>
</td>
-
+ <td>
+ <select name="" id="station_name3"></select>
+ </td>
<td><input type="text" id="startalm" readonly="readonly" name="bmd.adata.alm_start_time" value="2000-1-1" /></td>
<td><input type="text" id="endTalm" readonly="readonly" name="bmd.adata.alm_start_time1" /></td>
<td>
@@ -247,6 +244,7 @@
function serachBattStatistical(){
var temp = createSearchForm();
var json = JSON.stringify(temp);
+ var load = layer.load(1);
$.ajax({
type:"post",
url:"Bts_station_eventAction!serchByCondition",
@@ -261,7 +259,7 @@
}else {
tOptions.data = [];
}
-
+ layer.close(load);
table.render(tOptions);
}
})
@@ -272,7 +270,8 @@
var stationid = $('#station_name3').find("option:selected").attr('Stationid');
var temp={
StationName1:$('#station_name1').val(), // 鐪�
- StationName2:$('#city').val(), // 甯�
+ StationName2:$('#city').val(),
+ Stationname5:$('#county').val(), // 甯�
StationName3:$('#station_name3').val(), //鏈烘埧鍚嶇О
StationId: stationid?stationid:0,
BattInUseDate:$('#startalm').val()+" 00:00:00",
@@ -344,11 +343,9 @@
return rs;
}
- });
-
- // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
- $(document).ready(function(){
- //椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
+
+ // 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad = layer.load();
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
data=eval("("+data+")");
@@ -372,81 +369,138 @@
}
findCity();
});
- });
-
- function findCity() {
- var data = {
- StationName1: $("#station_name1").val()
- };
- // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
- $.ajax({
- type: "post",
- url: "BattInfAction!serchStationName2",
- async:true,
- dataType:'json',
- data:"json = "+JSON.stringify(data),
- success: function(data){
- var rs = JSON.parse(data.result);
- var $select = $("#city");
- if(rs.code == 1) {
- var _data= rs.data;
- // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+
+ function findCity(isLoad) {
+ var data = {
+ StationName1: $("#station_name1").val()
+ };
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
+ // 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+ $.ajax({
+ type: "post",
+ url: "BattInfAction!serchStationName2",
+ async:true,
+ dataType:'json',
+ data:"json = "+JSON.stringify(data),
+ success: function(data){
+ var rs = JSON.parse(data.result);
+ var $select = $("#city");
+ if(rs.code == 1) {
+ var _data= rs.data;
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
+ var optsList = [];
+ for(var i=0;i<_data.length;i++){
+ var __data = _data[i];
+ var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ optsList.push(tmp);
+ }
+ // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
+ createOptions($select, optsList, true);
+ }else {
+ $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
+ }
+ 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();
+ });
+ //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#city').change(function(){
+ findCounty();
+ });
+ //褰撳尯/鍘跨殑鍊煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
+ $('#county').change(function(){
+ findStationNamebyStationname1(true);
+ });
+
+ //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
+ 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){
+ var rs = JSON.parse(data.result);
+ if(rs.code==1){
+ var _data = rs.data;
+ var $select = $("#station_name3");
+ // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
var optsList = [];
for(var i=0;i<_data.length;i++){
var __data = _data[i];
- var tmp = getOptionsData(__data.StationName2, __data.StationName2, __data);
+ var _attr = {
+ StationId: __data.StationId
+ };
+ var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
optsList.push(tmp);
}
+
// 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
createOptions($select, optsList, true);
- }else {
- $select.text('').html('<option>鏆傛棤鍙祴甯�</option>');
- }
- findStationNamebyStationname1();
- }
- });
- }
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊甯�
- $('#station_name1').change(function(){
- findCity();
- });
- //褰撶淮鎶ゅ尯鐨勫�煎彉鎹㈡椂鏇存柊鏈烘埧绔欑偣
- $('#city').change(function(){
- findStationNamebyStationname1();
- });
-
- //鏍规嵁鐪侊紝甯傛煡璇㈢珯鐐�
- function findStationNamebyStationname1(){
- var tmp = {
- StationName1:$("#station_name1").val(),
- StationName2:$("#city").val()
- };
- //var selectvalue=$("#station_name1 option:selected").val();
- //alert(selectvalue);
- $.post("BattInfAction!serchStationName3","json="+JSON.stringify(tmp),function(data){
- var rs = JSON.parse(data.result);
- if(rs.code==1){
- var _data = rs.data;
- var $select = $("#station_name3");
- // 鏍规嵁鏁版嵁鏋勯�犵敓鎴愪笅鎷夊垪琛ㄧ殑鏁版嵁
- var optsList = [];
- for(var i=0;i<_data.length;i++){
- var __data = _data[i];
- var _attr = {
- StationId: __data.StationId
- };
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
- optsList.push(tmp);
+ }else{
+ $("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
}
- // 鏍规嵁鏁版嵁鐢熸垚涓嬫媺鍒楄〃
- createOptions($select, optsList, true);
- }else{
- $("#station_name3").text('').html('<option>鏆傛棤鍙祴鏈烘埧绔欑偣</option>');
- }
- });
- }
-
+ layer.close(filterLoad);
+ });
+ }
+ });
</script>
</body>
</html>
diff --git a/gx_tieta/WebRoot/elewarn.jsp b/gx_tieta/WebRoot/elewarn.jsp
index 2c1aa56..d30dc3a 100644
--- a/gx_tieta/WebRoot/elewarn.jsp
+++ b/gx_tieta/WebRoot/elewarn.jsp
@@ -14,7 +14,7 @@
<title><s:text name="Battery_alarm_real-time_query"/></title> <!-- 鐢垫睜鍛婅瀹炴椂鏌ヨ -->
<link rel="stylesheet" type="text/css" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/elewarn.css">
-
+ <link href="src/css/layui.css" type="text/css" rel="stylesheet">
</head>
<body>
<!--澶撮儴鍐呭寮�濮�-->
@@ -35,31 +35,27 @@
<!-- 缁存姢鍖轰俊鎭� -->
<table>
<tr class="fWeight">
- <td>鐪�</td> <!-- 鐪� -->
- <td>甯�</td> <!-- 甯� -->
+ <td>鐪�</td> <!-- 鐪� -->
+ <td>甯�</td> <!-- 甯� -->
+ <td>鍖�/鍘�</td> <!-- 鍖�/鍘� -->
<td><s:text name="Computer_site"/></td> <!-- 鏈烘埧绔欑偣锛堟垨鏈烘埧璁惧锛� -->
<td><s:text name="Battery"/></td> <!-- 钃勭數姹犵粍 -->
</tr>
<tr>
<td>
- <select id="station_name1" name="bmd.binf.StationName1">
-
- </select>
+ <select id="station_name1" name="bmd.binf.StationName1"></select>
</td>
<td>
- <select id="city" name="bmd.binf.StationName2">
-
- </select>
+ <select id="city" name="bmd.binf.StationName2"></select>
</td>
<td>
- <select id="station_name" name="bmd.binf.stationName">
-
- </select>
+ <select id="county" name="bmd.binf.StationName5"></select>
</td>
<td>
- <select id="battgroup_name" name="bmd.binf.BattGroupId">
-
- </select>
+ <select id="station_name" name="bmd.binf.stationName"></select>
+ </td>
+ <td>
+ <select id="battgroup_name" name="bmd.binf.BattGroupId"></select>
</td>
</tr>
</table>
@@ -187,6 +183,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");
@@ -348,14 +345,14 @@
$.post("Battalarm_dataAction!serchByCondition",$('#search_form').serialize(),function(data){
data=data.result;
data=eval("("+data+")");
- //console.info(data);
+ console.info(data);
var pagecurr=parseInt($('#pageCurr').attr('value'));
var pagesize=parseInt($('#pageSize').attr('value'));
if(data.code==1 && data.data.length>0){
data=data.data;
var index=0;
battalarmlist=new Array();
- console.info(data);
+ //console.info(data);
ArrWarnTb=new Array();
for(var i=0;i<data.length;i++){
if(i == (data.length-1)){
@@ -558,7 +555,9 @@
}
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
+ var filterLoad;
$(document).ready(function(){
+ filterLoad = layer.load();
//椤甸潰鍔犺浇鏃舵煡璇㈢淮鎶ゅ尯涓殑鏋㈢航绫诲瀷
$.post("User_battgroup_baojigroup_battgroupAction!serchStationName1InGroup",null,function(data){
data=data.result;
@@ -586,10 +585,14 @@
});
// 鏍规嵁缁存姢鍖虹殑鍐呭鏌ヨ甯�
- function findCity() {
+ function findCity(isLoad) {
var data = {
StationName1: $("#station_name1").val()
};
+ // 鏄惁娣诲姞绛夊緟
+ if(isLoad) {
+ filterLoad = layer.load();
+ }
// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
$.ajax({
type: "post",
@@ -614,27 +617,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){
@@ -664,20 +719,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();
@@ -710,6 +769,8 @@
}else{
$("#battgroup_name").text('').html('<option>鏆傛棤鍙祴钃勭數姹犵粍</option>');
}
+
+ layer.close(filterLoad);
});
}
diff --git a/gx_tieta/WebRoot/equip-stats-change.jsp b/gx_tieta/WebRoot/equip-stats-change.jsp
index cffaf4f..a3dfc79 100644
--- a/gx_tieta/WebRoot/equip-stats-change.jsp
+++ b/gx_tieta/WebRoot/equip-stats-change.jsp
@@ -317,6 +317,7 @@
var second = GLOBAL.pages.siderbar.second; // 浜岀骇瀵艰埅
var third = GLOBAL.pages.siderbar.third; // 涓夌骇瀵艰埅
var fourth = GLOBAL.pages.siderbar.fourth; // 鍥涚骇瀵艰埅
+ var fifth = GLOBAL.pages.siderbar.fifth; // 浜旂骇瀵艰埅
var treeView = new TreeView($('#lside'));
$('#lside').width($('#ele_content').width());
treeView.setContainer();
@@ -340,11 +341,19 @@
second(treeView, $(this).parent(), province);
});
- // 甯�->鏈烘埧
+ // 甯�->鍖�/鍘�
treeView.ele.on('click', '.city', function() {
var city = $(this).data('attr');
third(treeView, $(this).parent(), city);
});
+
+ // 甯�->鏈烘埧
+ treeView.ele.on('click', '.county', function() {
+ var city = $(this).data('attr');
+ fourth(treeView, $(this).parent(), city);
+ });
+
+
battinlist = [];
// 鏈烘埧->鐢垫睜缁�
@@ -353,10 +362,11 @@
var tmp = {
StationName1: home.StationName1,
StationName2: home.StationName2,
+ StationName5: home.StationName5,
StationName: home.StationName,
StationId: home.StationId
};
- fourth(treeView, $(this).parent(), tmp);
+ fifth(treeView, $(this).parent(), tmp);
});
// 鐢垫睜缁�
--
Gitblit v1.9.1