页面时刻表类型选项改成可以看到包括启用和不启用的时刻表

娄高锋
1 parent c5221dc5
Showing 4 changed files with 122 additions and 47 deletions
src/main/resources/static/pages/forms/statement/busInterval.html
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
@@ -305,6 +305,7 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
+			var i = layer.load(2);
 // 			$(".hidden").removeClass("hidden");
 			$get('/busInterval/interval', params, function(result){
 				// 把数据填充到模版中
@@ -316,6 +317,7 @@
 				_w_table_rowspan("#forms tbody", 3);
 				_w_table_rowspan("#forms tbody", 4);
 				_w_table_rowspan("#forms tbody", 5);
+				layer.close(i);
 			});		
 		}
@@ -341,10 +343,12 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "export";
+			var i = layer.load(2);
 			$get('/busInterval/interval', params, function(result){
 				window.open("/downloadFile/download?fileName=班次间隔统计表"
 						+moment(startDate).format("YYYYMMDD")+"-"
 						+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
 		});
@@ -395,21 +399,38 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
+// 			if(statu == 0)
+// 				params['line'] = " ";
+// 			if(statu == 1)
+// 				params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
 			if(statu == 0)
-				params['line'] = " ";
-			if(statu == 1)
-				params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
-				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
-				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
-			});
+			if(statu == 1){
+				params['xl.lineCode_eq'] = line;
+				$get('/tic_ec', params, function(result){
+					treeData = createTreeData(result.data.content);
+					var options = '<option value="">请选择...</option>';
+					$.each(treeData, function(i, g){
+						if(!g.isCancel)
+							options += '<option value="'+g.id+'">'+g.name+'</option>';
+					});
+					$('#model').html(options)/* .select2() */;
+					flag = 0;
+				});
+			}
 		}
 		/**
@@ -388,11 +388,14 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
+			var i = layer.load(2);
 			$("#forms .hidden").removeClass("hidden");
 			$get('/busInterval/lineTimeAnaliy', params, function(result){
 				console.log(result);
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_lineTimeAnaly',{list:result});
+				layer.close(i);
+				
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
 				$("#works_hidden").addClass("hidden");
@@ -470,14 +473,25 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-			params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
+// 			params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
+			params['xl.lineCode_eq'] = line;
+			$get('/tic_ec', params, function(result){
+				treeData = createTreeData(result.data.content);
 				var options = '<option value="">请选择...</option>';
 				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
+					if(!g.isCancel)
+						options += '<option value="'+g.id+'">'+g.name+'</option>';
 				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
@@ -252,11 +252,13 @@
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
 			$(".hidden").removeClass("hidden");
+			var i = layer.load(2);
 			$get('/pcpc/scheduleAnaly', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
+				layer.close(i);
 				if(result.dataList.length == 0)
 					$("#export").attr('disabled',"true");
@@ -286,8 +288,10 @@
 			params['subCompany'] = subCompany;
 			params['bcType'] = bcType;
 			params['type'] = "export";
+			var i = layer.load(2);
 			$get('/pcpc/scheduleAnaly', params, function(result){
 				window.open("/downloadFile/download?fileName=时刻表分析"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
 		});
@@ -311,16 +315,27 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-			params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
+// 			params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				var size = 0;
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 					size++;
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
+			params['xl.lineCode_eq'] = line;
+			$get('/tic_ec', params, function(result){
+				treeData = createTreeData(result.data.content);
 				var options = '<option value="">请选择...</option>';
-				var size = 0;
 				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
-					size++;
+					if(!g.isCancel)
+						options += '<option value="'+g.id+'">'+g.name+'</option>';
 				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
@@ -121,14 +121,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#startDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
-		$("#endDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
 		$("#times1").datetimepicker({
 			format : 'HH:mm',
@@ -140,6 +132,7 @@
 		});
 		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -147,8 +140,19 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#startDate").val(year + "-" + month + "-" + day);
-		$("#endDate").val(year + "-" + month + "-" + day);
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate").val(dateTime);
+		$("#endDate").val(dateTime);
 		$("#times1").val("05:00");
 		$("#times2").val("23:00");
@@ -329,6 +333,7 @@
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
 // 			$(".hidden").removeClass("hidden");
+			var i = layer.load(2);
 			$get('/busInterval/timeAndSpeed', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_timeAndSpeed', {list:result});
@@ -336,6 +341,7 @@
 				$('#forms').html(tbodyHtml);
 				list = result;
 				$("#works_hidden").addClass("hidden");
+				layer.close(i);
 				_w_table_rowspan("#forms", 1);
 				_w_table_rowspan("#forms", 2);
@@ -388,10 +394,12 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "export";
+			var i = layer.load(2);
 			$get('/busInterval/timeAndSpeed', params, function(result){
 				window.open("/downloadFile/download?fileName=行驶时间及车速统计表"
 						+moment(startDate).format("YYYYMMDD")+"-"
 						+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
 		});
@@ -447,21 +455,38 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
+// 			if(statu == 0)
+// 				params['line'] = " ";
+// 			if(statu == 1)
+// 				params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options);
+// 				flag = 0;
+// 			});
 			if(statu == 0)
-				params['line'] = " ";
-			if(statu == 1)
-				params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
-				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
-				});
-				$('#model').html(options);
+				$('#model').html(options)/* .select2() */;
 				flag = 0;
-			});
+			if(statu == 1){
+				params['xl.lineCode_eq'] = line;
+				$get('/tic_ec', params, function(result){
+					treeData = createTreeData(result.data.content);
+					var options = '<option value="">请选择...</option>';
+					$.each(treeData, function(i, g){
+						if(!g.isCancel)
+							options += '<option value="'+g.id+'">'+g.name+'</option>';
+					});
+					$('#model').html(options)/* .select2() */;
+					flag = 0;
+				});
+			}
 		}
 		function updateLp(ttId){