update

潘钊
1 parent 61930b9f
Showing 9 changed files with 192 additions and 96 deletions
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/resources/static/pages/forecast/sample/js/svg.js
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/line_schedule/layout.js
src/main/resources/static/real_control_v2/js/line_schedule/legend.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/main.html
@@ -3,6 +3,7 @@ package com.bsth.data.schedule;
 import com.bsth.data.LineConfigData;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -115,8 +116,11 @@ public class SchAttrCalculator {
 		ScheduleRealInfo prve = list.get(0), curr;
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName()))
+			if(prve.getZdzName().equals(curr.getQdzName())){
 				curr.setQdzArrDateJH(prve.getZdsj());
+				if(StringUtils.isNotEmpty(prve.getZdsjActual()) && StringUtils.isEmpty(curr.getQdzArrDatesj()))
+					curr.setQdzArrDatesj(prve.getZdsjActual());
+			}
 			prve = curr;
 		}
@@ -218,6 +218,8 @@ var sampleSvg = (function(){
 	//分析path d 路径中间点
 	function analysePath(d){
+		if(!d)
+			return [-100, -100];
 		d = d.replace('M', '');
 		var sp = d.split('L')[0].split(',')
 			,ep = d.split('L')[1].split(',')
@@ -64,6 +64,9 @@
 .line_schedule .schedule-wrap h3 {
     margin: 7px 0 5px;
     text-indent: 5px;
+    margin: 0;
+    height: 31px;
+    line-height: 31px;
 }
 .line_schedule .schedule-wrap.up h3 {
@@ -245,6 +248,7 @@ span.fcsj-diff {
 .tl-yzx {
     background: #c1ddf0;
     border-top: 1px solid #ebebeb !important;
+    color: #444;
 }
 .tl-xxfc{
@@ -254,15 +258,18 @@ span.fcsj-diff {
 .tl-wd{
     background: #caca4f;
+    color: #444;
 }
 .tl-xxsd{
     background: #e2de94;
+    color: #444;
 }
 .tl-xxrd{
     background: #c1ddf0;
     border-top: 1px solid #ebebeb !important;
+    color: #444;
 }
 .tl-qrlb {
@@ -277,6 +284,7 @@ span.fcsj-diff {
 .tl-zzzx {
     background: #96F396;
+    color: #444;
 }
 .ct_table>.ct_table_body dl:hover dd.tl-yzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-yzx, .ct_table>.ct_table_body dl:hover dd.tl-zzzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-zzzx {
@@ -901,4 +909,38 @@ input.i-cbox[type=checkbox]{
 .uk-modal-footer .ct-footer-left a{
     color: #6e6b6b;
     margin-right: 5px;
+}
+
+.fixed_legend{
+    font-size: 12px;
+    display: none;
+    height: 28px;
+    border-radius: 4px;
+    background: #efeeee;
+    padding-bottom: .5px;
+    margin-left: 10px;
+    padding-right: 8px;
+}
+.fixed_legend>div{
+    height: 100%;
+}
+.fixed_legend span{
+    padding: 4px 4px;
+    border-radius: 2px;
+    margin-right: 5px;
+    font-size: 12px;
+}
+
+.fixed_legend span:last-child{
+    margin-right: 0px;
+}
+
+/*.fixed_legend i{
+    font-size: 16px;
+    vertical-align: middle;
+    margin: -3px 3px 0 0;
+}*/
+
+.fixed_legend .tl-qrlb::before{
+    font-size: 12px;
 }
 \ No newline at end of file
@@ -322,8 +322,7 @@
                         name: "添加子任务",
                         items: {
                             'add_sub_task_in': {
-                                name: '回场',
-                                disabled: true
+                                name: '回场'
                             },
                             'add_sub_task_out': {
                                 name: '出场',
@@ -8,6 +8,22 @@
                 下行/{{line.endStationName}}
                 {{/if}}
                 <i class="uk-icon-question-circle" ></i>
+                <div class="fixed_legend">
+                    <div>
+                        <!--<i class="uk-icon-angle-right" ></i>-->
+                        <span class="tl-xxfc">消息发出</span>
+                        <span class="tl-xxsd">消息收到</span>
+                        <span class="tl-xxrd">消息阅读</span>
+                        &nbsp;
+                        <span class="tl-wd">误点</span>
+                        <span class="tl-zzzx">正在执行</span>
+                        <span class="tl-qrlb"></span>
+                        <span class="tl-yzx">已执行</span>
+                        <a>
+                            <i class="uk-icon-angle-double-up fixed_legend_close"></i>
+                        </a>
+                    </div>
+                </div>
                 <div class="search_sch_panel">
                     <form class="uk-form" onsubmit="javascript:return false;">
                         <div class="uk-autocomplete sch-search-autocom">
@@ -15,14 +15,13 @@ var gb_line_layout = (function() {
                 var lineCode=$(this).data('id')
                     ,svgWrap=$('.footer-chart .svg-wrap', this);
                 gb_svg_chart.draw_line(lineCode, svgWrap);
-                //console.log('gb_line_layout...', this);
-                //$('.footer-chart .svg-wrap', this)
             });
             cb && cb();
         });
     };
+    //图例icon tootip
     $(document).on('mouseenter', '.schedule-wrap i.uk-icon-question-circle', function() {
         $(this).qtip({
             show: {
@@ -49,7 +48,7 @@ var gb_line_layout = (function() {
                     //destroy dom
                     $(this).qtip('destroy', true);
                 }
-            }//    max-width: 335px;
+            }
         });
     });
+/* 图例相关 */
+
+var gb_sch_legend = (function () {
+
+
+    var animationend = 'webkitAnimationEnd animationend';
+    var initLegend = function () {
+        //双击展开
+        $('.schedule-wrap i.uk-icon-question-circle').dblclick(openLegend);
+
+        //关闭事件
+        $('.schedule-wrap .fixed_legend_close').on('click', function () {
+            //隐藏 fixed_legend
+            $('.schedule-wrap .fixed_legend').each(function () {
+                var anim = 'uk-animation-slide-top uk-animation-reverse';
+                if (!$(this).parents('.header-title').is(':hidden')) {
+                    $(this).addClass(anim).one(animationend, function () {
+                        var icon=$(this).removeClass(anim).hide().parents('.header-title').find('.uk-icon-question-circle');
+
+                        icon.addClass('uk-animation-slide-top').show().one(animationend, function () {
+                            $(this).removeClass('uk-animation-slide-top');
+                        });
+                    });
+                }
+                else {
+                    $(this).hide().parents('.header-title').find('.uk-icon-question-circle').show();
+                }
+            });
+        });
+    };
+
+
+    //展开图例
+    var openLegend = function () {
+        $('.qtip.sch-tl-tip').qtip('destroy', true);
+
+        //隐藏ICON
+        $('.schedule-wrap i.uk-icon-question-circle').hide();
+
+        var anim = 'uk-animation-slide-top';
+        //显示 fixed_legend
+        $('.schedule-wrap .fixed_legend').each(function () {
+            if (!$(this).parents('.header-title').is(':hidden')) {
+                $(this).addClass(anim).one('webkitAnimationEnd animationend', function () {
+                    $(this).removeClass(anim);
+                });
+            }
+        });
+        $('.schedule-wrap .fixed_legend').css('display', 'inline-block');
+    };
+
+    return {
+        init: initLegend
+    };
+})();
 \ No newline at end of file
 /** schedule table */
-var gb_schedule_table = (function() {
+var gb_schedule_table = (function () {
     var temps;
     //线路分组的班次数据
     var line2Schedule = {};
     //车辆应发未发车辆数
     var car_yfwf_map = {};
-    var schedule_sort = function(s1, s2) {
+    var schedule_sort = function (s1, s2) {
         return s1.dfsjT - s2.dfsjT;
     }
-    var show = function(cb) {
+    var show = function (cb) {
         //从服务器获取班次数据
         $.get('/realSchedule/lines', {
             lines: gb_data_basic.line_idx
-        }, function(rs) {
+        }, function (rs) {
             for (var lineCode in rs) {
                 //排序
                 rs[lineCode].sort(schedule_sort);
                 line2Schedule[lineCode] = {};
                 //calc shift
-                $.each(rs[lineCode], function() {
+                $.each(rs[lineCode], function () {
                     calc_sch_real_shift(this);
                     line2Schedule[lineCode][this.id] = this;
                 });
@@ -32,17 +32,17 @@ var gb_schedule_table = (function() {
         });
         //加载班次表格渲染模板
-        $.get('/real_control_v2/fragments/line_schedule/sch_table.html', function(dom) {
+        $.get('/real_control_v2/fragments/line_schedule/sch_table.html', function (dom) {
             ep.emit('temp', gb_common.compileTempByDom(dom, {
                 compress: true
             }));
         });
-        var ep = EventProxy.create("data", "temp", function(data, temp) {
+        var ep = EventProxy.create("data", "temp", function (data, temp) {
             temps = temp;
             var lineCode, dirData, htmlStr;
-            $('#main-tab-content .line_schedule').each(function() {
+            $('#main-tab-content .line_schedule').each(function () {
                 lineCode = $(this).data('id');
                 if (arrayIsNull(data[lineCode]))
                     return true;
@@ -64,27 +64,30 @@ var gb_schedule_table = (function() {
             gb_ct_table.enableSort($('.ct_table', content), reset_seq_no, gb_schedule_table_dbclick.init);
             //dbclick event
             gb_schedule_table_dbclick.init();
-
+            //点击实发，show detail
             fcsjActualCellQtip();
             cb && cb();
+
+            //图例相关
+            gb_sch_legend.init();
         });
     };
-    function fcsjActualCellQtip(){
+    function fcsjActualCellQtip() {
         //单击实发单元格显示详细信息
         $(document).on('click', 'dd.fcsjActualCell', function () {
-            var that=this;
+            var that = this;
             $(that).qtip({
                 show: true,
                 content: {
-                    text: function(e) {
-                        var lineCode=$(that).parents('li.line_schedule').data('id')
-                            ,id=$(that).parents('dl').data('id')
-                            ,sch=line2Schedule[lineCode][id];
+                    text: function (e) {
+                        var lineCode = $(that).parents('li.line_schedule').data('id')
+                            , id = $(that).parents('dl').data('id')
+                            , sch = line2Schedule[lineCode][id];
                         return temps['sfsj_sch-detail-temp'](sch);
                     }
                 }
-                ,style: {
+                , style: {
                     classes: 'qtip-dark qtip-rounded qtip-shadow'
                 },
                 hide: {
@@ -103,44 +106,17 @@ var gb_schedule_table = (function() {
                 }
             });
         });
-/*        $('dd.fcsjActualCell').qtip({
-            show: 'click',
-            content: {
-                text: function(e) {
-                    var lineCode=$(e.target).parents('li.line_schedule').data('id')
-                        ,id=$(e.target).parents('dl').data('id')
-                        ,sch=line2Schedule[lineCode][id];
-                    return temps['sfsj_sch-detail-temp'](sch);
-                }
-            }
-            ,style: {
-                classes: 'qtip-dark qtip-rounded qtip-shadow'
-            },
-            hide: {
-                fixed: true,
-                delay: 300
-            },
-            position: {
-                my: 'center left',
-                at: 'center right'
-            },
-            events: {
-                hidden: function (event, api) {
-                    $(this).qtip('destroy', true);
-                }
-            }
-        });*/
     }
     //重置序号
-    var reset_seq_no = function(dls) {
-        dls.each(function(i, dl) {
+    var reset_seq_no = function (dls) {
+        dls.each(function (i, dl) {
             $('dd:eq(0)', dl).text(i + 1);
         });
-    }
+    };
     //计算实发时间差值
-    var calc_sch_real_shift = function(sch) {
+    var calc_sch_real_shift = function (sch) {
         if (sch.fcsjActualTime) {
             var diff = parseInt((sch.fcsjActualTime - sch.dfsjT) / 1000 / 60);
             if (diff > 0)
@@ -150,22 +126,22 @@ var gb_schedule_table = (function() {
             else
                 sch.fcsj_diff = '';
         }
-    }
+    };
     function arrayIsNull(array) {
         return !array || array.length == 0;
     }
-    var findScheduleByLine = function(lineCode) {
+    var findScheduleByLine = function (lineCode) {
         return line2Schedule[lineCode];
-    }
+    };
     //新增一个班次，附带更新的班次
-    var insertSchedule = function(sch, upArr) {
+    var insertSchedule = function (sch, upArr) {
         line2Schedule[sch.xlBm][sch.id] = sch;
         //update
         if (isArray(upArr)) {
-            $.each(upArr, function() {
+            $.each(upArr, function () {
                 line2Schedule[this.xlBm][this.id] = this;
             });
         }
@@ -188,10 +164,10 @@ var gb_schedule_table = (function() {
         gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));
         //定位到新添加的班次
         scroToDl(sch);
-    }
+    };
     //删除一个班次
-    var deheteSchedule = function(sch) {
+    var deheteSchedule = function (sch) {
         sch = line2Schedule[sch.xlBm][sch.id];
         if (sch) {
             var dl = $('li.line_schedule[data-id=' + sch.xlBm + '] .ct_table_body dl[data-id=' + sch.id + ']'),
@@ -201,21 +177,21 @@ var gb_schedule_table = (function() {
             reset_seq_no(dls);
             calc_yfwf_num(sch.xlBm);
         }
-    }
+    };
     //更新班次
-    var updateSchedule = function(schArr) {
+    var updateSchedule = function (schArr) {
         if (!isArray(schArr))
             schArr = [schArr];
-        $.each(schArr, function() {
+        $.each(schArr, function () {
             line2Schedule[this.xlBm][this.id] = this;
             updateDom(this);
         });
-    }
+    };
     //update dom
-    var updateDom = function(sch) {
+    var updateDom = function (sch) {
         if (!sch) return;
         var dl = $('li.line_schedule[data-id=' + sch.xlBm + '] .ct_table_body dl[data-id=' + sch.id + ']');
         var dds = $('dd', dl);
@@ -241,12 +217,12 @@ var gb_schedule_table = (function() {
             $(dds[8]).html('<span title="' + sch.remarks + '" data-uk-tooltip="{pos:\'top-left\'}">' + sch.remarks + '</span>');
         else
             $(dds[8]).html('');
-    }
+    };
     //拖拽选中...
     var seq_nos = '.line-schedule-table .ct_table_body>dl>dd.seq_no';
     var drag_strat;
-    $(document).on('mousedown', seq_nos, function(e) {
+    $(document).on('mousedown', seq_nos, function (e) {
         if (e.button != 0) return;
         var dl = $(this).parent();
         if (dl.hasClass('drag-active'))
@@ -255,9 +231,9 @@ var gb_schedule_table = (function() {
             dl.addClass('drag-active');
         drag_strat = parseInt($(this).text()) - 1;
-    }).on('mouseup', function() {
+    }).on('mouseup', function () {
         drag_strat = null;
-    }).on('mouseover', seq_nos, function() {
+    }).on('mouseover', seq_nos, function () {
         if (drag_strat != null) {
             var e = parseInt($(this).text()),
                 dls = $(this).parents('.ct_table_body').find('dl');
@@ -274,22 +250,22 @@ var gb_schedule_table = (function() {
                     $(dls[j]).addClass('drag-active');
             }
         }
-    }).on('click', seq_nos, function() {
+    }).on('click', seq_nos, function () {
         reset_relevance_active(this);
     });
     //非seq_no 单元格点击
-    $(document).on('click', '.line-schedule-table .ct_table_body dl dd[class!=seq_no][class!=lpName]', function() {
+    $(document).on('click', '.line-schedule-table .ct_table_body dl dd[class!=seq_no][class!=lpName]', function () {
         reset_drag_active_all(this);
         //选中相关班次
         var id = $(this).parent().data('id'),
             contWrap = $(this).parents('li.line_schedule'),
             lineCode = contWrap.data('id'),
             sch = line2Schedule[lineCode][id],
-            schArr = gb_common.get_vals(line2Schedule[lineCode]).filter(function(item) {
+            schArr = gb_common.get_vals(line2Schedule[lineCode]).filter(function (item) {
                 return item.clZbh == sch.clZbh;
             }).sort(schedule_sort),
             nextSch, tempDL;
-        $.each(schArr, function(i) {
+        $.each(schArr, function (i) {
             tempDL = $('dl[data-id=' + this.id + ']', contWrap);
             tempDL.addClass('relevance-active');
             if (i < schArr.length - 1 && this.id == id) {
@@ -308,17 +284,17 @@ var gb_schedule_table = (function() {
     });
     //路牌点击
-    $(document).on('click', '.line-schedule-table .ct_table_body dl dd[class=lpName]', function() {
+    $(document).on('click', '.line-schedule-table .ct_table_body dl dd[class=lpName]', function () {
         reset_drag_active_all(this);
         //选中路牌下相关班次
         var id = $(this).parent().data('id'),
             contWrap = $(this).parents('li.line_schedule'),
             lineCode = contWrap.data('id'),
             sch = line2Schedule[lineCode][id],
-            schArr = gb_common.get_vals(line2Schedule[lineCode]).filter(function(item) {
+            schArr = gb_common.get_vals(line2Schedule[lineCode]).filter(function (item) {
                 return item.lpName == sch.lpName;
             }).sort(schedule_sort);
-        $.each(schArr, function(i) {
+        $.each(schArr, function (i) {
             $('dl[data-id=' + this.id + ']', contWrap).addClass('relevance-active intimity');
         });
@@ -326,13 +302,13 @@ var gb_schedule_table = (function() {
     });
     //头部点击去掉选中光标
-    $(document).on('click', '.header-title', function() {
+    $(document).on('click', '.header-title', function () {
         // $(this).parents('.schedule-wrap').find('.relevance-active')
         //     .removeClass('relevance-active');
         reset_drag_active_all(this);
     });
-    var scroToDl = function(sch) {
+    var scroToDl = function (sch) {
         var dl = $('dl[data-id=' + sch.id + ']', $('.line_schedule[data-id=' + sch.xlBm + ']')),
             cont = dl.parents('.ct_table_wrap'),
             diff = cont.height() / 2;
@@ -341,43 +317,43 @@ var gb_schedule_table = (function() {
         }, 500);
         return dl;
-    }
+    };
-    var reset_drag_active_all = function(dd) {
+    var reset_drag_active_all = function (dd) {
         $(dd).parents('.schedule-wrap').find('dl.drag-active').removeClass('drag-active');
         reset_relevance_active(dd);
-    }
+    };
-    var reset_relevance_active = function(dd) {
+    var reset_relevance_active = function (dd) {
         $(dd).parents('.uk-grid.schedule-wrap').find('.relevance-active').removeClass('relevance-active intimity');
-    }
+    };
     //计算应发未发数量 car_yfwf_map
-    var calc_yfwf_num = function(lineCode) {
+    var calc_yfwf_num = function (lineCode) {
         var schArr = gb_common.get_vals(line2Schedule[lineCode]).sort(schedule_sort),
             yfwf_num = 0,
             t = new Date().valueOf();
-        var carYfwfMap={}, nbbm;
-        $.each(schArr, function() {
+        var carYfwfMap = {}, nbbm;
+        $.each(schArr, function () {
             if (this.fcsjT > t)
                 return false;
-            if (this.fcsjActual == null && this.fcsjActualTime == null && this.status != -1){
-              yfwf_num++;
-              nbbm=this.clZbh;
-              if(carYfwfMap[nbbm])
-                carYfwfMap[nbbm]++;
-              else
-                carYfwfMap[nbbm]=1;
+            if (this.fcsjActual == null && this.fcsjActualTime == null && this.status != -1) {
+                yfwf_num++;
+                nbbm = this.clZbh;
+                if (carYfwfMap[nbbm])
+                    carYfwfMap[nbbm]++;
+                else
+                    carYfwfMap[nbbm] = 1;
             }
         });
-        car_yfwf_map[lineCode]=carYfwfMap;
+        car_yfwf_map[lineCode] = carYfwfMap;
         $('#badge_yfwf_num_' + lineCode).text(yfwf_num);
-    }
+    };
     return {
         show: show,
@@ -387,7 +363,9 @@ var gb_schedule_table = (function() {
         insertSchedule: insertSchedule,
         schedule_sort: schedule_sort,
         calc_yfwf_num: calc_yfwf_num,
-        car_yfwf_map: function(lineCode){return car_yfwf_map[lineCode];},
+        car_yfwf_map: function (lineCode) {
+            return car_yfwf_map[lineCode];
+        },
         scroToDl: scroToDl,
         reset_drag_active_all: reset_drag_active_all
     };
@@ -123,6 +123,7 @@
     <script src="/real_control_v2/js/home/line_panel.js"></script>
     <script src="/real_control_v2/js/home/context_menu.js"></script>
     <!-- line schedule js -->
+    <script src="/real_control_v2/js/line_schedule/legend.js"></script>
     <script src="/real_control_v2/js/line_schedule/layout.js"></script>
     <script src="/real_control_v2/js/line_schedule/sch_table.js"></script>
     <script src="/real_control_v2/js/line_schedule/context_menu.js"></script>