Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents ceddcf9e d2cfd47b
Showing 5 changed files with 53 additions and 32 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/pages/home.html
src/main/resources/static/pages/punctual/list.html
src/main/resources/static/pages/punctual/onTime.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -376,11 +376,11 @@ public class GpsServiceImpl implements GpsService {
  
         // weeks_year 分区字段
         Calendar sCal = Calendar.getInstance();
-        sCal.setTime(new Date(st * 1000));
+        sCal.setTime(new Date(st));
         int sWeekOfYear = sCal.get(Calendar.WEEK_OF_YEAR);
         Calendar eCal = Calendar.getInstance();
-        eCal.setTime(new Date(et * 1000));
-        int eWeekOfYear = eCal.get(Calendar.DAY_OF_YEAR);
+        eCal.setTime(new Date(et));
+        int eWeekOfYear = eCal.get(Calendar.WEEK_OF_YEAR);
  
         //按年分表
         String tableName = "bsth_c_arrival_info_" + fmtyyyy.print(st);
@@ -64,7 +64,7 @@
         <li class="sub_title"><h6>基础信息</h6></li>
         <li><span class="label s_c_add">新增</span>1、新增站点间双路段生成功能。</li>
         <li><span class="label s_c_change">修复</span>2、修复一个bug，在线路编辑页面初始化线路的系统规划功能，百度地图上缺少的线路会显示一直加载。</li>
-        <li><span class="label s_c_change">修复</span>3、修复一个bug，在修改站点时选择取消，不点击站点树状图，直接选择上/下行操作里的修改站点，会出现没有可修改站点的bug。</li>
+        <li><span class="label s_c_change">修改</span>3、修改站点位置修改。</li>
         <li><span class="label s_c_add">新增</span>4、新增线路删除功能，可以删除已撤销的线路，仅用于剔除录入错误的数据，如出现误操作，请联系管理员恢复数据。</li>
         <li class="sub_title"><h6>用油和报表</h6></li>
         <li><span class="label s_c_add">新增</span>5、油量，电量记录操作日志。</li>
@@ -22,7 +22,7 @@
 	</div>
 </div>
  
-<div class="row" id="sheetList">
+<div class="row" id="onTime">
 	<div class="col-md-12">
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-body">
@@ -41,7 +41,8 @@
 								<td>实际发车</td>
 								<td>计划到站</td>
 								<td>实际到站</td>
-								<td>是否准点</td>
+								<td>发车准点</td>
+								<td>到站准点</td>
 							</tr>
 						</thead>
  
@@ -61,7 +62,7 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
 		var no="";
-		$("#sheetList").on('init', function (e, id) {
+		$("#onTime").on('init', function (e, id) {
 			no=id;
 			var date = id.split("_")[0];
 			var endDate = date;
@@ -69,8 +70,8 @@
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			$get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:2},function(result){
-				var sheetList_2 = template('sheetList_2',{list:result});
-				$('#forms_2 tbody').html(sheetList_2);
+				var onTime_2 = template('onTime_2',{list:result});
+				$('#forms_2 tbody').html(onTime_2);
 			});
 		});
 		$("#exportList").on('click',function(){
@@ -86,21 +87,24 @@
  
 	});
 </script>
-<script type="text/html" id="sheetList_2">
+<script type="text/html" id="onTime_2">
 	{{each list as obj i}}
-		<tr {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>
+		<tr>
 		<td>{{i+1}}</td>
 		<td>{{obj.zd}}</td>
 		<td>{{obj.clzbh}}</td>
 		<td>{{obj.jsy}}</td>
 		<td>{{obj.lp}}</td>
-		<td>{{obj.fcsj}}</td>
-		<td>{{obj.fcsjA}}</td>
-		<td>{{obj.zdsj}}</td>
-		<td>{{obj.zdsjA}}</td>
-		<td>
+		<td {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>{{obj.fcsj}}</td>
+		<td {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>{{obj.fcsjA}}</td>
+		<td {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>
 			{{if obj.fcsjflag!="1"}}准点{{else}}不准点{{/if}}
 		</td>
+		<td {{if obj.zdsjflag=="1"}}style="color: red" {{/if}}>{{obj.zdsj}}</td>
+		<td {{if obj.zdsjflag=="1"}}style="color: red" {{/if}}>{{obj.zdsjA}}</td>
+		<td {{if obj.zdsjflag=="1"}}style="color: red" {{/if}}>
+			{{if obj.zdsjflag!="1"}}准点{{else}}不准点{{/if}}
+		</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -264,10 +264,10 @@
 			var gs=$('#gsdm').val();
 			var i = layer.load(2);
 			$get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs},function(result){
-				var sheetList = template('sheetList',{list:result});
-				$('#forms tbody').html(sheetList);
-				$('#forms_h tbody').html(template('sheetList_h',{list:result}));
-				$('.btn-sheetList').on('click', showSheetList);
+				var onTime = template('onTime',{list:result});
+				$('#forms tbody').html(onTime);
+				$('#forms_h tbody').html(template('onTime_h',{list:result}));
+				$('.btn-onTime').on('click', showSheetList);
 				layer.close(i);
 			});
 		});
@@ -279,11 +279,11 @@
 			var gs=$('#gsdm').val();
 			var i = layer.load(2);
 			$get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:1},function(result){
-				var sheetList = template('sheetList_1',{list:result});
-				$('#forms_1 tbody').html(sheetList);
-				$('#forms_1_h tbody').html(template('sheetList_1_h',{list:result}));
+				var onTime = template('onTime_1',{list:result});
+				$('#forms_1 tbody').html(onTime);
+				$('#forms_1_h tbody').html(template('onTime_1_h',{list:result}));
 				$("#forms_1 .hidden").removeClass("hidden");
-				$('.btn-sheetList_1').on('click', openSheetList);
+				$('.btn-onTime_1').on('click', openSheetList);
 				$("#export_1").removeClass("hidden");
 				$("html,body").animate({scrollTop:$("#forms_1").offset().top},1000);
 				layer.close(i);
@@ -305,8 +305,8 @@
 					shift: 5,
 					scrollbar: false,
 					success: function () {
-						$('#sheetList').trigger('init', id);
-						$('#sheetList').unbind();
+						$('#onTime').trigger('init', id);
+						$('#onTime').unbind();
 					}
 				});
 			});
@@ -339,7 +339,7 @@
  
 	});
 </script>
-<script type="text/html" id="sheetList">
+<script type="text/html" id="onTime">
 	{{each list as obj i}}
 		<tr>
 		<td>{{obj.gs}}</td>
@@ -351,7 +351,7 @@
 		<td>{{obj.fczdl}}</td>
 		<td>{{obj.zdzdl}}</td>
 		<td>
-			<button type="button" class="btn btn-sm blue btn-sheetList" 
+			<button type="button" class="btn btn-sm blue btn-onTime" 
 			data-id="{{obj.xlbm}}">查看</button>
 		</td>
 		</tr>
@@ -363,7 +363,7 @@
 	{{/if}}
 </script>
  
-<script type="text/html" id="sheetList_h">
+<script type="text/html" id="onTime_h">
 	{{each list as obj i}}
 		<tr>
 		<td>{{obj.gs}}</td>
@@ -383,7 +383,7 @@
 	{{/if}}
 </script>
  
-<script type="text/html" id="sheetList_1">
+<script type="text/html" id="onTime_1">
 	{{each list as obj i}}
 		<tr>
 		<td>{{obj.gs}}</td>
@@ -396,7 +396,7 @@
 		<td>{{obj.fczdl}}</td>
 		<td>{{obj.zdzdl}}</td>
 		<td>
-			<button type="button" class="btn btn-sm blue btn-sheetList_1" 
+			<button type="button" class="btn btn-sm blue btn-onTime_1" 
 			data-id="{{obj.xl_date}}">详细</button>
 		</td>
 		</tr>
@@ -409,7 +409,7 @@
 </script>
  
  
-<script type="text/html" id="sheetList_1_h">
+<script type="text/html" id="onTime_1_h">
 	{{each list as obj i}}
 		<tr>
 		<td>{{obj.gs}}</td>
@@ -37,6 +37,8 @@ var gb_schedule_table = (function () {
                 rs[lineCode].sort(schedule_sort);
                 //calc shift
                 $.each(rs[lineCode], function () {
+                    if(this.status==-1)
+                        clearActualTime(this);
                     calc_sch_real_shift(this);
                     line2Schedule[lineCode][this.id] = this;
                     //子任务公里是否与计划平
@@ -308,6 +310,8 @@ var gb_schedule_table = (function () {
         //var tMaps = {};
         $.each(schArr, function () {
             try {
+                if(this.status==-1)
+                    clearActualTime(this);
                 //子任务公里是否与计划平
                 this.c_t_mileage_status = calcCTaskMileageStatus(this);
                 line2Schedule[this.xlBm][this.id] = this;
@@ -332,6 +336,8 @@ var gb_schedule_table = (function () {
         if (!isArray(schArr))
             schArr = [schArr];
         $.each(schArr, function () {
+            if(this.status==-1)
+                clearActualTime(this);
             line2Schedule[this.xlBm][this.id] = this;
         });
     };
@@ -795,6 +801,17 @@ var gb_schedule_table = (function () {
         }
     };
  
+    var clearActualTime = function (sch) {
+        try{
+            sch.fcsjActual=null;
+            sch.fcsjActualTime=null;
+            sch.zdsjActual=null;
+            sch.zdsjActualTime=null;
+        }catch (e){
+            console.log(e);
+        }
+    };
+    
     return {
         show: show,
         findScheduleByLine: findScheduleByLine,