From 39c40f5501156a3f96a970f6b458c8b30e1cb538 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 01 十一月 2018 13:39:45 +0800
Subject: [PATCH] 机房状态查询区/县添加

---
 gx_tieta/WebRoot/batt-state-statistical.jsp |   50 +++++++++-----------------------------------------
 1 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-statistical.jsp b/gx_tieta/WebRoot/batt-state-statistical.jsp
index 468daa4..cb2e315 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,7 +36,7 @@
 	<!--瀵艰埅寮�濮�-->
 	<jsp:include page="nav.jsp" flush="true"/>
 	<div class="filter-container">
-		<div class="filter-title"><a href="javascript:;">鍩虹珯鐘舵�佺粺璁℃煡璇�--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>
+		<div class="filter-title"><a href="javascript:;"><s:text name="Station_statestatistical"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></a></div>
 		<div class="filter-content">
 			<table>
 				<tbody>
@@ -78,11 +78,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="">
@@ -270,7 +270,6 @@
 			// 鏋勯�犳煡璇㈡潯浠�
 			function createSearchForm(){
 				var stationid = $('#station_name3').find("option:selected").attr('Stationid');
-				var battgroupid = batt_condition();
 				var temp={
 						StationName1:$('#station_name1').val(),													// 鐪�
 						StationName2:$('#city').val(),															// 甯�
@@ -278,44 +277,13 @@
 						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();

--
Gitblit v1.9.1