From b03a33da86763413024d44ebaad0b54a78f60e4d Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 22 十一月 2018 14:02:20 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/mobil/batt-state-manage.html |   94 +++++++++++++---------------------------------
 1 files changed, 27 insertions(+), 67 deletions(-)

diff --git a/gx_tieta/WebRoot/mobil/batt-state-manage.html b/gx_tieta/WebRoot/mobil/batt-state-manage.html
index a064653..3676df2 100644
--- a/gx_tieta/WebRoot/mobil/batt-state-manage.html
+++ b/gx_tieta/WebRoot/mobil/batt-state-manage.html
@@ -109,8 +109,21 @@
 			            <select id="homeName" data-mini="true">
 			            	<option value="">鍏ㄩ儴</option>
 			            </select>
+			             <fieldset data-role="controlgroup">
+			                  <legend>璇烽�夋嫨</legend>			
+					          <label for="ALM_TYPE_BTS9100S_POFF_ComError">鍋滅數</label>
+					          <input type="checkbox" name="" id="ALM_TYPE_BTS9100S_POFF_ComError" value="">
+					          <label for="ALM_TYPE_BTS9100S_XUHANG_ComError">缁埅</label>
+					          <input type="checkbox" name="" id="ALM_TYPE_BTS9100S_XUHANG_ComError" value="">
+					          <label for="ALM_TYPE_BTS9100S_FADIAN_ComError">鍙戠數</label>
+					          <input type="checkbox" name="" id="ALM_TYPE_BTS9100S_FADIAN_ComError" value="">
+					           <label for="ALM_TYPE_BTS9100S_DOOROPEN_ComError">寮�闂ㄥ紓甯�</label>
+					          <input type="checkbox" name="" id="ALM_TYPE_BTS9100S_DOOROPEN_ComError" value="">
+					           <label for="ALM_TYPE_BTS9100S_DIAOZHAN_ComError">鎺夌珯</label>
+					          <input type="checkbox" name="" id="ALM_TYPE_BTS9100S_DIAOZHAN_ComError" value="">          
+			            </fieldset>
 		            	
-		            
+		                
 		        	</fieldset>
 				</div>
 				<div class="fg-panel-btn">
@@ -169,76 +182,23 @@
 		});
 	 });
 	
-	 //鏌ヨ鐢垫睜淇℃伅
-	 function searchBadBatt(){
-	 	loadshow();
-	 	var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
-	    var temp = createSearchForm();
-	    console.info(stationid);
-	    /*var temp = {
-			StationName1:$("#station_name1").val(),
-			StationName2:$("#city").val(),
-			StationName5: $("#county").val(),
-			StationName: $("#station_name").val(),
-			StationId: stationid
-		};*/
-		//console.info(temp);
-	 	var json = JSON.stringify(temp);
-	 	//console.info(json);
-        arrTd = new Array();
-        $.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
-	        data=eval("("+data.result+")");
-	        //console.info(data);
-	        if(data.code==1 && data.data.length>0){
-				data=data.data;
-				//console.info(data);					
-				arr=new Array();
-				index=0;
-				for(var i=0;i<data.length;i++){
-					Page.pageAll=data[i].Size;
-					arr[index++]=data[i].BattGroupId;				//鐢垫睜缁刬d
-					arr[index++]=data[i].StationName;				//鏈烘埧鍚嶇О
-					arr[index++]=data[i].StationIp;					//鏈烘埧IP
-					arr[index++]=data[i].BattGroupName;	//鐢垫睜缁勫悕绉�
-					arr[index++]=data[i].BattGroupNum;				//鐢垫睜缁勫簭鍙�
-					
-				}
-	           //console.info(Page);
-	           createTbl(tbl, arrTh, arr);
-	          
-			}else{
-				$('#searchNull').popup('open');
-				Page.pageAll = 0;
-			}
-			setPage();
-			//console.info(Page);
-			loadclose();     
-        }).error(function(){
-        	loadclose();
-        	$('#searchErr').popup('open');
-        });
-	 
-	 }
 
 
 	
 	function createSearchForm(){
-		var temp={
-			page:{
-				pageCurr:Page.pageCurr,
-				pageSize:Page.pageSize,
-			},
-			binf:{
-				StationName1:$('#mainteArea').val(),
-				StationName2:$('#city').val(),
-				StationName5:$('#country').val(),
-				StationName:$('#homeName').val()
-				
-				
-			},
-			
-			
-			
+			var stationid = $('#homeName').find("option:selected").attr('Stationid');
+		
+			var temp = {			
+				page:{
+					pageCurr:Page.pageCurr,
+					pageSize:Page.pageSize,
+				},												
+				StationName1:$('#mainteArea').val(),		// 鐪�
+				StationName2:$('#city').val(),				// 甯�
+				StationName5:$('#county').val(),			// 鍖�/鍘�	
+				StationName3:$('#homeName').val(),				
+				StationId: stationid?stationid:0,
+				//BattGroupNum:battgroupid,
 		};
 		return temp;
 	}

--
Gitblit v1.9.1