update...

潘钊
1 parent 5ee29854
Showing 8 changed files with 30 additions and 13 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
@@ -499,7 +499,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //公司 和 分公司名称
             t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
-            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getGsBm() + "_" + t.getFgsBm()));
+            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
             t.setScheduleDateStr(schDate);
             t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
@@ -243,7 +243,7 @@
 }
 span.fcsj-diff {
-    color: gray;
+    /*color: gray;*/
     margin-left: 3px;
 }
@@ -252,7 +252,7 @@ span.fcsj-diff {
 .tl-yzx {
     background: rgb( 192,192,255);
-    border-top: 1px solid #ebebeb !important;
+    border-top: 1px solid #d9d9d9 !important;
     color: #444;
 }
@@ -268,13 +268,13 @@ span.fcsj-diff {
 .tl-xxsd{
     background: rgb(205,133,63);
-    color: #f5f4f4;
+    /*color: #f5f4f4;*/
 }
 .tl-xxrd{
     background: rgb(255,99,71);
     border-top: 1px solid #ebebeb !important;
-    color: #fff;
+    /*color: #fff;*/
 }
 .tl-qrlb {
@@ -290,6 +290,7 @@ span.fcsj-diff {
 .tl-zzzx {
     background: rgb(173,255,47);
     color: #444;
+    border-top: 1px solid #d9d9d9 !important;
 }
 .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 {
@@ -30,7 +30,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                        <select class="form-control nt-dictionary" required name="bcType" data-code="{{bcType}}"
                                 data-group=ScheduleType></select>
                     </div>
                 </div>
@@ -156,7 +156,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                        <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
                                 data-group=ScheduleType></select>
                     </div>
                 </div>
@@ -274,7 +274,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                        <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
                                 data-group=ScheduleType></select>
                     </div>
                 </div>
@@ -289,8 +289,12 @@
             //新增临加
             var add_temp_sch = function () {
                 var sch = getActiveSch();
-                if (!sch)
-                    sch = {xlBm: $('[name=lineSelect]', f).val(), lpName: $('[name=lpName]', f).val()};
+                if (!sch){
+                    var xlBm = $('[name=lineSelect]', f).val();
+                    var xlName = $('[name=lineSelect]', f).find("option:selected").text();
+                    var lpName = $('[name=lpName]', f).val();
+                    sch = {xlBm: xlBm,xlName: xlName, lpName: lpName};
+                }
                 open_modal(folder + '/add_temp_sch.html', {
                     sch: sch
@@ -2,7 +2,7 @@
   <script id="north-toolbar-temp" type="text/html">
     <div class="uk-margin" id="north_toolbar_panel">
         <nav class="uk-navbar">
-            <a class="uk-navbar-brand" >
+            <a class="uk-navbar-brand" id="navbar_user_detail_link">
                 <span><i class="uk-icon-user"></i> <span id="north_toolbar_user">{{user.userName}}</span></span><i class="uk-icon-ellipsis-v"></i>
             </a>
             <ul class="uk-navbar-nav">
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-04-28 下午',
-        text: '<h5>修复在特定情况下出现线调界面班次显示不全，比路单少的情况。</h5><h5>尝试修复在特定情况下车辆走向不跟随班次执行结束而跳动的问题。</h5>'
+        date: '2017-05-03',
+        text: '<h5>修复了在临加/子任务里临加路牌后再临加班次出现的异常情况。</h5>'
     };
     var storage = window.localStorage
@@ -45,6 +45,11 @@ var gb_northToolbar = (function () {
             gb_sch_websocket.sock().close();
             window.location.href = '/pages/control/lineallot/allot.html';
         });
+
+        //点击用户名
+        $('#navbar_user_detail_link').on('click', function () {
+            //alert('1111');
+        });
     });
     $(document).on('click', '#north_toolbar_panel li.event a', function () {
@@ -269,6 +269,13 @@
         (function () {
             var modal = '#map-playback2-modal', gpsArray;
+            //modal hide remove dom
+            $(modal).on('hide.uk.modal', function () {
+                $('.map-wrap-tools .play_btn', modal).removeClass('play');
+                playObj.pause();
+                searchForm.hideShade();
+            });
+
             $(modal).on('init', function (e, data) {
                 //初始化地图
                 mapObj.initMap();