报表

廖磊
1 parent 49257b4c
Showing 4 changed files with 19 additions and 32 deletions
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/oil/cylAdd.html
src/main/resources/static/pages/oil/cylList.html
src/main/resources/static/pages/report/timetable/timetable.html
@@ -502,9 +502,9 @@ public class ReportServiceImpl implements ReportService{
 		String lx1="";
 		for (int x = 0; x < lists.size(); x++) {
 			if(lists.get(x).get("lx").equals("lx0")){
-				lx0=lists.get(x).get("fcsj").toString();
+				lx0=lists.get(x).get("fcsj")==null?"0:0":lists.get(x).get("fcsj").toString();
 			}else{
-				lx1=lists.get(x).get("fcsj").toString();
+				lx1=lists.get(x).get("fcsj")==null?"0:0":lists.get(x).get("fcsj").toString();
 			}
 		}
@@ -88,8 +88,6 @@
 			submitHandler : function(f) {
 				var params = form.serializeJSON();
 				error.hide();
-				console.log(params);
-				
 				//检查一下用户是否存在
 				$get('/cyl/all', {nbbm_eq: params.nbbm}, function(list){
 					if(!list || list.length == 0){
@@ -104,10 +102,6 @@
 								loadPage('cylList.html');
 							}
 						});
-						/* $post('/user', params, function(res){
-							layer.msg('添加用户成功.');
-							loadPage('list.html');
-						}); */
 					}
 					else
 						layer.alert('内部编码【' + params.nbbm + '】已存在', {icon: 2, title: '提交被拒绝'});
@@ -115,7 +115,7 @@
 		{{obj.updatetime}}
 	</td>
 	<td>
-		<!--<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
+		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
 	</td>
 </tr>
 {{/each}}
@@ -237,11 +237,4 @@ $(function(){
 		});
 	});
 });
-//改变状态
-function changeEnabled(id,enabled){
-	debugger
-	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
-		jsDoQuery(null, true);
-	})
-}
 </script>
 \ No newline at end of file
@@ -44,7 +44,7 @@
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
 					<label id="xlxq"></label>
-					<table class="table table-bordered table-hover table-checkable" style="margin-bottom:5p" id="formsTime1">
+					<table class="table table-bordered table-hover table-checkable" style="margin-bottom:5px" id="formsTime1">
 						<thead>
 							<tr>
 								<th colspan="10">行车时刻表统计表</th>
@@ -160,7 +160,7 @@
 										<td colspan="5">全日分组行驶时间(区间除外)</td>
 									</tr>
 									<tr>
-										<td width="25%" rowspan="2" style="text-align:center;vertical-align:middle;w">分组   时间</td>
+										<td width="25%" rowspan="2" style="text-align:center;vertical-align:middle;">分组   时间</td>
 										<td width="30%" colspan="2" style="text-align:center;vertical-align:middle;">实驶（分）</td>
 										<td width="20%" rowspan="2" style="text-align:center;vertical-align:middle;">分圈   时间</td>
 										<td width="25%" rowspan="2" style="text-align:center;vertical-align:middle;">车距</td>
@@ -215,11 +215,11 @@
 				layer.msg('请选择线路.');
 			}else{
 				 $get('/report/tbodyTime1',{line:line,date:date},function(result){
-					var tbodyTime1 = template('tbodyTime1',{result});
+					var tbodyTime1 = template('tbodyTime1',{map:result});
 					$('#formsTime1 .tbody_time_1').html(tbodyTime1);
 				}); 
 				$.get('/report/tbodyTime2',{line:line,date:date},function(result){
-					var tbodyTime2 = template('tbodyTime2',{result});
+					var tbodyTime2 = template('tbodyTime2',{map:result});
 					$('#formsTime2 .tbody_time_2').html(tbodyTime2);
 				});
 				$.get('/report/tbodyTime3',{line:line,date:date},function(result){
@@ -247,23 +247,23 @@
 </script>
 <script type="text/html" id="tbodyTime1">
 	<tr>
-		<td>{{result.pcs}}</td>
-		<td>{{result.qcbc}}</td>
-		<td>{{result.qjbc}}</td>
-		<td>{{result.zqcbc}}</td>
-		<td>{{result.zqjbc}}</td>
-		<td>{{result.wqcbc}}</td>
-		<td>{{result.wqjbc}}</td>
-		<td>{{result.zlc}}</td>
-		<td>{{result.yylc}}</td>
-		<td>{{result.kslc}}</td>
+		<td>{{map.pcs}}</td>
+		<td>{{map.qcbc}}</td>
+		<td>{{map.qjbc}}</td>
+		<td>{{map.zqcbc}}</td>
+		<td>{{map.zqjbc}}</td>
+		<td>{{map.wqcbc}}</td>
+		<td>{{map.wqjbc}}</td>
+		<td>{{map.zlc}}</td>
+		<td>{{map.yylc}}</td>
+		<td>{{map.kslc}}</td>
 	</tr>
 </script>
 <script type="text/html" id="tbodyTime2">
 	<tr>
-		<td align="center">{{result.yysj}}</td>
-		<td align="center">{{result.yycs}}</td>
+		<td align="center">{{map.yysj}}</td>
+		<td align="center">{{map.yycs}}</td>
 	</tr>
 </script>