update

潘钊
1 parent af3890cb
Showing 10 changed files with 183 additions and 29 deletions
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/resources/static/real_control_v2/css/ct_table.css
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/legend.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/main.js
@@ -163,7 +163,7 @@ public class ScheduleRealInfo {
 	private String qdzArrDatesj;
 	/** 子任务 */
-	@OneToMany(fetch = FetchType.LAZY/*, cascade = CascadeType.ALL*/)
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
 	private Set<ChildTaskPlan> cTasks = new HashSet<>();
 	/** 关联的公司名称 */
@@ -121,4 +121,5 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 GROUP BY xlBm ORDER BY xlBm")
 	List<ScheduleRealInfo> setDDRBGroup(String date);
+
 }
 package com.bsth.service.realcontrol.impl;
-import java.util.Map;
-
-import javax.transaction.Transactional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.bsth.data.BasicData;
 import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ChildTaskPlanRepository;
+import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.Map;
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
 	/*@Autowired
 	ScheduleRealInfoServiceImpl scheduleRealInfoService;*/
+
+	@Autowired
+	ScheduleRealInfoRepository scheduleRealInfoRepository;
 	@Autowired
 	ChildTaskPlanRepository childTaskPlanRepository;
@@ -30,6 +33,9 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 	@Autowired
 	Arrival2Schedule arrival2Schedule;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	@Transactional
 	@Override
@@ -62,10 +68,13 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 		//解除和主任务关联
 		ScheduleRealInfo sch = dayOfSchedule.get(cPlan.getSchedule().getId());
 		sch.getcTasks().remove(cPlan);
+		//删除关联表数据
+		jdbcTemplate.execute("delete from bsth_c_s_sp_info_real_c_tasks where bsth_c_s_sp_info_real="+sch.getId()+" and c_tasks="+cPlan.getId());
+
 		//删除子任务
 		rs = super.delete(id);
 		dayOfSchedule.save(sch);
-		
+
 		rs.put("t", sch);
 		return rs;
 	}
@@ -18,6 +18,7 @@
     background: #f5f5f5;
     width: 100%;
     line-height: 30px;
+    z-index: 3;
 }
 .ct_table>.ct_table_head dl {
@@ -943,4 +943,73 @@ input.i-cbox[type=checkbox]{
 .fixed_legend .tl-qrlb::before{
     font-size: 12px;
+}
+
+.schedule-body .ct_table dl.dl-last-sch{
+    height: 55px;
+}
+
+.schedule-body .ct_table dl.dl-last-sch dd{
+    line-height: 55px;
+}
+
+.schedule-body .ct_table dl.dl-last-sch dd.fcsjActualCell{
+    line-height: 28px;
+}
+
+dd.fcsjActualCell div.last-sch-sunken{
+    height: 25px;
+    line-height: 25px;
+    margin: 0;
+    background: #fff;
+    /*border-top: 1px solid #eeeeee;*/
+}
+
+dd.fcsjActualCell div.last-sch-sunken span._badge{
+    font-size: 12px;
+    border-radius: 0 7px 7px 0;
+    padding-left: 0;
+    width: 29px;
+    display: inline-block;
+    height: 18px;
+    line-height: 18px;
+    box-shadow: 2px 0px 2px 0 rgba(0,0,0,0.16), 2px 0px 4px 0 rgba(0,0,0,0.12);
+    vertical-align: top;
+    margin-right: 3px;
+    margin-top: 3px;
+    margin-left: -7px;
+    text-indent: 2px;
+    border-left: 0;
+    transform: scale(.9);
+    color: grey;
+}
+
+.relevance-active dd.fcsjActualCell div.last-sch-sunken{
+    background: #f1efef;
+}
+
+.intimity.relevance-active dd.fcsjActualCell div.last-sch-sunken{
+    background: #76a6c7 !important;
+    border-top: 1px solid #f7f8f8 !important;
+    color: #f8f8f8;
+}
+
+.intimity.relevance-active dd.fcsjActualCell div.last-sch-sunken span._badge{
+    background: #76a6c7 ;
+    color: #ffffff ;
+}
+
+.drag-active  dd.fcsjActualCell div.last-sch-sunken{
+    background: #cef9e3 !important;
+    border-top: 1px solid #d9e6e0 !important;
+}
+
+.drag-active  dd.fcsjActualCell div.last-sch-sunken span._badge{
+    color: #6e6969;
+    background: #cef9e3;
+}
+
+.ct_table>.ct_table_body dl.dl-last-sch:hover div.last-sch-sunken,
+.ct_table>.ct_table_body dl.dl-last-sch.context-menu-active div.last-sch-sunken{
+    background: #f5fbff;
 }
 \ No newline at end of file
@@ -322,7 +322,8 @@
                         name: "添加子任务",
                         items: {
                             'add_sub_task_in': {
-                                name: '回场'
+                                name: '回场',
+                                disabled: true
                             },
                             'add_sub_task_out': {
                                 name: '出场',
@@ -7,10 +7,9 @@
                 {{else}}
                 下行/{{line.endStationName}}
                 {{/if}}
-                <i class="uk-icon-question-circle" ></i>
+                <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>
@@ -54,7 +53,7 @@
                         </div>
                         <div class="ct_table_body">
                             {{each list as sch i}}
-                            <dl data-id="{{sch.id}}" >
+                            <dl data-id="{{sch.id}}">
                                 <dd class="seq_no">{{i + 1}}</dd>
                                 <dd class="lpName"><a>{{sch.lpName}}</a></dd>
                                 <dd data-nbbm="{{sch.clZbh}}"
@@ -81,7 +80,9 @@
                                     <span class="uk-badge uk-badge-notification">{{sch.cTasks.length}}</span>
                                     {{/if}}
                                 </dd>
-                                <dd data-sort-val={{sch.dfsjT}} dbclick dbclick-type="dfsj" dbclick-val="{{sch.dfsj}}">{{sch.dfsj}}</dd>
+                                <dd data-sort-val={{sch.dfsjT}} dbclick dbclick-type="dfsj" dbclick-val="{{sch.dfsj}}">
+                                    {{sch.dfsj}}
+                                </dd>
                                 <dd class="
                                     {{if sch.status==-1}}
                                       tl-qrlb
@@ -91,11 +92,12 @@
                                       tl-zzzx
                                     {{else if sch.status == 0 && sch.late}}
                                         tl-wd
-                                    {{/if}} fcsjActualCell" >
+                                    {{/if}} fcsjActualCell">
                                     {{sch.fcsjActual}}<span class="fcsj-diff">{{sch.fcsj_diff}}</span>
                                 </dd>
                                 <dd data-uk-observe>
-                                    <span title="{{sch.remarks}}" data-uk-tooltip="{pos:'top-left'}" >{{sch.remarks}}</span>
+                                    <span title="{{sch.remarks}}"
+                                          data-uk-tooltip="{pos:'top-left'}">{{sch.remarks}}</span>
                                 </dd>
                             </dl>
                             {{/each}}
@@ -128,7 +130,7 @@
     </script>
     <script id="line-schedule-sfsj-temp" type="text/html">
-    <dd class="
+        <dd class="
     {{if status==-1}}
       tl-qrlb
     {{else if status==2}}
@@ -138,8 +140,8 @@
     {{else if status == 0 && late}}
         tl-wd
     {{/if}} fcsjActualCell">
-        {{fcsjActual}}<span class="fcsj-diff">{{fcsj_diff}}</span>
-    </dd>
+            {{fcsjActual}}<span class="fcsj-diff">{{fcsj_diff}}</span>
+        </dd>
     </script>
     <script id="line-schedule-nbbm-temp" type="text/html">
@@ -162,4 +164,10 @@
             <li><span>终点站：</span>{{zdzName}}</li>
         </ul>
     </script>
+
+    <script id="last-sch-sunken-temp" type="text/html">
+        <div class="last-sch-sunken">
+            <span class="_badge">终点</span>{{zdsj}}/{{zdsjActual}}
+        </div>
+    </script>
 </div>
@@ -2,14 +2,16 @@
 var gb_sch_legend = (function () {
+    var locaKey = 'sch_legend_flag';
+    var storage = window.localStorage;
     var animationend = 'webkitAnimationEnd animationend';
-    var initLegend = function () {
+    var initLegend = function (cont) {
         //双击展开
-        $('.schedule-wrap i.uk-icon-question-circle').dblclick(openLegend);
+        $('.schedule-wrap i.uk-icon-question-circle', cont).dblclick(openLegend);
         //关闭事件
-        $('.schedule-wrap .fixed_legend_close').on('click', function () {
+        $('.schedule-wrap .fixed_legend_close', cont).on('click', function () {
             //隐藏 fixed_legend
             $('.schedule-wrap .fixed_legend').each(function () {
                 var anim = 'uk-animation-slide-top uk-animation-reverse';
@@ -26,7 +28,14 @@ var gb_sch_legend = (function () {
                     $(this).hide().parents('.header-title').find('.uk-icon-question-circle').show();
                 }
             });
+
+            //记录状态
+            storage.setItem(locaKey, 0);
         });
+
+        var flag=storage.getItem(locaKey);
+        if(flag && flag==1)
+            openLegend();
     };
@@ -47,6 +56,9 @@ var gb_sch_legend = (function () {
             }
         });
         $('.schedule-wrap .fixed_legend').css('display', 'inline-block');
+
+        //记录状态
+        storage.setItem(locaKey, 1);
     };
     return {
@@ -56,6 +56,11 @@ var gb_schedule_table = (function () {
                     $('.schedule-wrap .card-panel:eq(' + upDown + ')', this).html(htmlStr);
                 }
+
+                //标记车辆最后一个班次
+                markerLastByLine(lineCode);
+                //初始化图例相关，dbclick 不能代理事件
+                gb_sch_legend.init(this);
             });
             var content = $('.line_schedule .ct_table_wrap');
             //fixed table head
@@ -67,9 +72,6 @@ var gb_schedule_table = (function () {
             //点击实发，show detail
             fcsjActualCellQtip();
             cb && cb();
-
-            //图例相关
-            gb_sch_legend.init();
         });
     };
@@ -159,6 +161,11 @@ var gb_schedule_table = (function () {
             });
             $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
         }
+        //图例相关
+        gb_sch_legend.init(tabCont);
+        //标记末班
+        markerLastByLine(sch.xlBm);
+        //计算应发未发
         calc_yfwf_num(sch.xlBm);
         //重新固定表头
         gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));
@@ -217,6 +224,10 @@ 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('');
+
+        //班次是车辆的最后一班
+        if(dl.hasClass('dl-last-sch'))
+            markerLastSch([sch]);
     };
     //拖拽选中...
@@ -265,12 +276,14 @@ var gb_schedule_table = (function () {
                 return item.clZbh == sch.clZbh;
             }).sort(schedule_sort),
             nextSch, tempDL;
+
+        getDl(sch).addClass('intimity');
         $.each(schArr, function (i) {
             tempDL = $('dl[data-id=' + this.id + ']', contWrap);
             tempDL.addClass('relevance-active');
             if (i < schArr.length - 1 && this.id == id) {
                 nextSch = schArr[i + 1];
-                tempDL.addClass('intimity');
+                //tempDL.addClass('intimity');
             }
         });
@@ -309,7 +322,7 @@ var gb_schedule_table = (function () {
     });
     var scroToDl = function (sch) {
-        var dl = $('dl[data-id=' + sch.id + ']', $('.line_schedule[data-id=' + sch.xlBm + ']')),
+        var dl = getDl(sch),
             cont = dl.parents('.ct_table_wrap'),
             diff = cont.height() / 2;
         cont.animate({
@@ -319,6 +332,10 @@ var gb_schedule_table = (function () {
         return dl;
     };
+    var getDl = function (sch) {
+        return $('dl[data-id=' + sch.id + ']', $('.line_schedule[data-id=' + sch.xlBm + ']'));
+    };
+
     var reset_drag_active_all = function (dd) {
         $(dd).parents('.schedule-wrap').find('dl.drag-active').removeClass('drag-active');
         reset_relevance_active(dd);
@@ -355,6 +372,42 @@ var gb_schedule_table = (function () {
         $('#badge_yfwf_num_' + lineCode).text(yfwf_num);
     };
+    //标记终点时间 -线路
+    var markerLastByLine = function (lineCode) {
+        var data = gb_common.groupBy(gb_common.get_vals(line2Schedule[lineCode]).filter(schDestroyFilter), 'clZbh');
+
+        var array, lastSch, dl;
+        for (var nbbm in data) {
+            array = data[nbbm].sort(schedule_sort);
+            markerLastSch(array);
+        }
+    };
+
+    //标记终点时间 -车辆
+    var markerLastByNbbm = function (lineCode, nbbm) {
+        var array = gb_common.get_vals(line2Schedule[lineCode]).filter(function (a) {
+            return a.clZbh == nbbm && a.status != -1;
+        }).sort(schedule_sort);
+
+        markerLastSch(array);
+    };
+
+    var markerLastSch = function (array) {
+        var lastSch = array[array.length - 1];
+
+        if (!lastSch.jhlc)
+            return;
+
+        var dl = getDl(lastSch);
+        dl.addClass('dl-last-sch');
+
+        $('dd.fcsjActualCell', dl).append(temps['last-sch-sunken-temp'](lastSch));
+    }
+
+    var schDestroyFilter = function (a) {
+        return a.status != -1;
+    }
+
     return {
         show: show,
         findScheduleByLine: findScheduleByLine,
@@ -196,8 +196,8 @@ var open_modal = function(pageUrl, data, opt) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription={
-        date: '2016-12-11',
-        text: '<h5>1、电子路单单击“实发”时，tootip内的人员显示工号。</h5><h5>2、修复某些情况下，班次被操作后 点击“实发” 无法显示tootip的情况。</h5><h5>3、获取GPS数据失败时，页面会弹出提示，并等待7秒后尝试再次获取。</h5>'
+        date: '2016-12-15',
+        text: '<h5>1、双击电子路单title右侧 ? 号图标，可将图例固定在上发。</h5><h5>2、每辆车最后一个班次，实发栏会显示计划和实际终点时间。</h5><h5>3、修复了子任务添加1分钟后再删除，弹出完整性约束校验失败 的问题。</h5>'
     };
     var storage = window.localStorage