报表

廖磊
1 parent 4dd4a882
Showing 7 changed files with 313 additions and 265 deletions
src/main/resources/application-dev.properties
src/main/resources/static/pages/oil/checkJyryList.html
src/main/resources/static/pages/oil/cylList.html
src/main/resources/static/pages/oil/jyglList.html
src/main/resources/static/pages/oil/jyszList.html
src/main/resources/static/pages/oil/list.html
src/main/resources/static/pages/report/inoutstation.html
@@ -6,7 +6,7 @@ spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
+spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://192.168.168.201/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
@@ -166,7 +166,19 @@ $(function(){
 			params['jsy']=jsy;
 			params['id']=id;
 			$get('/ylxxb/check', params, function(){
-				jsDoQuery(null,true);
+				var cells = $('tr.filter')[0].cells
+				,params1 = {}
+				,name;
+			$.each(cells, function(i, cell){
+				var items = $('input,select', cell);
+				for(var j = 0, item; item = items[j++];){
+					name = $(item).attr('name');
+					if(name){
+						params1[name] = $(item).val();
+					}
+				}
+			});
+				jsDoQuery(params1,true);
 			});
 		}
 	})
@@ -186,21 +198,22 @@ $(function(){
 // 		jsDoQuery(null, true);
 	});
-	var gsqx="";
-	var fgsqx="";
+// 	var gsqx="";
+// 	var fgsqx="";
 	$.get('/user/companyData', function(result){
 		obj = result;
-		var options = '<option value="">请选择</option>';
+		var options = '';
+// 	'<option value="">请选择</option>';
 		for(var i = 0; i < obj.length; i++){
 			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			setFgsqx(obj[i].companyCode);
-			gsqx +=obj[i].companyCode+",";
+// 			setFgsqx(obj[i].companyCode);
+// 			gsqx +=obj[i].companyCode+",";
 		}
 		$('#jyryListGsdmId').html(options);
 		updateCompany();
 	});
-	function setFgsqx(gs){
+	/* function setFgsqx(gs){
 		var company =gs
 		var options = '';
 		for(var i = 0; i < obj.length; i++){
@@ -211,11 +224,12 @@ $(function(){
 				}
 			}
 		}
-	}
+	} */
 	$("#jyryListGsdmId").on("change",updateCompany);
 	function updateCompany(){
 		var company = $('#jyryListGsdmId').val();
-		var options = '<option value="">请选择</option>';
+		var options = '';
+// 	'<option value="">请选择</option>';
 		for(var i = 0; i < obj.length; i++){
 			if(obj[i].companyCode == company){
 				var children = obj[i].children;
@@ -230,7 +244,13 @@ $(function(){
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
-		if($("#yyrq").val()!=""){
+		var jyryGsdm=$("#jyryListGsdmId").val();
+		var jyryFgsdm=$("#jyryListFgsdmId").val();
+		if($("#yyrq").val()==""||$("#yyrq").val()==null ){
+			layer.msg('请选择日期.');
+		}else if(jyryGsdm=="" || jyryGsdm==null ||jyryFgsdm==""||jyryFgsdm==null){
+			layer.msg('请选择公司和分公司.');
+		}else{
 			var cells = $('tr.filter')[0].cells
 				,params = {}
 				,name;
@@ -245,8 +265,6 @@ $(function(){
 			});
 			page = 0;
 			jsDoQuery(params, true);
-		}else{
-			layer.msg('请选择日期.');
 		}
 	});
@@ -265,7 +283,7 @@ $(function(){
 // 		var i = layer.load(2);
 		var i = 2;
-		var jyryGsdm=$("#jyryListGsdmId").val();
+		/* var jyryGsdm=$("#jyryListGsdmId").val();
 		var jyryFgsdm=$("#jyryListFgsdmId").val();
 		if(jyryGsdm=="" || jyryGsdm==null){
 			params['gsdm_in']=gsqx;
@@ -283,7 +301,7 @@ $(function(){
 				}
 				params['fgsdm_in']=fgsqx1;
 			}
-		} 
+		}  */
 		$get('/ylxxb/pagequery' ,params, function(data){
 			$.each(data.dataList, function(i, obj) {
@@ -355,54 +373,49 @@ $(function(){
 	});
-});
-//改变状态
-function changeEnabled(id,enabled){
-	debugger
-	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
-		jsDoQuery(null, true);
-	})
-}
-//改变状态
-function startOptJsy(id){
-	$('#jsy'+id).select2({
-		placeholder: '搜索驾驶员...',
-		ajax: {
-			url: '/personnel/sreachPersonnel',
-			dataType: 'json',
-			delay: 150,
-			data: function(params){
-				return{jobCode: params.term};
+	//改变状态
+	function startOptJsy(id){
+		$('#jsy'+id).select2({
+			placeholder: '搜索驾驶员...',
+			ajax: {
+				url: '/personnel/sreachPersonnel',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{jobCode: params.term};
+				},
+			    processResults: function (data) {
+			      return {
+			        results: data
+			      };
+			    },
+				cache: true
 			},
-		    processResults: function (data) {
-		      return {
-		        results: data
-		      };
-		    },
-			cache: true
-		},
-		templateResult: function(repo){
-			if (repo.loading) return repo.text;
-			var h = '<span>'+repo.text+'</span>';
-			return h;
-		},
-		escapeMarkup: function (markup) { return markup; },
-		minimumInputLength: 1,
-		templateSelection: function(repo){
-			return repo.text;
-		},
-		language: {
-	       noResults: function(){
-	           return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';
-	       },
-	       inputTooShort : function(e) {
-				return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';
-		   },
-	       searching : function() {
-				return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';
-		   }
-		}
-	})
-}
+			templateResult: function(repo){
+				if (repo.loading) return repo.text;
+				var h = '<span>'+repo.text+'</span>';
+				return h;
+			},
+			escapeMarkup: function (markup) { return markup; },
+			minimumInputLength: 1,
+			templateSelection: function(repo){
+				return repo.text;
+			},
+			language: {
+		       noResults: function(){
+		           return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';
+		       },
+		       inputTooShort : function(e) {
+					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';
+			   },
+		       searching : function() {
+					return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';
+			   }
+			}
+		})
+	}
+	
+});
+
 </script>
 \ No newline at end of file
@@ -141,23 +141,24 @@ $(function(){
 	    increaseArea: '20%'
 	}
-	var gsqx="";
-	var fgsqx="";
+// 	var gsqx="";
+// 	var fgsqx="";
 	$.get('/user/companyData', function(result){
 		obj = result;
-		var options = '<option value="">请选择</option>';
+		var options = '';
+// 		'<option value="">请选择</option>';
 		for(var i = 0; i < obj.length; i++){
 			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			setFgsqx(obj[i].companyCode);
-			gsqx +=obj[i].companyCode+",";
+// 			setFgsqx(obj[i].companyCode);
+// 			gsqx +=obj[i].companyCode+",";
 		}
 		$('#cylListGsdmId').html(options);
 		updateCompany();
-		jsDoQuery(null,true);
+// 		jsDoQuery(null,true);
 	});
-	function setFgsqx(gs){
+	/* function setFgsqx(gs){
 		var company =gs
 		var options = '';
 		for(var i = 0; i < obj.length; i++){
@@ -168,12 +169,13 @@ $(function(){
 				}
 			}
 		}
-	}
+	} */
 	$("#cylListGsdmId").on("change",updateCompany);
 	function updateCompany(){
 		var company = $('#cylListGsdmId').val();
-		var options = '<option value="">请选择</option>';
+		var options = '';
+// 	'<option value="">请选择</option>';
 		for(var i = 0; i < obj.length; i++){
 			if(obj[i].companyCode == company){
 				var children = obj[i].children;
@@ -188,25 +190,31 @@ $(function(){
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
 		$('tr.filter input, select').val('').change();
-		jsDoQuery(null, true);
+// 		jsDoQuery(null, true);
 	});
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
-		var cells = $('tr.filter')[0].cells
-			,params = {}
-			,name;
-		$.each(cells, function(i, cell){
-			var items = $('input,select', cell);
-			for(var j = 0, item; item = items[j++];){
-				name = $(item).attr('name');
-				if(name){
-					params[name] = $(item).val();
+		var cylGsdm=$("#cylListGsdmId").val();
+		var cylFgsdm=$("#cylListFgsdmId").val();
+		if(cylGsdm=="" ||cylGsdm ==null ||cylFgsdm=="" ||cylFgsdm ==null){
+			layer.msg("请选择公司和分公司");
+		}else{
+			var cells = $('tr.filter')[0].cells
+				,params = {}
+				,name;
+			$.each(cells, function(i, cell){
+				var items = $('input,select', cell);
+				for(var j = 0, item; item = items[j++];){
+					name = $(item).attr('name');
+					if(name){
+						params[name] = $(item).val();
+					}
 				}
-			}
-		});
-		page = 0;
-		jsDoQuery(params, true);
+			});
+			page = 0;
+			jsDoQuery(params, true);
+		}
 	});
@@ -222,7 +230,7 @@ $(function(){
 		params['order'] = 'nbbm';
 		params['page'] = page;
 		var i = 2;
-		var cylGsdm=$("#cylListGsdmId").val();
+		/* var cylGsdm=$("#cylListGsdmId").val();
 		var cylFgsdm=$("#cylListFgsdmId").val();
 		if(cylGsdm==''|| cylGsdm==null){
 			params['gsdm_in']=gsqx;
@@ -240,8 +248,7 @@ $(function(){
 				}
 				params['fgsdm_in']=fgsqx1;
 			}
-		}
-		console.log(params);
+		} */
 		$get('/cyl' ,params, function(data){
 			$.each(data.content, function(i, obj) {
                 obj.updatetime = moment(obj.updatetime).format("YYYY-MM-DD");
@@ -202,39 +202,25 @@ $(function(){
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
 		$('tr.filter input, select').val('').change();
-		if($("#rq").val()!=""){
-			var cells = $('tr.filter')[0].cells
-			,params = {}
-			,name;
-		$.each(cells, function(i, cell){
-			var items = $('input,select', cell);
-			for(var j = 0, item; item = items[j++];){
-				name = $(item).attr('name');
-				if(name){
-					params[name] = $(item).val();
-				}
-			}
-		});
-			jsDoQuery(params, true);
-		}
 	});
-	var gsqx="";
-	var fgsqx="";
+// 	var gsqx="";
+// 	var fgsqx="";
 	$.get('/user/companyData', function(result){
 		obj = result;
-		var options = '<option value="">请选择</option>';
+		var options = '';
+// 	'<option value="">请选择</option>';
 		for(var i = 0; i < obj.length; i++){
 			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			setFgsqx(obj[i].companyCode);
-			gsqx +=obj[i].companyCode+",";
+// 			setFgsqx(obj[i].companyCode);
+// 			gsqx +=obj[i].companyCode+",";
 		}
 		$('#jyglListGsdmId').html(options);
 		updateCompany();
 	});
-	function setFgsqx(gs){
+	/* function setFgsqx(gs){
 		var company =gs
 		var options = '';
 		for(var i = 0; i < obj.length; i++){
@@ -245,11 +231,12 @@ $(function(){
 				}
 			}
 		}
-	}
+	} */
 	$("#jyglListGsdmId").on("change",updateCompany);
 	function updateCompany(){
 		var company = $('#jyglListGsdmId').val();
-		var options = '<option value="">请选择</option>';
+		var options = '';
+// 	'<option value="">请选择</option>';
 		for(var i = 0; i < obj.length; i++){
 			if(obj[i].companyCode == company){
 				var children = obj[i].children;
@@ -262,7 +249,13 @@ $(function(){
 	}
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
-		if($("#rq").val()!=""){
+		var jyglGsdm=$("#jyglListGsdmId").val();
+		var jyglFgsdm=$("#jyglListFgsdmId").val();
+		if($("#rq").val()==""||$("#rq").val()==null){
+			layer.msg('请选择日期.');
+		}else if(jyglGsdm=="" || jyglGsdm==null || jyglFgsdm=="" || jyglFgsdm==null){
+			layer.msg('请选择公司和分公司.');
+		}else{
 			var cells = $('tr.filter')[0].cells
 				,params = {}
 				,name;
@@ -277,8 +270,6 @@ $(function(){
 			});
 			page = 0;
 			jsDoQuery(params, true);
-		}else{
-			layer.msg('请选择日期.');
 		}
 	});
@@ -296,7 +287,7 @@ $(function(){
 		params['rq']=$("#rq").val();
 		var i = 2;
-		var jyglGsdm=$("#jyglListGsdmId").val();
+		/* var jyglGsdm=$("#jyglListGsdmId").val();
 		var jyglFgsdm=$("#jyglListFgsdmId").val();
 		if(jyglGsdm=="" || jyglGsdm==null){
 			params['gsdm_in']=gsqx;
@@ -314,7 +305,7 @@ $(function(){
 				}
 				params['fgsdm_in']=fgsqx1;
 			}
-		}
+		} */
 		$get('/cwjy/pagequery' ,params, function(data){
 			$.each(data.dataList, function(i, obj) {
                 obj.yyrq = $("#rq").val();
@@ -127,22 +127,23 @@ $(function(){
 	    checkboxClass: 'icheckbox_flat-blue',
 	    increaseArea: '20%'
 	}
-	var gsqx="";
-	var fgsqx="";
+// 	var gsqx="";
+// 	var fgsqx="";
 	$.get('/user/companyData', function(result){
 		obj = result;
-		var options = '<option value="">请选择</option>';
+		var options = '';
+// 			'<option value="">请选择</option>';
 		for(var i = 0; i < obj.length; i++){
 			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-			setFgsqx(obj[i].companyCode);
-			gsqx +=obj[i].companyCode+",";
+// 			setFgsqx(obj[i].companyCode);
+// 			gsqx +=obj[i].companyCode+",";
 		}
 		$('#jyszListGsdmId').html(options);
 		updateCompany();
-		jsDoQuery(null,true);
+// 		jsDoQuery(null,true);
 	});
-	function setFgsqx(gs){
+	/* function setFgsqx(gs){
 		var company =gs
 		for(var i = 0; i < obj.length; i++){
 			if(obj[i].companyCode == company){
@@ -152,7 +153,7 @@ $(function(){
 				}
 			}
 		}
-	}
+	} */
 	$("#jyszListGsdmId").on("change",updateCompany);
 	function updateCompany(){
 		var company = $('#jyszListGsdmId').val();
@@ -160,7 +161,7 @@ $(function(){
 		for(var i = 0; i < obj.length; i++){
 			if(obj[i].companyCode == company){
 				var children = obj[i].children;
-				options += '<option value="">请选择</option>';
+// 				options += '<option value="">请选择</option>';
 				for(var j = 0; j < children.length; j++){
 					options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
 				}
@@ -173,25 +174,31 @@ $(function(){
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
 		$('tr.filter input, select').val('').change();
-		jsDoQuery(null, true);
+		//jsDoQuery(null, true);
 	});
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
-		var cells = $('tr.filter')[0].cells
-			,params = {}
-			,name;
-		$.each(cells, function(i, cell){
-			var items = $('input,select', cell);
-			for(var j = 0, item; item = items[j++];){
-				name = $(item).attr('name');
-				if(name){
-					params[name] = $(item).val();
+		var jyszGsdm=$("#jyszListGsdmId").val();
+		var jyszFgsdm=$("#jyszListFgsdmId").val();
+		if(jyszGsdm=="" || jyszGsdm==null ||jyszFgsdm==""||jyszFgsdm==null){
+			 layer.msg('请选择公司和分公司.');
+		}else{
+			var cells = $('tr.filter')[0].cells
+				,params = {}
+				,name;
+			$.each(cells, function(i, cell){
+				var items = $('input,select', cell);
+				for(var j = 0, item; item = items[j++];){
+					name = $(item).attr('name');
+					if(name){
+						params[name] = $(item).val();
+					}
 				}
-			}
-		});
-		page = 0;
-		jsDoQuery(params, true);
+			});
+			page = 0;
+			jsDoQuery(params, true);
+		}
 	});
 	/*
@@ -206,7 +213,7 @@ $(function(){
 		params['order'] = 'nbbm';
 		params['page'] = page;
 		var i = 2;
-		var jyszGsdm=$("#jyszListGsdmId").val();
+		/* var jyszGsdm=$("#jyszListGsdmId").val();
 		var jyszFgsdm=$("#jyszListFgsdmId").val();
 		if(jyszGsdm==''|| jyszGsdm==null){
 			params['gsdm_in']=gsqx;
@@ -224,7 +231,7 @@ $(function(){
 				}
 				params['fgsdm_in']=fgsqx1;
 			}
-		}
+		} */
 		$get('/cwjy' ,params, function(data){
 			$.each(data.content, function(i, obj) {
                 obj.createDate = moment(obj.createDate).format("YYYY-MM-DD");
@@ -315,9 +315,6 @@
             locale: 'zh-cn'
         });
-        if ($("#rq").val() != "") {
-            jsDoQuery(null, true);
-        }
         var page = 0, initPagination;
         var icheckOptions = {
             radioClass: 'iradio_square-blue icheck',
@@ -331,7 +328,14 @@
         //提交
         $('tr.filter .filter-submit').on('click', function () {
-            if ($("#rq").val() != "") {
+        	 var ylbGsdm=$("#ylbListGsdmId").val();
+     		var ylbFgsdm=$("#ylbListFgsdmId").val();
+     		console.log();
+            if ($("#rq").val() == "" || $("#rq").val() ==null){
+            	  layer.msg('请选择日期.');
+            }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
+            	 layer.msg('请选择公司和分公司.');
+            }else {
                 var cells = $('tr.filter')[0].cells
                         , params = {}
                         , name;
@@ -346,42 +350,41 @@
                 });
                 page = 0;
                 jsDoQuery(params, true);
-            } else {
-                layer.msg('请选择日期.');
-            }
+            } 
         });
-        var gsqx="";
-    	var fgsqx="";
+//         var gsqxdm="";
+    
     	$.get('/user/companyData', function(result){
     		obj = result;
-    		var options = '<option value="">请选择</option>';
+    		var options="";
+// 			= '<option value="">请选择</option>';
     		for(var i = 0; i < obj.length; i++){
     			options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
-    			setFgsqx(obj[i].companyCode);
-    			gsqx +=obj[i].companyCode+",";
+//     			setFgsqx(obj[i].companyCode);
     		}
     		$('#ylbListGsdmId').html(options);
     		updateCompany();
     	});
-    	function setFgsqx(gs){
+    	/* function setFgsqx(gs){
     		var company =gs
     		var options = '';
     		for(var i = 0; i < obj.length; i++){
     			if(obj[i].companyCode == company){
     				var children = obj[i].children;
     				for(var j = 0; j < children.length; j++){
-    					fgsqx +=children[j].code+",";
+    					gsqxdm +=company+""+children[j].code+",";
     				}
     			}
     		}
-    	}
+    	} */
     	$("#ylbListGsdmId").on("change",updateCompany);
     	function updateCompany(){
     		var company = $('#ylbListGsdmId').val();
-    		var options = '<option value="">请选择</option>';
+    		var options ="";
+//     		= '<option value="">请选择</option>';
     		for(var i = 0; i < obj.length; i++){
     			if(obj[i].companyCode == company){
     				var children = obj[i].children;
@@ -403,6 +406,25 @@
             params['order'] = 'nbbm';
             params['page'] = page;
             params['rq'] = $("#rq").val();
+            
+          /*   var ylbGsdm=$("#ylbListGsdmId").val();
+    		var ylbFgsdm=$("#ylbListFgsdmId").val();
+    		if(ylbGsdm==''|| ylbGsdm==null){
+    			params['concat(ssgsdm,fgsdm)_in']=gsqxdm;
+    		}else{
+    			if(ylbFgsdm==''||ylbFgsdm==null){
+    				var fgsqx1='';
+    				for(var i = 0; i < obj.length; i++){
+    					if(obj[i].companyCode == ylbGsdm){
+    						var children = obj[i].children;
+    						for(var j = 0; j < children.length; j++){
+    							fgsqx1 +=children[j].code+",";
+    						}
+    					}
+    				}
+    				params['fgsdm_in']=fgsqx1;
+    			}
+    		} */
             var i = layer.load(2);
             $get('/ylb', params, function (data) {
                 $.each(data.content, function (i, obj) {
@@ -36,7 +36,7 @@
 						</div>
 						<div style="display: inline-block;margin-left: 15px;">
 							<span class="item-label" style="width: 80px;">线路: </span>
-							<select class="form-control" name="line" id="line" onchange="sreachZd()" style="width: 180px;"></select>
+							<select class="form-control sreach-zd" name="line" id="line"  style="width: 180px;"></select>
 						</div>
 					</div>
 					<br/>
@@ -58,7 +58,7 @@
 								<span class="item-label" style="width: 60px;">至: </span>
 								<input class="form-control" type="text" id="date2" style="width: 180px;"/>
 								<span class="item-label" style="width: 80px;">站点: </span>
-								<select id="zdlx"  onchange="sreachZd()"> 
+								<select id="zdlx" class="sreach-zd" > 
 										<option value="">请选择</option>
 										<option value="0">上行</option>
 										<option value="1">下行</option>
@@ -68,7 +68,7 @@
 							</div>
 						<div class="form-group" style="display: inline-block;margin-left: 15px;">
 							<input class="btn btn-default" type="button" id="query" value="查询"/>
-							<input class="btn btn-default" type="button" style="display: none;" onclick="clzd()" id="query2" value="查询"/>
+							<input class="btn btn-default" type="button" style="display: none;" id="query2" value="查询"/>
 							<input class="btn btn-default" type="button" id="export" value="导出"/>
 							<input class="btn btn-default" type="button" id="print" value="打印"/>
 							<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
@@ -176,7 +176,6 @@
 			for(var code in result){
 				data.push({id: code, text: result[code]});
 			}
-			console.log(data);
 			initPinYinSelect2('#line',data,'');
 		})
@@ -195,7 +194,6 @@
 			}else{
 				$post('/report/queryListBczx',{clzbh:clzbh,date:date,line:line},function(result){
 				    getTime(result);
-				    console.log(result);
 					var ludan_ll_2 = template('ludan_ll_2',{list:result});
 					// 把渲染好的模版html文本追加到表格中
 					$('#forms .ludan_ll_2').html(ludan_ll_2);
@@ -279,111 +277,119 @@
 					return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
 			   }
 			}
-		})
-		
-	});
-	
-	
-	function zdxx(fcsj,ddsj){
-		var rq=$("#date").val();
-		var line=$("#line").val();
-		var nbbm=$("#nbbm").val();
+		});
-			$post('/report/queryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
-			    var xlmc="线路: "+$("#select2-line-container").html();
-			    var clmc="车辆: "+nbbm;
-			    var rqmc="日期: "+rq;
-			    var bcmc="班次: "+fcsj+"-"+ddsj;
-			    $("#dlzmx").html("到离站详细                "+xlmc+"   "+clmc+"   "+rqmc+"   "+bcmc);
-			    console.log(result);
-				var ludan_ll_1 = template('ludan_ll_1',{list:result});
-					// 把渲染好的模版html文本追加到表格中
-				$('#forms1 .ludan_ll_1').html(ludan_ll_1);
+		$("#forms tbody").on("click","tr",function(){
+			var rq=$("#date").val();
+			var line=$("#line").val();
+			var nbbm=$("#nbbm").val();
+			var params = new Array();
+			if($(this).children().size() < 2){
+				return;
+			}
+			
+			$(this).children().each(function(index){
+				params[index] = $(this).text();
 			});
+			var id=params[0].split("\\")[0];
+			 var fcsj =  $('.in_carpark_fcsj[data-id='+id+']', '#forms').html();
+			 var ddsj=   $('.in_carpark_zdsj[data-id='+id+']', '#forms').html();
+
+				$post('/report/queryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
+				    var xlmc="线路: "+$("#select2-line-container").html();
+				    var clmc="车辆: "+nbbm;
+				    var rqmc="日期: "+rq;
+				    var bcmc="班次: "+fcsj+"-"+ddsj;
+				    $("#dlzmx").html("到离站详细                "+xlmc+"   "+clmc+"   "+rqmc+"   "+bcmc);
+					var ludan_ll_1 = template('ludan_ll_1',{list:result});
+						// 把渲染好的模版html文本追加到表格中
+					$('#forms1 .ludan_ll_1').html(ludan_ll_1);
+				});
+		})
-	}
-	
-	function clzd(){
-		var date1=$("#date1").val();
-		var date2=$("#date2").val();
-		var line=$("#line").val();
-		var zdlx=$("#zdlx").val();
-		var zd=$("#zd").val();
-		console.log(nbbm);
-		if(date1=="" || date1==null){
-			layer.msg("请选择时间");
-		}else if( line=="" || line==null){
-			layer.msg("请选择线路");
-		}else if(date2 ==null || date2==""){
-			layer.msg("请选择时间");
-		}else if(zdlx=="" || zdlx==null){
-			layer.msg("请选择方向");
-		}else{
-			   var xlmc="线路: "+$("#select2-line-container").html();
-			    var rqmc="日期: "+date1+"-"+date2;
-				var sxmc="上下行: "+	zdlx;
-				var zdmc="";
-				if(zd==null || zd==""){
-					zdmc="站点: "
-				}else{
-					zdmc="站点: "+$("#select2-zd-container").html();
-				}
-			    $("#dlzmx").html("到离站详细                "+xlmc+"   "+rqmc+"   "+sxmc+"   "+zdmc);
-			$post('/report/queryListClzd',{zd:zd,zdlx:zdlx,line:line,fcsj:date1,ddsj:date2},function(result){
-			    console.log(result);
-				var ludan_ll_1 = template('ludan_ll_1',{list:result});
-					// 把渲染好的模版html文本追加到表格中
-				$('#forms1 .ludan_ll_1').html(ludan_ll_1);
-			});
-		}
-	}
-	
-	function sreachZd(){
-		var line = $("#line").val();
-		var zdlx = $("#zdlx").val();
-		if(line==null|| line =="" || zdlx ==null || zdlx==""){
-			
-		}else{
-			$('#zd').select2({
-				placeholder: '搜索站点...',
-				ajax: {
-					url: '/report/sreachZd',
-					dataType: 'json',
-					delay: 150,
-					data: function(params){
-						return{line: line,zdlx:zdlx,zd:params.term};
+		$("#query2").click(function(){
+			var date1=$("#date1").val();
+			var date2=$("#date2").val();
+			var line=$("#line").val();
+			var zdlx=$("#zdlx").val();
+			var zd=$("#zd").val();
+			if(date1=="" || date1==null){
+				layer.msg("请选择时间");
+			}else if( line=="" || line==null){
+				layer.msg("请选择线路");
+			}else if(date2 ==null || date2==""){
+				layer.msg("请选择时间");
+			}else if(zdlx=="" || zdlx==null){
+				layer.msg("请选择方向");
+			}else{
+				   var xlmc="线路: "+$("#select2-line-container").html();
+				    var rqmc="日期: "+date1+"-"+date2;
+					var sxmc="上下行: "+	zdlx;
+					var zdmc="";
+					if(zd==null || zd==""){
+						zdmc="站点: "
+					}else{
+						zdmc="站点: "+$("#select2-zd-container").html();
+					}
+				    $("#dlzmx").html("到离站详细                "+xlmc+"   "+rqmc+"   "+sxmc+"   "+zdmc);
+				$post('/report/queryListClzd',{zd:zd,zdlx:zdlx,line:line,fcsj:date1,ddsj:date2},function(result){
+					var ludan_ll_1 = template('ludan_ll_1',{list:result});
+						// 把渲染好的模版html文本追加到表格中
+					$('#forms1 .ludan_ll_1').html(ludan_ll_1);
+				});
+			}
+		})
+		
+		$(".sreach-zd").click(function(){
+			var line = $("#line").val();
+			var zdlx = $("#zdlx").val();
+			if(line==null|| line =="" || zdlx ==null || zdlx==""){
+				
+			}else{
+				$('#zd').select2({
+					placeholder: '搜索站点...',
+					ajax: {
+						url: '/report/sreachZd',
+						dataType: 'json',
+						delay: 150,
+						data: function(params){
+							return{line: line,zdlx:zdlx,zd:params.term};
+						},
+					    processResults: function (data) {
+					      return {
+					        results: data
+					      };
+					    },
+						cache: true
 					},
-				    processResults: function (data) {
-				      return {
-				        results: data
-				      };
-				    },
-					cache: true
-				},
-				templateResult: function(repo){
-					if (repo.loading) return repo.text;
-					var h = '<span>'+repo.text+'</span>';
-					return h;
-				},
-				escapeMarkup: function (markup) { return markup; },
-				minimumInputLength: 1,
-				templateSelection: function(repo){
-					return repo.text;
-				},
-				language: {
-			       noResults: function(){
-			           return '<span style="color:red;font-size: 12px;">没有搜索到站点！</span>';
-			       },
-			       inputTooShort : function(e) {
-						return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入站点名称</span>';
-				   },
-			       searching : function() {
-						return '<span style="color:gray;font-size: 12px;"> 正在搜索站点...</span>';
-				   }
-				}
-			});
-		}
-	}
+					templateResult: function(repo){
+						if (repo.loading) return repo.text;
+						var h = '<span>'+repo.text+'</span>';
+						return h;
+					},
+					escapeMarkup: function (markup) { return markup; },
+					minimumInputLength: 1,
+					templateSelection: function(repo){
+						return repo.text;
+					},
+					language: {
+				       noResults: function(){
+				           return '<span style="color:red;font-size: 12px;">没有搜索到站点！</span>';
+				       },
+				       inputTooShort : function(e) {
+							return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入站点名称</span>';
+					   },
+				       searching : function() {
+							return '<span style="color:gray;font-size: 12px;"> 正在搜索站点...</span>';
+					   }
+					}
+				});
+			}
+		})
+		
+		
+	});
+	
 </script>
 <script type="text/html" id="ludan_ll_1">
 	  {{each list as obj i}}
@@ -426,7 +432,7 @@
 				{{else if obj.status==-1}}
 					(已烂班 )
 				{{else}}
-					<a onclick='zdxx("{{obj.fcsjActual}}","{{obj.zdsjActual}}")'>
+					<a >
 						({{obj.fcsjActual}}
 						{{if obj.fast>0}}
 							早点 {{obj.fast}}分钟
@@ -436,6 +442,8 @@
 							整点
 						{{/if}}
 						)
+						<span class="in_carpark_fcsj" data-id="{{i+1}}" style="display:none">{{obj.fcsjActual}}</span>
+						<span class="in_carpark_zdsj" data-id="{{i+1}}" style="display:none">{{obj.zdsjActual}}</span>
 					</a>
 				{{/if}}