Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 8e4c24d5 b4022868
Showing 12 changed files with 236 additions and 27 deletions
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/badge_tooltip.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_custom.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_in_out.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_normal.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_turn.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
src/main/resources/static/real_control_v2/js/line_schedule/badge_tooltip.js
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/layout.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/left.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/right.html
@@ -1141,6 +1141,10 @@ dl.intimity span.late-badge{
     color: red;
 }
  
+.tip_task_list dl.service.temp_add{
+    color: #9C27B0;
+}
+
 .tip_task_list dl span{
     margin: 0;
     width: auto;
@@ -1719,4 +1723,17 @@ dl.active&gt;dd.disabled{
  
 .ct_eye_icon.active{
     color: #444;
+}
+
+#tempScheduleContent .forms::-webkit-scrollbar {
+    width: 19px;
+    height: 16px;
+}
+
+.range_2_normal_tt{
+    margin-bottom: 15px;
+    border-top: 1px dashed #c7c7c7;
+    color: #a6a6a6;
+    text-indent: 7px;
+    padding-bottom: 5px;
 }
 \ No newline at end of file
@@ -10,7 +10,7 @@
                     <dt>备注</dt>
                 </dl>
                 {{each tasks as t i}}
-                <dl class="{{t.mileageType}} {{if t.destroy}}destroy{{/if}}">
+                <dl class="{{t.mileageType}} {{if t.destroy}}destroy{{/if}} {{if t.type1=='临加'}}temp_add{{/if}}">
                     <dd>
                         {{if t.mileageType=="service"}}
                             营运
@@ -23,6 +23,8 @@
                             <span>(进场)</span>
                         {{else if t.type2==3}}
                             <span>(出场)</span>
+                        {{else if t.type1=='临加'}}
+                            <span>(临加)</span>
                         {{/if}}
                     </dd>
                     <dd>
@@ -130,6 +130,14 @@
             function $f(name, f) {
                 return $('[name=' + name + ']', f);
             }
+
+            /**
+             * 备注级联
+             */
+            $(wrap).on('input', '[name=remarks]', function () {
+                var nfs = $(this).parents('.sub_task_form_v2').nextAll('.sub_task_form_v2');
+                $('[name=remarks]', nfs).val($(this).val());
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -85,7 +85,7 @@
              */
             function repeat_main(f) {
                 f.addClass('repeat_main');
-                $f('type2', f).html('<option value="1">线路上站点间</option>');
+                $f('type2', f).html('<option value="1">线路上站点间</option>').attr('disabled', 'disabled');
                 $f('mileage', f).val(sch.jhlc).trigger('input');
                 $f('mileageType', f).val('service').attr('disabled', 'disabled');
                 //主任务是烂班
@@ -105,7 +105,7 @@
             }
  
             function repeat_In(f) {
-                $f('type2', f).html('<option value="2">进场</option>').trigger('change');
+                $f('type2', f).html('<option value="2">进场</option>').trigger('change').attr('disabled', 'disabled');;
                 if (sch.status != -1)
                     $f('startStation', f).val(sch.zdzCode);//主任务终点进场
  
@@ -116,7 +116,7 @@
             }
  
             function repeat_Out(f) {
-                $f('type2', f).html('<option value="3">出场</option>').trigger('change');
+                $f('type2', f).html('<option value="3">出场</option>').trigger('change').attr('disabled', 'disabled');;
  
                 var code;
                 if (sch.status != -1)
@@ -180,7 +180,7 @@
                 //烂班
                 $f('destroy',half_form)[0].checked=true;
                 $f('mileageType',half_form).attr('disabled','disabled');
-                $f('type2',half_form).html('<option value="1">线路上站点间</option>');
+                $f('type2',half_form).html('<option value="1">线路上站点间</option>').attr('disabled', 'disabled');;
                 $('.destroy_reason_wrap',half_form).show();
                 half_form.attr('destroy', true);
  
@@ -326,6 +326,14 @@
                 });
                 return flag;
             }
+
+            /**
+             * 备注级联
+             */
+            $(wrap).on('input', '[name=remarks]', function () {
+                var nfs = $(this).parents('.sub_task_form_v2').nextAll('.sub_task_form_v2');
+                $('[name=remarks]', nfs).val($(this).val());
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
 <!-- 区间变全程 -->
 <div class="add_range_2_normal">
-    <div class="err_panel">暂不开放使用</div>
-    <!--<div class="forms"></div>
+    <div class="forms"></div>
  
     <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
@@ -10,38 +9,152 @@
     <script>
         (function () {
             var wrap = '#add-sub-task-main-modal .add_range_2_normal',
-                    sch,f1,tf1;
+                    sch,nextSch,f1,tf1,f2,tf2;
  
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
                 sch = data.sch;
+                nextSch = gb_schedule_table.getNextSch(sch);
  
+                if(sch.bcType!='region'){
+                    $(wrap).html('<div class="err_panel">该模板只能应用区间班次！</div>');
+                    return;
+                }
                 f1 = addTaskForm();
-                tf1 = addTaskForm();
-                tf1.addClass('temp_service');
+                tf1 = addTaskForm().addClass('temp_service');
+                changeField(f1, tf1);
+
+                //返程也是区间
+                if(nextSch.bcType=='region'){
+                    var u_d_input = '<input name="upDown" type="hidden" value="'+nextSch.xlDir+'">';
+                    tf1.after('<div class="range_2_normal_tt">返程</div>');
+                    tf2 = addTaskForm(u_d_input).addClass('temp_service');
+                    f2 = addTaskForm(u_d_input);
+
+                    changeField(f2, tf2);
+                }
+
+                //设置默认值
+                setDefaultVal();
             });
  
-            function addTaskForm() {
+            function addTaskForm(upDownInput) {
                 var htmlStr = template('sub-task-v2-form-temp', {sch: sch});
                 var f = $(htmlStr);
                 $('.forms', wrap).append(f);
+
+                if(upDownInput)
+                    f.append(upDownInput);
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', f));
  
                 //班次类型切换
                 $('select[name=type2]', f).trigger('change');
  
-                //滚动条到底
-                $('.forms', wrap).scrollTop($('.forms', wrap)[0].scrollHeight);
-
                 f.formValidation({
                     framework: 'uikit',
                     locale: 'zh_CN'
                 }).on('add_reason_field', function () {
                     $(this).formValidation('addField', 'reason');
                 });
+
+                $f('type2', f).attr('disabled', 'disabled');
                 return f;
             }
+
+            function $f(name, f) {
+                return $('[name=' + name + ']', f);
+            }
+            
+            function changeField(f, tf) {
+                $f('type1', tf).val('临加');
+                $f('mileageType', tf).html('<option value="service">临加</option>');
+                $f('destroy', f).parents('.uk-form-controls').hide();
+                $f('destroy', tf).parents('.uk-form-controls').hide();
+            }
+
+            /**
+             * 设置默认值
+             */
+            function setDefaultVal() {
+                $f('startStation', f1).attr('disabled', 'disabled');
+                $f('endStation', f1).val(sch.zdzCode).trigger('change').attr('disabled', 'disabled');
+                $f('startStation', tf1).val(sch.zdzCode).trigger('change');
+
+                //tf1 startDate
+                $f('startDate', tf1).val($f('endDate', f1).val()).trigger('input');
+                if(tf2){
+                    $('[sch_id_inp]', tf2).val(nextSch.id);
+                    $f('endStation', tf2).val(nextSch.qdzCode).trigger('change');
+                }
+                if(f2){
+                    $('[sch_id_inp]', f2).val(nextSch.id);
+                    $f('endStation', f2).val(nextSch.zdzCode).attr('disabled', 'disabled');
+                    $f('startStation', f2).val(nextSch.qdzCode).trigger('change').attr('disabled', 'disabled');
+                    $f('mileage', f2).val(nextSch.jhlc);
+                    $f('startDate', f2).val($f('endDate', tf2).val()).trigger('change');
+                }
+            }
+
+            /**
+             * 备注级联
+             */
+            $(wrap).on('input', '[name=remarks]', function () {
+                var nfs = $(this).parents('.sub_task_form_v2').nextAll('.sub_task_form_v2');
+                $('[name=remarks]', nfs).val($(this).val());
+            });
+
+
+            //提交
+            $('button[type=submit]', wrap).on('click', function () {
+                $(this).addClass('disabled').attr('disabled','disabled');
+                dataArray = [];
+                $('form.sub_task_form_v2', wrap).data('valid', false)
+                        .formValidation('validate');
+            });
+
+            var dataArray = [];
+            $(wrap).on('success.form.fv', 'form.sub_task_form_v2', function (e) {
+                e.preventDefault();
+
+                dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)));
+                $(this).data('valid', true);
+
+                if (allValidSuccess()) {
+                    var i = 0;
+                    (function () {
+                        var f = arguments.callee;
+                        if (i >= dataArray.length) {
+                            UIkit.modal('#add-sub-task-main-modal').hide();
+                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+                            return;
+                        }
+                        var data = dataArray[i];
+                        gb_common.$post('/childTask', data, function (rs) {
+                            notify_succ('子任务添加成功');
+                            gb_schedule_table.updateSchedule(rs.t);
+                            i++;
+                            f();
+                        });
+                    })();
+                }
+            });
+            //校验不过
+            $(wrap).on('err.field.fv','form.sub_task_form_v2', function () {
+                $('button[type=submit]', wrap).removeClass('disabled').removeAttr('disabled');
+            });
+
+            function allValidSuccess() {
+                var flag = true;
+                $('form.sub_task_form_v2', wrap).each(function (i, f) {
+                    if(!$(f).data('valid')){
+                        flag = false;
+                        return false;
+                    }
+                });
+                return flag;
+            }
+
         })();
-    </script>-->
+    </script>
 </div>
 \ No newline at end of file
@@ -305,6 +305,14 @@
                         return routes[i].stationCode;
                 }
             }
+
+            /**
+             * 备注级联
+             */
+            $(wrap).on('input', '[name=remarks]', function () {
+                var nfs = $(this).parents('.sub_task_form_v2').nextAll('.sub_task_form_v2');
+                $('[name=remarks]', nfs).val($(this).val());
+            });
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -248,7 +248,7 @@
                     $('.add_range_wrap', modal).trigger('init', data);
                     //区间变全程
                     $('.rangeToNormal', modal).html(st_doms.range_2_normal_dom);
-                    //$('.add_range_2_normal', modal).trigger('init', data);
+                    $('.add_range_2_normal', modal).trigger('init', data);
                 }
             });
  
@@ -46,10 +46,21 @@ var gb_schedule_badge_tootip = (function () {
                 text: function() {
                     var sch = getSch(this);
                     //子任务排序
+                    $.each(sch.cTasks, function () {
+                        if(this.mileageType=='service'){
+                            if(this.type1=='正常')
+                                this.order_no=0;
+                            else
+                                this.order_no=1;
+
+                            if(this.destroy)
+                                this.order_no=2;
+                        }
+                        else
+                            this.order_no=this.type2 + 1;
+                    });
                     var array = sch.cTasks.sort(function (a, b) {
-                        var an = (a.mileageType=='service'?1:0)+''+(a.destroy?0:1);
-                        var bn = (b.mileageType=='service'?1:0)+''+(b.destroy?0:1);
-                        return parseInt(bn) - parseInt(an);
+                        return a.order_no - b.order_no;
                     });
                     return temps['sch-table-task-tootip-temp']({tasks: array});
                 }
@@ -1265,7 +1265,7 @@ span.flatpickr-weekday{
 }
  
 .gps-play-back-panel-v3 .trail-info-table{
-    width: 470px;
+    width: 520px;
 }
  
 .gps-play-back-panel-v3 .ct_table>.ct_table_body{
@@ -1283,17 +1283,20 @@ span.flatpickr-weekday{
 }
  
 .gps-play-back-panel-v3 .trail-info-table dl dt:nth-of-type(1), .gps-play-back-panel-v3 .trail-info-table  dl dd:nth-of-type(1) {
-    width: 20%;
+    width: 16%;
     text-indent: 15px;
 }
 .gps-play-back-panel-v3 .trail-info-table dl dt:nth-of-type(2), .gps-play-back-panel-v3 .trail-info-table  dl dd:nth-of-type(2) {
-    width: 16%;
+    width: 12%;
 }
 .gps-play-back-panel-v3 .trail-info-table dl dt:nth-of-type(3), .gps-play-back-panel-v3 .trail-info-table  dl dd:nth-of-type(3) {
-    width: 13%;
+    width: 10%;
 }
 .gps-play-back-panel-v3 .trail-info-table dl dt:nth-of-type(4), .gps-play-back-panel-v3 .trail-info-table  dl dd:nth-of-type(4) {
-    width: 50%;
+    width: 40%;
+}
+.gps-play-back-panel-v3 .trail-info-table dl dt:nth-of-type(5), .gps-play-back-panel-v3 .trail-info-table  dl dd:nth-of-type(5) {
+    width: 21%;
     border-right: 0;
 }
  
@@ -53,6 +53,7 @@
                 {{/if}}
             </dd>
             <dd>{{obj.section_name}}</dd>
+            <dd>{{obj.lineName}}</dd>
         </dl>
         {{/each}}
         {{if array.length==0}}
@@ -75,6 +75,7 @@
                                 <dt>速度</dt>
                                 <dt>上下行</dt>
                                 <dt>所在路段</dt>
+                                <dt>车载线路</dt>
                             </dl>
                         </div>
                         <div class="ct_table_body"></div>
@@ -204,6 +205,11 @@
                     show_load_btn(this);
                     //查询数据
                     get_server_trail_data(data, function (rs) {
+                        //线路名称
+                        var code2Name = gb_data_basic.lineCode2NameAll();
+                        $.each(rs.list, function () {
+                            this.lineName = code2Name[this.lineId];
+                        });
                         //排序
                         rs.list.sort(function (a, b) {
                             return parseInt((a.ts - b.ts) + '' + (a.stop_no - b.stop_no));
@@ -77,6 +77,7 @@
         var step;
         var timeTip = $('.ui-slider-tip', rightWrap);
         var scale = $('.scale', progress);
+        var play_before_flag;
  
         $('.play-back-tools-wrap', rightWrap).on('ready-to-play', function (e, data) {
             e.stopPropagation();
@@ -94,6 +95,12 @@
             $('.top-btn-list', rightWrap).removeClass('disabled').find('[disabled]').removeAttr('disabled');
             //xlPolyline.lineId=gpsArray[0].lineId;
             //xlPolyline.upDown=gpsArray[0].upDown;
+
+            /**
+             * 默认显示完整的地图轨迹
+            */
+            play_before_goto(gpsArray.length - 1);
+            play_before_flag=true;
         });
  
  
@@ -176,6 +183,11 @@
                 return;
  
             if(!$(this).hasClass('pause')){
+                //第一次点击播放，清除一下
+                if(play_before_flag){
+                    reset();
+                    play_before_flag = false;
+                }
                 $(this).addClass('pause');
                 if(index>=gpsArray.length-1){
                     goto(0);
@@ -441,9 +453,9 @@
                 trailPolyline.setPath(trailArray);
             }
  
-            //最多记录1000个点位轨迹线条
-            if(trailArray.length > 1000)
-                trailArray = trailArray.slice(trailArray.length - 1000);
+            //最多记录4000个点位轨迹线条
+            if(trailArray.length > 4000)
+                trailArray = trailArray.slice(trailArray.length - 4000);
         }
  
         var trailTbody = leftWrap + ' .trail-info-table .ct_table_body',
@@ -610,6 +622,26 @@
             }
         }
  
+        function play_before_goto(ei) {
+            if (ei < 0 || ei >= gpsArray.length)
+                return;
+
+            var gps = gpsArray[ei];
+            //更新gps marker
+            drawCarMarker(gps);
+            //更新轨迹线条
+            trailArray = [];
+            var i = 0;
+            if(ei > 1000)
+                i = ei - 1000;
+            for (; i < ei; i++)
+                trailArray.push(new BMap.Point(gpsArray[i].bd_lon, gpsArray[i].bd_lat));
+            updateTrailLine(gpsArray[ei], ei);
+
+            //居中
+            map.panTo(gpsMarker.getPosition());
+        }
+
         /**
          * 初始化停车场下拉菜单
          */