update...

潘钊
1 parent ad1b8985
Showing 4 changed files with 36 additions and 14 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/sch_edit_info/list.html
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
src/main/resources/static/real_control_v2/js/main.js
@@ -10,11 +10,10 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.controller.realcontrol.dto.LpData;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
-import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
-import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.edit_logs.ScheduleModifyLogger;
 import com.bsth.data.schedule.edit_logs.loggers.FcxxwtLogger;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
@@ -1320,14 +1319,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     ts.add(next);
                 }
  
-                try{
+/*                try{
                     //车辆下一个要执行的班次
                     ScheduleRealInfo carNext = dayOfSchedule.next(sch);
                     if(carNext != null && !carNext.getXlBm().equals(sch.getXlBm())){
                         DirectivePushQueue.put64(carNext.getClZbh(), carNext.getXlBm(), "套跑@系统");
                         fLog.log("下发线路切换指令", sch.getXlName(), carNext.getXlName());
                     }
-                }catch (Exception e){logger.error("", e);}
+                }catch (Exception e){logger.error("", e);}*/
  
                 //重新计算车辆执行班次
                 dayOfSchedule.reCalcExecPlan(sch.getClZbh());
@@ -2,7 +2,7 @@
     <div class="uk-modal-dialog" style="width: 1280px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-        <h2>班次修正记录</h2>
+        <h2>班次修正日志</h2>
             </div>
  
         <div style="padding-left: 12px;margin: 20px 0">
@@ -38,7 +38,7 @@
                     <button class="uk-button">检索</button>
  
                     <label style="float: right;font-size: 12px;color: #989797;">
-                        <input type="checkbox" disabled> 显示系统修正记录
+                        <input type="checkbox" disabled> 显示系统修正日志
                     </label>
                 </fieldset>
             </form>
@@ -175,8 +175,8 @@
             var etInfos={};//id映射
  
             //滚动条
-            //$('.history-sch-wrap', modal).perfectScrollbar({suppressScrollX: true});
-            //history-sch-wrap
+            $('.edit-info-table-wrap', modal).perfectScrollbar({suppressScrollX: true});
+
             $(modal).on('init', function (e, data) {
                 e.stopPropagation();
                 $.get('/realSchedule/dateArray?c=1', function (rs) {
@@ -242,18 +242,42 @@
                 loading=true;
                 gb_common.$get('/schEditInfo/_list', data, function (rs) {
                     etInfos = {};
+                    nbbmArray=[];
+                    jsyArray=[];
+                    lpArray = [];
                     $.each(rs.list, function () {
                         this.jsonArray = JSON.parse(this.jsonArray);
                         etInfos[this.id] = this;
+
+                        nbbmArray.push({value: this.clZbh});
+                        jsyArray.push({value: this.jGh+'/'+this.jName,
+                            fullChars: pinyin.getFullChars(this.jName).toUpperCase(),
+                            camelChars: pinyin.getCamelChars(this.jName)});
+                        lpArray.push({value: this.lpName});
                     });
                     //根据班次ID合并修正操作
                     var list = mergeData(rs.list).sort(sortFun);
-
                     var htmlStr = template('history-sch-edit-info-temp', {list: list});
-
                     $('.sch-edit-info-table .ct_table_body', modal).html(htmlStr);
                     $('.load-panel', modal).hide();
                     loading=false;
+
+                    //value
+                    nbbmArray=distinctByField(nbbmArray);
+                    jsyArray=distinctByField(jsyArray);
+                    lpArray=distinctByField(lpArray);
+                    if(reLoadLp){
+                        //路牌下拉框
+                        var ops = '<option value="">全部</option>';
+                        $.each(lpArray, function () {
+                            ops += '<option value="'+this.value+'">'+this.value+'</option>';
+                        });
+                        $('[name=lpName]', modal).html(ops);
+                        reLoadLp = false;
+                    }
+
+                    //更新滚动条高度
+                    $('.edit-info-table-wrap', modal).perfectScrollbar('update');
                 });
             }
  
@@ -29,7 +29,7 @@
         },
         {
           "id": 1.41,
-          "text": "班次修正记录",
+          "text": "班次修正日志",
           "event": "sch_edit_info"
         },
         {
@@ -169,9 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-18',
-        text: '<h5>现在自定义子任务，勾选是否烂班后，烂班原因必填。</h5><h5>修复了在驾驶员请求出场时，误下发分班出场指令的问题</h5>' +
-        '<h5>调整了报表的弹出窗口<br>1、取消了窗口遮罩，可同时打开多个报表窗口，窗口堆叠时，点击窗口title切换堆叠顺序<br>2、鼠标按住窗口右下角，可随意改变窗口大小。<br>3、拖动窗口时，允许拖出页面之外<br><br>注意：将窗口和窗口title拖出页面外时，会面临窗口丢失的风险，过多丢失的窗口会影响到页面性能，你可以刷新页面以重置！</h5>'
+        date: '2017-05-23',
+        text: '<h5>现在可以在 数据&统计 里面看到班次修正日志。05-23之后的数据开始展现</h5>'
     };
  
     var storage = window.localStorage