update...

潘钊
1 parent d51a5bb7
Showing 5 changed files with 86 additions and 14 deletions
src/main/resources/static/pages/base/geo_data_edit/css/mian.css
src/main/resources/static/pages/base/geo_data_edit/js/map.js
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
src/main/resources/static/pages/base/geo_data_edit/main.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch/h_add_sub_task_other.html
@@ -772,4 +772,23 @@ div[id*=&#39;PanoramaFlashWraperTANGRAM&#39;]{
  
 .line_change_panel .uk-list>li{
     padding: 5px;
+}
+
+.instructions_tips{
+    position: absolute;
+    z-index: 9999;
+    background: #fffdf0;
+    width: 635px;
+    left: 590px;
+    top: 10px;
+    font-size: 14px;
+    padding: 15px 15px 0;
+    box-shadow: 5px 5px 15px rgba(90, 90, 90, 0.48);
+    color: #000000;
+    display: none;
+}
+
+.instructions_tips .uk-close{
+    position: absolute;
+    right: 20px;
 }
 \ No newline at end of file
@@ -37,7 +37,7 @@ var gb_ct_map = function () {
  
     map = new BMap.Map($(gb_map_consts.mapContainer)[0], {enableMapClick: false});
     //中心点和缩放级别
-    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 14);
+    map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 15);
     map.enableScrollWheelZoom();
  
     var stCtrl = new BMap.PanoramaControl(); //构造全景控件
@@ -3,6 +3,10 @@
  */
 var gb_data_submit = function () {
  
+    function confirmRejected() {
+        console.log('Rejected');
+    }
+
     /**
      * 缓冲区编辑提交
      */
@@ -38,7 +42,7 @@ var gb_data_submit = function () {
                 //退出编辑模式
                 gb_ct_map.exitEditBufferStatus(rs.station);
             });
-        });
+        }, confirmRejected);
         return false;
     });
  
@@ -57,7 +61,7 @@ var gb_data_submit = function () {
                 UIkit.notification("修改成功！", {status: 'success'});
                 gb_station_route.update(rs.station);
             });
-        });
+        },confirmRejected);
     });
  
     /**
@@ -86,7 +90,7 @@ var gb_data_submit = function () {
                 hide_run_text();
                 UIkit.notification("修改成功！", {status: 'success'});
             });
-        });
+        },confirmRejected);
         return false;
     });
  
@@ -122,7 +126,7 @@ var gb_data_submit = function () {
                 $('.add_road_search_point_wrap').remove();
                 gb_ct_map.exitEditRoadStatus(null, true);
             });
-        });
+        },confirmRejected);
         return false;
     });
  
@@ -141,7 +145,6 @@ var gb_data_submit = function () {
         }
         data.gsectionVector = gsectionVector.substr(0, gsectionVector.length - 1);
  
-        console.log('data', data);
         UIkit.modal.confirm('确定保存编辑的【'+data.sectionName+'】？').then(function() {
             show_run_text('正在保存...');
  
@@ -152,7 +155,7 @@ var gb_data_submit = function () {
  
                 gb_ct_map.exitEditRoadStatus(rs.road);
             });
-        });
+        },confirmRejected);
     });
  
     /**
@@ -172,7 +175,7 @@ var gb_data_submit = function () {
                 clearAll();
                 startup();
             });
-        });
+        },confirmRejected);
     });
  
     var show_run_text = function (t) {
@@ -201,7 +204,7 @@ var gb_data_submit = function () {
                 hide_run_text();
                 UIkit.notification("撤销成功！", {status: 'success'});
             });
-        });
+        },confirmRejected);
     }
  
     /**
@@ -221,7 +224,7 @@ var gb_data_submit = function () {
                 hide_run_text();
                 UIkit.notification("撤销成功！", {status: 'success'});
             });
-        });
+        },confirmRejected);
     };
  
     function getUpDown(){
@@ -20,6 +20,19 @@
     <div><span uk-spinner></span><span class="text">正在加载...</span></div>
 </div>
 <div class="ct_page" >
+    <div class="instructions_tips uk-animation-slide-top-medium">
+        <button type="button" uk-close></button>
+        <div>
+            <h4>说明</h4>
+            <ul class="uk-list">
+                <li>1、所有的改道、缩线、并线等对走向调整都必须新建版本，以保留原走向版本。</li>
+                <li>2、只有在人工数据录入错误的情况下，才有理由对当前启用的版本进行走向编辑。</li>
+                <li>3、走向版本可以任意切换，但是必须维护好一个准确的“版本切换记录”。</li>
+                <hr>
+                <li>4、调整缓冲区、修改站点名称、修改路段名称 不算走向调整，不需要新建版本。</li>
+            </ul>
+        </div>
+    </div>
     <div id="map_wrap"></div>
     <div class="main_left_panel_m_layer"></div>
     <div class="main_left_panel">
@@ -34,6 +47,8 @@
                     <ul class="uk-list"></ul>
                 </div>
  
+
+
                 <a uk-icon="icon: trash" class="remove_line_version_icon uk-animation-slide-right-small" title="删除线路版本" style="display: none" uk-tooltip></a>
                 <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路版本" uk-tooltip></a>
             </div>
@@ -79,7 +94,7 @@
     <div class="main_rt_tools_panel">
         <!--<a style="color: red;" uk-icon="icon: unlock;ratio: .9" class="_icon" title="当前版本有变更未启用" uk-tooltip="pos:bottom"></a>-->
  
-        <a uk-icon="icon: bookmark;ratio: .9" class="_icon" title="变更日志，日后再说" uk-tooltip="pos:bottom"></a>
+        <a uk-icon="icon: bookmark;ratio: .9" class="_icon" title="走向版本变更记录" uk-tooltip="pos:bottom"></a>
         <a uk-icon="icon: expand;ratio: .9" class="_icon full_screen_icon"></a>
     </div>
 </div>
@@ -165,14 +180,16 @@
     //文件加载
     var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route'
             , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () {
-                startup();
+                startup(function () {
+                    $('.instructions_tips').show();
+                });
  
                 gb_change_line.init();
             });
  
     var g_line_code;
     var g_version;
-    var startup = function () {
+    var startup = function (cb) {
         g_line_code = storage.getItem('geo_data_edit_line_code');
  
         gb_main_ep = new EventProxy();
@@ -195,6 +212,8 @@
  
             $loadPanel.hide();
             gb_ct_search.init();
+
+            cb && cb();
         });
     };
  
@@ -233,6 +252,16 @@
         e.stopPropagation();
         return false;
     });
+
+    $(document).on('click', 'button.cancel', function (e) {
+        e.stopPropagation();
+        return false;
+    });
+
+    //关闭说明
+    $('.instructions_tips .uk-close').on('click', function () {
+        $('.instructions_tips').remove();
+    });
 </script>
  
  
@@ -10,7 +10,7 @@
     <script id="sub-task-other-form-temp" type="text/html">
         <input type="hidden" value="{{sch.id}}" name="schedule.id">
         <div class="uk-grid">
-            <div class="uk-width-1-1">
+            <div class="uk-width-1-2">
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
@@ -23,6 +23,22 @@
                     </div>
                 </div>
             </div>
+
+            <div class="uk-width-1-2 inout_reason_wrap" style="display: none">
+                <div class="uk-form-row">
+                    <label class="uk-form-label">进出场原因</label>
+                    <div class="uk-form-controls">
+                        <select class="form-control" name="reason" required>
+                            <option value="">请选择..</option>
+                            <option>故障</option>
+                            <option>肇事</option>
+                            <option>纠纷</option>
+                            <option>其他</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+
         </div>
         <div class="uk-grid">
             <div class="uk-width-1-2">
@@ -167,6 +183,7 @@
  
                 //班次类型
                 $('[name=type2]', f).on('change', function () {
+                    $('.inout_reason_wrap').hide();
                     var routes = stationRoutes[sch.xlDir]
                             , lastCode = routes[routes.length - 1].stationCode
                             , opts = '', park_opts = '';
@@ -184,11 +201,15 @@
                             qdz.html(park_opts).val(information.carPark);
                             zdz.html(opts);
                             mType.val('empty');
+                                //进出场原因
+                            $('.inout_reason_wrap').show();
                             break;
                         case '2'://进场
                             qdz.html(opts);
                             zdz.html(park_opts).val(information.carPark);
                             mType.val('empty');
+                                //进出场原因
+                            $('.inout_reason_wrap').show();
                             break;
                         default:
                             qdz.html(opts);