From bb65f33c9fdff40844f17e95e3e75aed2b42bda2 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 25 十月 2018 14:47:33 +0800
Subject: [PATCH] 修改内容

---
 gx_tieta/WebRoot/batt-state-manage.jsp |   61 ++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 25b90d4..7434bbe 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -10,12 +10,13 @@
   <head>
     <base href="<%=basePath%>">
     
-    <title>鍩虹珯鐘舵�佺鐞�</title>				<!-- 鍩虹珯鐘舵�佺鐞� -->
+    <title><s:text name="Station_statequery"/></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/basic-layout.css"/>
     <link rel="stylesheet" href="css/nocontent.css">
     <link rel="stylesheet" href="alifont/iconfont.css">	
 	<meta http-equiv="pragma" content="no-cache">
@@ -67,7 +68,10 @@
 	       background-color: #2f97ff;
 	       color: #FFFFFF;
 	   } 
-	  
+	   #eleInfor .checkCon table input {
+    width: auto; 
+    height: 20px;
+} 
 	</style>
     </head>
     <body>
@@ -79,8 +83,8 @@
 	    <!-- 涓讳綋鍐呭 -->
         <div id="main">
             <div id="eleInfor">
-                <span class="summary">鍩虹珯鐘舵�佺鐞嗘煡璇�--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
-                <div class="checkCon">
+                <span class="summary"><s:text name="Station_statequery"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
+                <div class="checkCon filter-container">
                 	<form action="" id="search_form">
                     <!-- 缁存姢鍖轰俊鎭� -->
                     <table>
@@ -110,6 +114,16 @@
                             
                         </tr>
                     </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>		<!-- 鎺夌珯 -->
+					
+				</tr>
+			</table>
                     </form>
                 </div>
             </div>
@@ -436,6 +450,7 @@
 		function createSearchParam(){
 			//alert($('#endu_type').val());
 			var stationid = $('#station_name3').find("option:selected").attr('Stationid');
+			var battgroupid = batt_condition();
 			var temp = {			
 				page:{
 					pageSize:$('#number').val(),
@@ -445,11 +460,42 @@
 				StationName2:$('#city').val(),	
 				StationName3:$('#station_name3').val(),				
 				StationId: stationid?stationid:0,
-				
+				BattGroupNum:battgroupid,
 			};
 			//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;
+			}
 
 		var myTimeOut;
 		//鏌ヨ鏈烘埧鐘舵��
@@ -539,6 +585,11 @@
 						var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
 						$('#total').text(Page.pageAll);
 						$('#current').text(Page.pageCurr+"/"+pageNum);
+					}else{
+						Page.pageAll = 0;
+						var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
+						$('#total').text(Page.pageAll);
+						$('#current').text(Page.pageCurr+"/"+pageNum);
 					}
 					createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
 					

--
Gitblit v1.9.1