From 1bc9f92c8d458bc4d5fe3e98b69f7eade4e2a0a1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 26 十一月 2018 10:32:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/iframe/batt-state-statistical-details.html |    8 
 gx_tieta/WebRoot/mobil/batt-state-statistical.html          |  555 +++++++++++++++++++++++++++++
 gx_tieta/WebRoot/mobil/batt-traffic-statistics.html         |  555 +++++++++++++++++++++++++++++
 gx_tieta/WebRoot/mobil/count-report.html                    |    6 
 4 files changed, 1,120 insertions(+), 4 deletions(-)

diff --git a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
index 0dc1272..67cb13a 100644
--- a/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
+++ b/gx_tieta/WebRoot/iframe/batt-state-statistical-details.html
@@ -122,10 +122,10 @@
 				}
 				,cols: [[
 					{field:'stationname', title:'鏈烘埧鍚嶇О', align:'center', width: 460}
-					,{field:'warntype', title:'寮傚父绫诲瀷', align:'center'}
-					,{field:'warnstarttime', title:'寮傚父寮�濮嬫椂闂�', align:'center', sort: true}
-					,{field:'warnendtime', title:'寮傚父缁撴潫鏃堕棿', align:'center'}
-					,{field:'warntimelen', title:'寮傚父鏃堕暱(鍒嗛挓)', align:'center'}
+					,{field:'warntype', title:'浜嬩欢绫诲瀷', align:'center'}
+					,{field:'warnstarttime', title:'浜嬩欢寮�濮嬫椂闂�', align:'center', sort: true}
+					,{field:'warnendtime', title:'浜嬩欢缁撴潫鏃堕棿', align:'center'}
+					,{field:'warntimelen', title:'浜嬩欢鏃堕暱(鍒嗛挓)', align:'center'}
 			    ]]
 				,data: rsData
 			    ,page: {
diff --git a/gx_tieta/WebRoot/mobil/batt-state-statistical.html b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
new file mode 100644
index 0000000..04f963b
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-state-statistical.html
@@ -0,0 +1,555 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>鏈烘埧鍘嗗彶浜嬩欢鏌ヨ</title>
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+	<link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" type="text/css" href="css/tbl.css">
+	<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+	<style type="text/css">
+		
+		/*瑙勫畾闈㈡澘鐨勬牱寮�*/
+		.ui-panel {
+    		width: 80%;
+		}
+		.ui-panel-dismiss{
+			width: 20%;
+		}
+		.ui-panel-inner{
+			padding:0 !important;
+		}
+		.ui-collapsible-heading-toggle{
+			padding-left: 1em !important;
+		}
+		.panel-header{
+			padding: 8px 0;
+			font-size: 1.2em;
+			text-indent: 1em;
+			background-color: #DFDCDC;
+		}
+		/*瑙勫畾寮�鍏崇殑浣嶇疆*/
+		.ui-flipswitch {
+			margin-left: 0.5em;
+		}
+		
+		.ui-field-contain{
+			padding: 0 0.6em ;
+		}
+        .ui-field-contain {
+		    border-bottom-color: #828282;
+		    border-bottom-color: rgba(0,0,0,.15);
+		    border-bottom-width: 1px;
+		    border-bottom-style: none;
+		}
+        .sicon{ 
+        	display:inline-block;width:4%;margin:1em 0;float:left; 
+        }
+        .checkdata{
+	         display:inline-block;width:48%;margin:0 0 0 0;float:left; 
+	     }
+	     
+	     .next-page, .pre-page {
+			position: fixed;
+			width: 40px;
+			height: 40px;
+			top: 50%;
+			margin-top: -15px;
+		}
+		.next-page  {
+			right: 0;
+		}
+		.pre-page  {
+			left: 0;
+		}
+	     
+       
+		table {
+			margin-top:.5em;
+			border-collapse:separate; 
+			border-spacing:0 .5em;
+		}
+		
+		tbody tr td{
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+		}
+	</style>
+	<link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+	<div data-role="page">
+		<div class="fg-panel">
+			<form>
+				<div class="fg-panel-header">绛涢��</div>
+				<div class="fg-panel-content">
+					<fieldset data-role="controlgroup">
+		             	<p>鐪�</p>
+			            <select id="mainteArea" data-mini="true">
+			              <option value="">鍏ㄩ儴</option>
+			              <option value="">涓�鏋㈢航</option>
+			              <option value="">浜屾灑绾�</option>
+			              <option value="">鏋㈢航妤�</option>
+			            </select>
+			            <p>甯�</p>
+			            <select id="city" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+			            <p>鍖�/鍘�</p>
+			            <select id="country" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+		             	<p>鏈烘埧绔欑偣</p>
+			            <select id="homeName" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+		            	<p>缁熻鏂瑰紡</p>
+			            <select id="" data-mini="true">
+			            	<option value="">鎸夊勾缁熻</option>
+			            	<option value="">鎸夋湀缁熻</option>
+			            	
+			            </select>
+		             	<p>鏃堕棿</p>
+		             	<div class="checkdata">
+							<input id="startTestrecord"  type="text" name="appDate" class="appDatefir"  value="2000-01-01" />
+						</div>
+						<span class="sicon">&macr;</span>
+						<div class="checkdata">
+							<input id="endTestrecord" type="text" name="appDate" class="appDatesec"  value="2017-01-01" />
+						</div>
+						
+		        	</fieldset>
+				</div>
+				<div class="fg-panel-btn">
+					<a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">纭畾</a>
+				</div>
+			</form>
+		</div>
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+			<h1>鏈烘埧鍘嗗彶浜嬩欢鏌ヨ</h1>
+			<a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">绛涢��</a>
+		</div>
+		<!-- 涓讳綋鍐呭 -->
+		<div data-role="main">
+			<div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+			<div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>	
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+					
+			</table>
+		</div>
+	</div>
+</body>
+
+<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/panel.js"></script>
+<script type="text/javascript">	
+	$(function () {
+		setTimes($("#startTestrecord"),'2000-01-01');
+		setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
+		
+	});
+</script> 
+ <script type="text/javascript">  
+    $('document').ready(function(){panel.show();});    
+ 
+    var arr=new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
+    var Page = {
+		pageSize:10, 				//姣忛〉鐨勮鏁�
+		pageCurr:1,  				//褰撳墠椤电爜鏁�
+		pageAll:0,
+	};
+	
+    var arrTh = ['鍛婅鏃堕棿娈�', '鏈烘埧鍚嶇О', '鍋滅數娆℃暟', '鍙戠數娆℃暟','鎺夌珯娆℃暟','寮�闂ㄥ紓甯告鏁�','缁埅娆℃暟','娓╁害涓婇檺鍛婅','娓╁害涓嬮檺鍛婅','婀垮害涓婇檺鍛婅','婀垮害涓嬮檺鍛婅','璇︽儏'];
+	dataArr = [];
+    var startTime = "1980-01-01";
+    var endTime = new Date().format('yyyy-MM-dd');
+    var tbl = $('.tbl-container');
+    createTbl(tbl, arrTh, dataArr);
+	$(document).ready(function(){
+		setPage();
+		$("#submit").click(function(){
+			Page.pageCurr=1;
+	    	searchBadBatt();
+		});
+	 });
+	
+	 //鏌ヨ鐢垫睜淇℃伅
+	 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(),
+				
+			},
+			
+			tdata:{	
+				
+				record_time:$('#startTestrecord').val(),   		//鐢垫睜娴嬭瘯璁板綍鏃堕棿娈�
+				record_time1:$('#endTestrecord').val()  
+				
+			}
+			
+		};
+		return temp;
+	}
+	// stringify(createSearchForm());
+	//椤甸潰鍔犺浇鏃舵煡璇㈢渷
+	$.post("BattInfAction_serchByStation",null,function(data){
+		data = data.result;
+	    data = eval("("+data+")");
+	    //console.info(data);
+	    //console.info(data.code);
+	    if(data.code==1&&data.data.length>0){
+	   		var $Ostation_name1=$("#mainteArea");
+	    	$Ostation_name1.text("");
+	    	var arr = new Array();
+	    	for(var i=0;i<=data.data.length;i++)
+	        {
+	           	if(i == 0){
+	           		arr.push({
+	           			val:"",
+	           			txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+	           		});
+	           	}else{
+	           		arr.push({
+	           			val:data.data[i-1].StationName1,
+	           			txt:data.data[i-1].StationName1,
+	           		});
+	           	}
+	    	}
+	    	updataSel($Ostation_name1, arr);
+        }
+         findCity();
+    });
+
+  
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+	function findCity(){
+		var data = {
+			StationName1: $("#mainteArea").val()
+		};
+		//console.info(data);
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#city");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName2,
+		           			txt:data.data[i-1].StationName2,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         findCounty();
+	    }
+	    });
+    }
+	
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+	function findCounty(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName5",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#country");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName5,
+		           			txt:data.data[i-1].StationName5,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	      findStationNamebyStationname1();   
+	    }
+	    });
+    }
+  
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧  
+    function findStationNamebyStationname1(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val()
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName3",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#homeName");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			stationid:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName3,
+		           			stationid:data.data[i-1].StationId,
+		           			txt:data.data[i-1].StationName3,
+		           		});
+		           	}
+		    	}
+		    	//console.info(111111111111111);
+		    	updataSelStation($Ostation_name1, arr);
+	        }
+	       
+	        findserchByBattGroupNamebystationname(); 
+	    }
+	    });
+    }
+ 
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
+     function findserchByBattGroupNamebystationname(){
+		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+	
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val(),
+			StationName: $("#homeName").val(),
+			StationId: stationid
+		};
+		
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchBattByStation",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.warn();
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#battgroup_name");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:0,
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].BattGroupId,
+		           			txt:data.data[i-1].BattGroupName,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         
+	    }
+	    });
+    }
+    
+   //褰撶渷鏀瑰彉鏃舵洿鏂板競
+   $('#mainteArea').change(function(){
+   		findCity();	
+   });
+   //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+   $('#city').change(function(){
+   		findCounty();	
+   });
+   //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+   $('#country').change(function(){
+   		findStationNamebyStationname1(); 	
+   });   	
+	//褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍	
+	$('#homeName').change(function(){
+		findserchByBattGroupNamebystationname();
+	});
+		
+	
+		
+	$(function() {
+		//鐐瑰嚮涓婁竴椤�
+		$('.pre-page').on('click', 'a', function() {
+			if(Page.pageCurr>1){
+				Page.pageCurr = Page.pageCurr - 1;
+				searchBadBatt();
+			}
+		});
+		
+		//鐐瑰嚮涓嬩竴椤�
+		$('.next-page').on('click', 'a', function() {
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+			if(Page.pageCurr<pageNum){
+				Page.pageCurr = Page.pageCurr + 1;
+				searchBadBatt();
+			}
+		});
+	});
+	
+	
+	// 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+	function setPageTurning(isShowPre, isShowNext) {
+		if(isShowPre) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+			$('.pre-page').show();
+		}else {
+			$('.pre-page').hide();
+		}
+
+		if(isShowNext) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+			$('.next-page').show();
+		}else {
+			$('.next-page').hide();
+		}
+	}					
+	
+	//璁剧疆椤甸潰鐨勮烦杞摼鎺�
+	function setPage(){
+		if(Page.pageCurr <= 1){
+			$('.pre-page').hide();
+		}else{
+			$('.pre-page').show();
+		}
+		var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+		
+		if(Page.pageCurr < pageNum){
+			$('.next-page').show();
+		}else{
+			$('.next-page').hide();
+		}
+		
+	}
+   </script>
+</html> 
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html b/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
new file mode 100644
index 0000000..11b7eca
--- /dev/null
+++ b/gx_tieta/WebRoot/mobil/batt-traffic-statistics.html
@@ -0,0 +1,555 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>璁惧娴侀噺缁熻鏌ヨ</title>
+	<meta name="viewport" content="width=device-width,initial-scale=1">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+	<link rel="stylesheet" href="mobilCss/jquery.mobile-1.4.5.min.css"/>
+	<link href="mobilCss/mobiscroll.core-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link href="mobilCss/mobiscroll.animation-2.5.2.css" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" type="text/css" href="css/tbl.css">
+	<script type="text/javascript" src="mobilJs/jquery-1.8.2.js"></script>
+	<script type="text/javascript" src="mobilJs/jquery.mobile-1.4.5.min.js"></script>
+	<style type="text/css">
+		
+		/*瑙勫畾闈㈡澘鐨勬牱寮�*/
+		.ui-panel {
+    		width: 80%;
+		}
+		.ui-panel-dismiss{
+			width: 20%;
+		}
+		.ui-panel-inner{
+			padding:0 !important;
+		}
+		.ui-collapsible-heading-toggle{
+			padding-left: 1em !important;
+		}
+		.panel-header{
+			padding: 8px 0;
+			font-size: 1.2em;
+			text-indent: 1em;
+			background-color: #DFDCDC;
+		}
+		/*瑙勫畾寮�鍏崇殑浣嶇疆*/
+		.ui-flipswitch {
+			margin-left: 0.5em;
+		}
+		
+		.ui-field-contain{
+			padding: 0 0.6em ;
+		}
+        .ui-field-contain {
+		    border-bottom-color: #828282;
+		    border-bottom-color: rgba(0,0,0,.15);
+		    border-bottom-width: 1px;
+		    border-bottom-style: none;
+		}
+        .sicon{ 
+        	display:inline-block;width:4%;margin:1em 0;float:left; 
+        }
+        .checkdata{
+	         display:inline-block;width:48%;margin:0 0 0 0;float:left; 
+	     }
+	     
+	     .next-page, .pre-page {
+			position: fixed;
+			width: 40px;
+			height: 40px;
+			top: 50%;
+			margin-top: -15px;
+		}
+		.next-page  {
+			right: 0;
+		}
+		.pre-page  {
+			left: 0;
+		}
+	     
+       
+		table {
+			margin-top:.5em;
+			border-collapse:separate; 
+			border-spacing:0 .5em;
+		}
+		
+		tbody tr td{
+			overflow: hidden;
+			text-overflow:ellipsis;
+			white-space: nowrap;
+		}
+	</style>
+	<link rel="stylesheet" href="css/fgpanel.css">
+</head>
+<body>
+	<div data-role="page">
+		<div class="fg-panel">
+			<form>
+				<div class="fg-panel-header">绛涢��</div>
+				<div class="fg-panel-content">
+					<fieldset data-role="controlgroup">
+		             	<p>鐪�</p>
+			            <select id="mainteArea" data-mini="true">
+			              <option value="">鍏ㄩ儴</option>
+			              <option value="">涓�鏋㈢航</option>
+			              <option value="">浜屾灑绾�</option>
+			              <option value="">鏋㈢航妤�</option>
+			            </select>
+			            <p>甯�</p>
+			            <select id="city" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+			            <p>鍖�/鍘�</p>
+			            <select id="country" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+		             	<p>鏈烘埧绔欑偣</p>
+			            <select id="homeName" data-mini="true">
+			            	<option value="">鍏ㄩ儴</option>
+			            </select>
+		            	<p>缁熻鏂瑰紡</p>
+			            <select id="" data-mini="true">
+			            	<option value="">鎸夊勾缁熻</option>
+			            	<option value="">鎸夋湀缁熻</option>
+			            	<option value="">鎸夋棩缁熻</option>
+			            </select>
+		             	<p>鏃堕棿娈�</p>
+		             	<div class="checkdata">
+							<input id="startTestrecord"  type="text" name="appDate" class="appDatefir"  value="2000-01-01" />
+						</div>
+						<span class="sicon">&macr;</span>
+						<div class="checkdata">
+							<input id="endTestrecord" type="text" name="appDate" class="appDatesec"  value="2017-01-01" />
+						</div>
+						
+		        	</fieldset>
+				</div>
+				<div class="fg-panel-btn">
+					<a href="javascript:panel.hide(true);" id="submit" data-role="button" class="ui-btn ui-mini ui-btn-b ui-shadow">纭畾</a>
+				</div>
+			</form>
+		</div>
+		<!-- 澶撮儴鍐呭 -->
+		<div data-role="header" data-position="fixed">
+			<a href="count-report.html" target="_top" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;">杩斿洖</a>
+			<h1>璁惧娴侀噺缁熻鏌ヨ</h1>
+			<a href="javascript:panel.show();" class="ui-btn ui-corner-all ui-shadow ui-icon-grid ui-btn-icon-left" style="padding-top: 0.7em; padding-bottom: 0.7em;" id="screen">绛涢��</a>
+		</div>
+		<!-- 涓讳綋鍐呭 -->
+		<div data-role="main">
+			<div class="pre-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-l ui-btn-icon-notext">鍥炬爣</a></div>
+			<div class="next-page"><a href="#" class="ui-btn ui-corner-all ui-icon-carat-r ui-btn-icon-notext">鍥炬爣</a></div>	
+			<!-- 琛ㄦ牸瀹瑰櫒 -->
+			<div class="tbl-container"></div>
+			<table data-role="table" class="ui-responsive ui-shadow" id="tab" >
+					
+			</table>
+		</div>
+	</div>
+</body>
+
+<script src="mobilJs/mobiscroll.core-2.5.2.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.core-2.5.2-zh.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1.js" type="text/javascript"></script>
+<script src="mobilJs/mobiscroll.datetime-2.5.1-zh.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/tbl.js"></script>
+<script type="text/javascript" src="mobilJs/base.js"></script>
+<script type="text/javascript" src="js/panel.js"></script>
+<script type="text/javascript">	
+	$(function () {
+		setTimes($("#startTestrecord"),'2000-01-01');
+		setTimes($("#endTestrecord"),new Date().format('yyyy-MM-dd'));
+		
+	});
+</script> 
+ <script type="text/javascript">  
+    $('document').ready(function(){panel.show();});    
+ 
+    var arr=new Array();		//褰撳墠琛ㄦ牸td鏁版嵁
+    var Page = {
+		pageSize:10, 				//姣忛〉鐨勮鏁�
+		pageCurr:1,  				//褰撳墠椤电爜鏁�
+		pageAll:0,
+	};
+	
+    var arrTh = ['缁熻鏃堕棿娈�', '鐪�', '甯�', '鏈烘埧鍚嶇О','娴侀噺'];
+	dataArr = [];
+    var startTime = "1980-01-01";
+    var endTime = new Date().format('yyyy-MM-dd');
+    var tbl = $('.tbl-container');
+    createTbl(tbl, arrTh, dataArr);
+	$(document).ready(function(){
+		setPage();
+		$("#submit").click(function(){
+			Page.pageCurr=1;
+	    	searchBadBatt();
+		});
+	 });
+	
+	 //鏌ヨ鐢垫睜淇℃伅
+	 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(),
+				
+			},
+			
+			tdata:{	
+				
+				record_time:$('#startTestrecord').val(),   		//鐢垫睜娴嬭瘯璁板綍鏃堕棿娈�
+				record_time1:$('#endTestrecord').val()  
+				
+			}
+			
+		};
+		return temp;
+	}
+	// stringify(createSearchForm());
+	//椤甸潰鍔犺浇鏃舵煡璇㈢渷
+	$.post("BattInfAction_serchByStation",null,function(data){
+		data = data.result;
+	    data = eval("("+data+")");
+	    //console.info(data);
+	    //console.info(data.code);
+	    if(data.code==1&&data.data.length>0){
+	   		var $Ostation_name1=$("#mainteArea");
+	    	$Ostation_name1.text("");
+	    	var arr = new Array();
+	    	for(var i=0;i<=data.data.length;i++)
+	        {
+	           	if(i == 0){
+	           		arr.push({
+	           			val:"",
+	           			txt:"鍏ㄩ儴(鍏�"+data.sum+"涓�)",
+	           		});
+	           	}else{
+	           		arr.push({
+	           			val:data.data[i-1].StationName1,
+	           			txt:data.data[i-1].StationName1,
+	           		});
+	           	}
+	    	}
+	    	updataSel($Ostation_name1, arr);
+        }
+         findCity();
+    });
+
+  
+//褰撶渷鏀瑰彉鏃舵洿鏂板競
+	function findCity(){
+		var data = {
+			StationName1: $("#mainteArea").val()
+		};
+		//console.info(data);
+		// 璇锋眰鑾峰彇褰撳墠鐪佷笅鐨勫競
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName2",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#city");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName2,
+		           			txt:data.data[i-1].StationName2,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         findCounty();
+	    }
+	    });
+    }
+	
+//褰撳競鏀瑰彉鏃舵洿鏂板尯/鍘�
+	function findCounty(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName5",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#country");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName5,
+		           			txt:data.data[i-1].StationName5,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	      findStationNamebyStationname1();   
+	    }
+	    });
+    }
+  
+ //褰撳尯鍘挎洿鏂版椂鏇存柊鏈烘埧  
+    function findStationNamebyStationname1(){
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val()
+		};
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchStationName3",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#homeName");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:"",
+		           			stationid:"",
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].StationName3,
+		           			stationid:data.data[i-1].StationId,
+		           			txt:data.data[i-1].StationName3,
+		           		});
+		           	}
+		    	}
+		    	//console.info(111111111111111);
+		    	updataSelStation($Ostation_name1, arr);
+	        }
+	       
+	        findserchByBattGroupNamebystationname(); 
+	    }
+	    });
+    }
+ 
+ //鏍规嵁鏈烘埧鑾峰彇鐢垫睜缁�   
+     function findserchByBattGroupNamebystationname(){
+		var stationid = $("#station_name").find('option:selected').attr('stationid')?$("#station_name").find('option:selected').attr('stationid'):'';
+	
+		var data = {
+			StationName1: $("#mainteArea").val(),
+			StationName2:$("#city").val(),
+			StationName5:$("#country").val(),
+			StationName: $("#homeName").val(),
+			StationId: stationid
+		};
+		
+		//console.info(data);
+		$.ajax({ 	
+	        type: "post", 				
+	        url: "BattInfAction!serchBattByStation",				
+	        async:true,				
+	        dataType:'json',
+	        data:"json = "+JSON.stringify(data),	
+	        success: function(data){
+			data = data.result;
+		    data = eval("("+data+")");
+		    //console.warn();
+		    //console.info(data);
+		    //console.info(data.code);	   
+		    if(data.code==1&&data.data.length>0){
+		   		var $Ostation_name1=$("#battgroup_name");
+		    	$Ostation_name1.text("");
+		    	var arr = new Array();
+		    	for(var i=0;i<=data.data.length;i++)
+		        {
+		           	if(i == 0){
+		           		arr.push({
+		           			val:0,
+		           			txt:"鍏ㄩ儴(鍏�"+data.data.length+"涓�)",
+		           		});
+		           	}else{
+		           		arr.push({
+		           			val:data.data[i-1].BattGroupId,
+		           			txt:data.data[i-1].BattGroupName,
+		           		});
+		           	}
+		    	}
+		    	updataSel($Ostation_name1, arr);
+	        }
+	         
+	    }
+	    });
+    }
+    
+   //褰撶渷鏀瑰彉鏃舵洿鏂板競
+   $('#mainteArea').change(function(){
+   		findCity();	
+   });
+   //褰撳競鏀瑰彉鏃舵敼鍙樺尯/鍘�
+   $('#city').change(function(){
+   		findCounty();	
+   });
+   //褰撳尯/鍘挎敼鍙樻椂鏀瑰彉鏈烘埧
+   $('#country').change(function(){
+   		findStationNamebyStationname1(); 	
+   });   	
+	//褰撴満鎴挎敼鍙樻椂锛屾洿鏂扮數姹犵粍	
+	$('#homeName').change(function(){
+		findserchByBattGroupNamebystationname();
+	});
+		
+	
+		
+	$(function() {
+		//鐐瑰嚮涓婁竴椤�
+		$('.pre-page').on('click', 'a', function() {
+			if(Page.pageCurr>1){
+				Page.pageCurr = Page.pageCurr - 1;
+				searchBadBatt();
+			}
+		});
+		
+		//鐐瑰嚮涓嬩竴椤�
+		$('.next-page').on('click', 'a', function() {
+			var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+			if(Page.pageCurr<pageNum){
+				Page.pageCurr = Page.pageCurr + 1;
+				searchBadBatt();
+			}
+		});
+	});
+	
+	
+	// 鍒ゆ柇鏄惁鏄剧ず缈婚〉鎸夐挳
+	function setPageTurning(isShowPre, isShowNext) {
+		if(isShowPre) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笂缈婚〉鎸夐挳
+			$('.pre-page').show();
+		}else {
+			$('.pre-page').hide();
+		}
+
+		if(isShowNext) {	// 鍒ゆ柇鏄惁鏄剧ず鍚戜笅缈婚〉鎸夐挳
+			$('.next-page').show();
+		}else {
+			$('.next-page').hide();
+		}
+	}					
+	
+	//璁剧疆椤甸潰鐨勮烦杞摼鎺�
+	function setPage(){
+		if(Page.pageCurr <= 1){
+			$('.pre-page').hide();
+		}else{
+			$('.pre-page').show();
+		}
+		var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+		
+		if(Page.pageCurr < pageNum){
+			$('.next-page').show();
+		}else{
+			$('.next-page').hide();
+		}
+		
+	}
+   </script>
+</html> 
\ No newline at end of file
diff --git a/gx_tieta/WebRoot/mobil/count-report.html b/gx_tieta/WebRoot/mobil/count-report.html
index 77d36b5..7d3bfbb 100644
--- a/gx_tieta/WebRoot/mobil/count-report.html
+++ b/gx_tieta/WebRoot/mobil/count-report.html
@@ -46,6 +46,12 @@
 					<li>
 						<a href="batt-state-manage.html"  target="_top" data-transition="slidefade">鏈烘埧瀹炴椂鐘舵�佹煡璇�</a>
 					</li>
+					<li>
+						<a href="batt-state-statistical.html"  target="_top" data-transition="slidefade">鏈烘埧鍘嗗彶浜嬩欢鏌ヨ</a>
+					</li>
+					<li>
+						<a href="batt-traffic-statistics.html"  target="_top" data-transition="slidefade">璁惧娴侀噺缁熻鏌ヨ</a>
+					</li>
 					<!-- <li>
 						<a href="powercut.html" data-ajax="false" data-transition="slidefade">鏈烘埧鍋滅數鏌ヨ</a>
 					</li>				

--
Gitblit v1.9.1