Commit a16b07b2e9aff99e01af9b28f798e819c6a9e534
Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
Showing
2 changed files
with
2 additions
and
2 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
| @@ -159,7 +159,7 @@ public class CarOutInfoHandler { | @@ -159,7 +159,7 @@ public class CarOutInfoHandler { | ||
| 159 | ScheduleRealInfo[] array = new ScheduleRealInfo[3]; | 159 | ScheduleRealInfo[] array = new ScheduleRealInfo[3]; |
| 160 | Collections.sort(list, schDFSJComparator); | 160 | Collections.sort(list, schDFSJComparator); |
| 161 | 161 | ||
| 162 | - int count = 0, threshold = 1000 * 60 * 60; | 162 | + int count = 0, threshold = 1000 * 60 * 60 * 4; |
| 163 | long t = System.currentTimeMillis(); | 163 | long t = System.currentTimeMillis(); |
| 164 | for (ScheduleRealInfo sch : list) { | 164 | for (ScheduleRealInfo sch : list) { |
| 165 | if (count == 3) | 165 | if (count == 3) |
src/main/resources/static/real_control_v2/js/main.js
| @@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(), | @@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(), | ||
| 47 | $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html'); | 47 | $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html'); |
| 48 | }, 1000); | 48 | }, 1000); |
| 49 | //弹出更新说明 | 49 | //弹出更新说明 |
| 50 | - showUpdateDescription(); | 50 | + //showUpdateDescription(); |
| 51 | }); | 51 | }); |
| 52 | 52 | ||
| 53 | function g_emit(id) { | 53 | function g_emit(id) { |