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 c20eb9f2 effff2cb
Showing 2 changed files with 2 additions and 2 deletions
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/resources/static/real_control_v2/js/main.js
@@ -159,7 +159,7 @@ public class CarOutInfoHandler {
         ScheduleRealInfo[] array = new ScheduleRealInfo[3];
         Collections.sort(list, schDFSJComparator);
  
-        int count = 0, threshold = 1000 * 60 * 60;
+        int count = 0, threshold = 1000 * 60 * 60 * 4;
         long t = System.currentTimeMillis();
         for (ScheduleRealInfo sch : list) {
             if (count == 3)
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            showUpdateDescription();
+            //showUpdateDescription();
         });
  
         function g_emit(id) {