潘钊 / bsth_control · Commits

Commit d1fdd820584d43c5611b3dff5a2ce529e9d1f8b3

Authored by 潘钊
Committed by zb
1 parent ee5cd56f
build: skipped

update...

Inline Side-by-side
Showing 4 changed files with 33 additions and 36 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
  View file @d1fdd82
... ... @@ -53,15 +53,15 @@ public class CorrectSignalHandle extends SignalHandle {
53 53  
54 54 //（转发的数据不管）
55 55 if(gps.getSource() != 0){
56   - //gps=非营运 && 班次=非空驶 ;切换到营运状态
57   - if(!gps.isService() &&
  56 + //gps=非营运 或走向不对 && 班次=非空驶 ;切换到营运状态
  57 + if((!gps.isService() || gps.getUpDown() != updown) &&
58 58 !dayOfSchedule.emptyService(task)){
59   - gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, null);
  59 + gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "系统@同步");
60 60 }
61 61  
62 62 //需要切换线路
63 63 if(!task.getXlBm().equals(gps.getLineId())){
64   - gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), null);
  64 + gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "系统@同步");
65 65 }
66 66 }
67 67  
... ...
src/main/resources/static/pages/excep/boundList.html
  View file @d1fdd82
... ... @@ -161,7 +161,7 @@ $(function(){
161 161 var toDay = new Date();
162 162 var year = toDay.getFullYear();
163 163 var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1);
164   - var Day = toDay.getDate()>10?toDay.getDate():"0"+toDay.getDate();
  164 + var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
165 165 var date = year+"-"+Month+"-"+Day;
166 166 //时间表单默认选择当日时间。
167 167 $("input[name='date']")[0].value = date;
... ...
src/main/resources/static/pages/excep/offlineList.html
  View file @d1fdd82
... ... @@ -165,7 +165,7 @@ $(function(){
165 165 var toDay = new Date();
166 166 var year = toDay.getFullYear();
167 167 var Month = toDay.getMonth()+1>10?toDay.getMonth()+1:"0"+(toDay.getMonth()+1);
168   - var Day = toDay.getDate()>10?toDay.getDate():"0"+toDay.getDate();
  168 + var Day = toDay.getDate()>9?toDay.getDate():"0"+toDay.getDate();
169 169 var date = year+"-"+Month+"-"+Day;
170 170 //时间表单默认选择当日时间。
171 171 $("input[name='date']")[0].value = date;
... ...
src/main/resources/static/pages/excep/speedingList.html
  View file @d1fdd82
... ... @@ -59,15 +59,16 @@
59 59 <option value="1">下行</option>
60 60 <option value="-1">无效</option>
61 61 </select>
62   - </td>
  62 + </td>
63 63 <td>
64 64 <input class="form-control" type="date" name="startDate" />
65   - -
66   - <input class="form-control" type="date" name="endDate" />
67 65 </td>
68 66 <td>
  67 + <input class="form-control" type="date" name="endDate" />
69 68 </td>
70 69 <td>
  70 + >=<input class="form-control" type="text" name="times" style="width:50px;display:inline!important"
  71 + onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this)" onblur="this.v();"/>
71 72 </td>
72 73 <td>
73 74 </td>
... ... @@ -104,9 +105,9 @@
104 105 {{obj.vehicle}}
105 106 </td>
106 107 <td>
107   - {{if obj.up_down==0}}
  108 + {{if obj.upDown==0}}
108 109 上行
109   - {{else if obj.up_down==1}}
  110 + {{else if obj.upDown==1}}
110 111 下行
111 112 {{else}}
112 113 无效
... ... @@ -124,9 +125,9 @@
124 125 <td>
125 126 <a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
126 127 data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
127   - data-lon="{{obj.lon}}" data-lat="{{obj.lat}}"
128   - data-endlon="{{obj.endlon}}" data-endlat="{{obj.endlat}}" >
129   - 查看轨迹
  128 + data-lon="{{obj.lon}}" data-lat="{{obj.lat}}" data-endlon="{{obj.endlon}}"
  129 + data-endlat="{{obj.endlat}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
  130 + 查看轨迹
130 131 </a>
131 132 </td>
132 133 <td>
... ... @@ -165,7 +166,7 @@ $(function(){
165 166 var parameter = new Object();
166 167 parameter.endDate = $("input[name='endDate']")[0].value;
167 168 parameter.startDate = $("input[name='startDate']")[0].value;
168   -
  169 + jsDoQuery(parameter, true);
169 170 //搜索线路
170 171 $.get('/basic/lineCode2Name',function(result){
171 172 var data=[];
... ... @@ -173,11 +174,7 @@ $(function(){
173 174 for(var code in result){
174 175 data.push({id: code, text: result[code]});
175 176 }
176   - initPinYinSelect2($('#line'),data,function(ldmcSelector) {
177   - ldmcSelector.select2("val",data[1].id);//因为数据量太大，所以默认一条线路作为查询参数
178   - });
179   - parameter.line = data[1].id;
180   - jsDoQuery(parameter,true);
  177 + initPinYinSelect2('#line',data,'');
181 178 });
182 179  
183 180 //时间戳转换为年月日
... ... @@ -224,12 +221,12 @@ $(function(){
224 221 params['order'] = 'lastLoginDate';
225 222 params['page'] = page;
226 223 var i = layer.load(2);
227   - $.get('/gps/pagequery' ,params, function(data){
228   - var bodyHtm = template('speeding_list_temp', {list: data.list});
  224 + $get('/speeding/pagequery' ,params, function(data){
  225 + var bodyHtm = template('speeding_list_temp', {list: data.dataList});
229 226 $('#datatable_speeding tbody').html(bodyHtm)
230 227 .find('.icheck').iCheck(icheckOptions)
231 228 .on('ifChanged', iCheckChange);
232   - if(pagination){
  229 + if(pagination && data.dataList.length > 0){
233 230 //重新分页
234 231 initPagination = true;
235 232 showPagination(data);
... ... @@ -243,8 +240,10 @@ $(function(){
243 240 var lat = $(this).data('lat');
244 241 var endLon = $(this).data('endlon');
245 242 var endLat = $(this).data('endlat');
  243 + var lineid = $(this).data('lineid');
  244 + var upDown = $(this).data('updown');
246 245 var storage = window.localStorage;
247   - storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat);
  246 + storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
248 247 $.get('/pages/excep/speedingMap.html?',function (result) {
249 248 layer.open({
250 249 type: 1,
... ... @@ -290,25 +289,24 @@ $(function(){
290 289 initPagination = false;
291 290 return;
292 291 }
293   - page = num - 1;
294 292 var cells = $('tr.filter')[0].cells
295 293 ,params = {}
296 294 ,name;
297   - $.each(cells, function(i, cell){
298   - var items = $('input,select', cell);
299   - for(var j = 0, item; item = items[j++];){
300   - name = $(item).attr('name');
301   - if(name){
302   - params[name] = $(item).val();
303   - }
  295 + $.each(cells, function(i, cell){
  296 + var items = $('input,select', cell);
  297 + for(var j = 0, item; item = items[j++];){
  298 + name = $(item).attr('name');
  299 + if(name){
  300 + params[name] = $(item).val();
304 301 }
305   - });
306   - jsDoQuery(params, false);
  302 + }
  303 + });
  304 + page = num - 1;
  305 + jsDoQuery(params, false);
307 306 }
308 307 });
309 308 }
310 309  
311   -
312 310 //删除
313 311 $('#removeButton').on('click', function(){
314 312 if($(this).attr('disabled'))
... ... @@ -336,7 +334,6 @@ $(&#39;#nbbm&#39;).select2({
336 334 xlbm:$('#line').val()};
337 335 },
338 336 processResults: function (data) {
339   - console.log(data);
340 337 return {
341 338 results: data
342 339 };
... ...