update...

潘钊 · zb
1 parent ee5cd56f
Showing 4 changed files with 33 additions and 36 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/resources/static/pages/excep/boundList.html
src/main/resources/static/pages/excep/offlineList.html
src/main/resources/static/pages/excep/speedingList.html
@@ -53,15 +53,15 @@ public class CorrectSignalHandle extends SignalHandle {
         //（转发的数据不管）
         if(gps.getSource() != 0){
-            //gps=非营运 && 班次=非空驶 ;切换到营运状态
-            if(!gps.isService() &&
+            //gps=非营运 或走向不对 && 班次=非空驶 ;切换到营运状态
+            if((!gps.isService() || gps.getUpDown() != updown) &&
                     !dayOfSchedule.emptyService(task)){
-                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, null);
+                gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "系统@同步");
             }
             //需要切换线路
             if(!task.getXlBm().equals(gps.getLineId())){
-                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), null);
+                gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "系统@同步");
             }
         }
@@ -161,7 +161,7 @@ $(function(){
 	var toDay = new Date();
 	var year = toDay.getFullYear();
 	var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1); 
- 	var Day = toDay.getDate()>10?toDay.getDate():"0"+toDay.getDate();
+ 	var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
  	var date =  year+"-"+Month+"-"+Day;
  	//时间表单默认选择当日时间。
  	$("input[name='date']")[0].value = date;
@@ -165,7 +165,7 @@ $(function(){
 	var toDay = new Date();
 	var year = toDay.getFullYear();
 	var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1); 
- 	var Day = toDay.getDate()>10?toDay.getDate():"0"+toDay.getDate();
+ 	var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
  	var date =  year+"-"+Month+"-"+Day;
  	//时间表单默认选择当日时间。
  	$("input[name='date']")[0].value = date;
@@ -59,15 +59,16 @@
                                          <option value="1">下行</option>
                                          <option value="-1">无效</option>
                                      </select>
-								</td>
+								</td> 
 								<td> 
 									<input class="form-control" type="date" name="startDate" />
-									-
-									<input class="form-control" type="date" name="endDate" />
 								</td>
 								<td>
+									<input class="form-control" type="date" name="endDate" />
 								</td>
 								<td>
+									>=<input class="form-control" type="text" name="times" style="width:50px;display:inline!important"
+									  onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this)" onblur="this.v();"/> 
 								</td>
 								<td>
 								</td>
@@ -104,9 +105,9 @@
 		{{obj.vehicle}}
 	</td>
 	<td>
-		{{if obj.up_down==0}}
+		{{if obj.upDown==0}}
 			上行
-		{{else if obj.up_down==1}}
+		{{else if obj.upDown==1}}
 			下行 
 		{{else}}
 			无效
@@ -124,9 +125,9 @@
 	<td>
 		<a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
 			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
-			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" 
-			data-endlon="{{obj.endlon}}"  data-endlat="{{obj.endlat}}" >
-			查看轨迹
+			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" data-endlon="{{obj.endlon}}"  
+            data-endlat="{{obj.endlat}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
+			查看轨迹										
 		</a>
 	</td>
 	<td>
@@ -165,7 +166,7 @@ $(function(){
  	var parameter = new Object();
  	parameter.endDate = $("input[name='endDate']")[0].value;
  	parameter.startDate = $("input[name='startDate']")[0].value;
- 	 
+ 	jsDoQuery(parameter, true);
  	//搜索线路
 	$.get('/basic/lineCode2Name',function(result){
 		var data=[];
@@ -173,11 +174,7 @@ $(function(){
 		for(var code in result){
 			data.push({id: code, text: result[code]});
 		}
-		initPinYinSelect2($('#line'),data,function(ldmcSelector) {
-			ldmcSelector.select2("val",data[1].id);//因为数据量太大，所以默认一条线路作为查询参数
-		});
-		parameter.line = data[1].id;
-		jsDoQuery(parameter,true);
+		initPinYinSelect2('#line',data,'');
 	});
 	//时间戳转换为年月日
@@ -224,12 +221,12 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$.get('/gps/pagequery' ,params, function(data){
-			var bodyHtm = template('speeding_list_temp', {list: data.list});
+		$get('/speeding/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
 			$('#datatable_speeding tbody').html(bodyHtm)
 					.find('.icheck').iCheck(icheckOptions)
 					.on('ifChanged', iCheckChange);
-			if(pagination){
+			if(pagination && data.dataList.length > 0){
 				//重新分页
 				initPagination = true;
 				showPagination(data);
@@ -243,8 +240,10 @@ $(function(){
   				var lat = $(this).data('lat');
   				var endLon = $(this).data('endlon');
   				var endLat = $(this).data('endlat');
+  				var lineid = $(this).data('lineid');
+  				var upDown = $(this).data('updown');
   				var storage = window.localStorage;
-  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat);
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
  				$.get('/pages/excep/speedingMap.html?',function (result) {
 			    	layer.open({
 						type: 1,
@@ -290,25 +289,24 @@ $(function(){
 		    		initPagination = false;
 		    		return;
 		    	}	
-		    	page = num - 1;
 		    	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();
-						}
+			$.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, false);
+				}
+			});
+			page = num - 1;
+		   	jsDoQuery(params, false);
 		    }
 		});
 	}
-	
 	//删除
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
@@ -336,7 +334,6 @@ $(&#39;#nbbm&#39;).select2({
            	    xlbm:$('#line').val()}; 	
         },
         processResults: function (data) {
-        	console.log(data);
             return {
                 results: data
             };