From daf105a4c7cfd299d6473939b4d678a3e9f91f23 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.18>
Date: 星期四, 01 十一月 2018 17:37:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-state-statistical.jsp | 275 +++++++++++++++++++++++++++++-------------------------
1 files changed, 149 insertions(+), 126 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 468daa4..69cafc8 100644
--- a/gx_tieta/WebRoot/batt-state-statistical.jsp
+++ b/gx_tieta/WebRoot/batt-state-statistical.jsp
@@ -10,7 +10,7 @@
<!-- 榛樿浣跨敤鏈�楂樺唴鏍� -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<base href="<%=basePath%>">
- <title>鐢垫睜缁勭姸鎬佺粺璁＄鐞�</title>
+ <title><s:text name="Station_statestatistical"/></title> <!-- 鏈烘埧鐘舵�佺粺璁℃煡璇� -->
<link rel="stylesheet" href="css/basic.css">
<link rel="stylesheet" type="text/css" href="css/nocontent.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
@@ -36,13 +36,14 @@
<!--瀵艰埅寮�濮�-->
<jsp:include page="nav.jsp" flush="true"/>
<div class="filter-container">
- <div class="filter-title"><a href="javascript:;">鍩虹珯鐘舵�佺粺璁℃煡璇�--><s:text name="Show/hide_the_query_conditions"/></a></div>
+ <div class="filter-title"><a href="javascript:;"><s:text name="Station_statestatistical"/>--><s:text name="Show/hide_the_query_conditions"/></a></div>
<div class="filter-content">
<table>
<tbody>
<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>
@@ -78,11 +75,11 @@
</table>
<table class="condi-opt">
<tr>
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" />鍋滅數</td> <!-- 鍋滅數 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class="">缁埅</td> <!-- 鎺夌珯 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" />鍙戠數</td> <!-- 鍙戠數 -->
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" >寮�闂ㄥ紓甯�</td>
- <td><input type="checkbox" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 class="">鎺夌珯</td> <!-- 鎺夌珯 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_POFF_ComError" name="" value=2 class="" /> <!-- 鍋滅數 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_XUHANG_ComError" name="" value=4 class=""> <!-- 鎺夌珯 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_FADIAN_ComError" name="" value=8 class="" /> <!-- 鍙戠數 -->
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" name="" value=16 class="" >
+ <input type="hidden" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" name="" value=32 class=""> <!-- 鎺夌珯 -->
<!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
<input type="hidden" id="ALM_TYPE_BTS9100S_TEMPUP_ComError" name="" value="" class="">
@@ -166,7 +163,7 @@
,{field:'station_event_type_tempup', title:'娓╁害涓婇檺鍛婅', align:'center'}
,{field:'station_event_type_templow', title:'娓╁害涓嬮檺鍛婅', align:'center'}
,{field:'station_event_type_dampup', title:'婀垮害涓婇檺鍛婅', align:'center'}
- ,{field:'station_event_type_damplow', title:'娓╁害涓嬮檺鍛婅', align:'center'}
+ ,{field:'station_event_type_damplow', title:'婀垮害涓嬮檺鍛婅', align:'center'}
,{fixed: 'right', title:'璇︽儏', toolbar: '#toolBar', width: 70}
]]
,data:[]
@@ -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",
@@ -254,14 +252,15 @@
dataType:'json',
data:"json="+json,
success:function(data){
+ console.info(data);
var data=JSON.parse(data.result);
if(data.code==1&&data!=null){
- //console.log(data.data);
+ console.log(data.data);
tOptions.data = data.data;
}else {
tOptions.data = [];
}
-
+ layer.close(load);
table.render(tOptions);
}
})
@@ -270,52 +269,21 @@
// 鏋勯�犳煡璇㈡潯浠�
function createSearchForm(){
var stationid = $('#station_name3').find("option:selected").attr('Stationid');
- var battgroupid = batt_condition();
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",
BattInUseDate1:$('#endTalm').val()+" 23:59:59",
- BattGroupNum:$('#statistics').val(),
- BattGroupId:battgroupid,
+ BattGroupNum:$('#statistics').val(),
};
//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;
- }
+
//鐐瑰嚮鏌ヨ鎸夐挳
$('#paging .search').click(function(){
serachBattStatistical();
@@ -376,11 +344,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+")");
@@ -404,81 +370,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>
--
Gitblit v1.9.1