Merge branch 'minhang' of git@192.168.168.201:panzhaov5/bsth_control.git into minhang

YRF
2 parents 2c524e71 9036d671
Showing 2 changed files with 5 additions and 5 deletions
src/main/resources/static/pages/summary/work_hours/list.html
src/main/resources/static/real_control_v2/js/main.js
@@ -262,8 +262,8 @@
     }
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-10-10');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-16', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val('2017-10-23');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-23', minDate: '2017-07-01'});
     var comps;
     //构建公司级联下拉框
@@ -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) {
@@ -168,8 +168,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-09-28',
-        text: '<h5>1、修复了一个bug，该bug曾导致，出场时间设置为请求出场的线路，有几率早出场时间会误跳至分班班次！</h5>'
+        date: '2017-10-25',
+        text: '<h5>1、修正了双击调整待发时，备注会被清空的bug。！</h5><h5>2、现在发车和到站信使可以撤销和编辑。</h5>'
     };
     var storage = window.localStorage