update

潘钊
1 parent 80ca42b5
Showing 4 changed files with 63 additions and 72 deletions
src/main/resources/static/real_control_v2/fragments/geo/calc_station_space.html
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/context_menu/sub_task/add_sub_task_other.html
src/main/resources/static/real_control_v2/fragments/north/tabs.html
@@ -81,6 +81,7 @@
                 };
                 window.localStorage.setItem('control_route_distance_'+sch.xlBm, JSON.stringify(locData));
+                //console.log('结果', locData);
             }
             function sectionArrSort(s1, s2) {
@@ -322,8 +322,7 @@
                         name: "添加子任务",
                         items: {
                             'add_sub_task_in': {
-                                name: '回场',
-                                disabled: true
+                                name: '回场'
                             },
                             'add_sub_task_out': {
                                 name: '出场',
@@ -15,10 +15,11 @@
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
                         <select class="form-control" name="type1" style="width: 65px;">
-                          <option>正常</option>
-                          <option>临加</option>
+                            <option>正常</option>
+                            <option>临加</option>
                         </select>
-                        <select class="form-control nt-dictionary" name="type2" data-group=ChildTaskType style="width: 126px;;"></select>
+                        <select class="form-control nt-dictionary" name="type2" data-group=ChildTaskType
+                                style="width: 126px;;"></select>
                     </div>
                 </div>
             </div>
@@ -47,7 +48,8 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">里程类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" required name="mileageType" data-group="MileageType" ></select>
+                        <select class="form-control nt-dictionary" required name="mileageType"
+                                data-group="MileageType"></select>
                     </div>
                 </div>
             </div>
@@ -74,7 +76,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">结束时间</label>
                     <div class="uk-form-controls">
-                        <input name="endDate"  value="{{sch.zdsj}}" type="time" required>
+                        <input name="endDate" value="{{sch.zdsj}}" type="time" required>
                     </div>
                 </div>
             </div>
@@ -95,12 +97,12 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">烂班原因</label>
                     <div class="uk-form-controls">
-                      <select class="form-control" name="destroyReason" >
-                        <option value="">请选择...</option>
-                        {{each adjustExps as exp i}}
-                          <option value="{{exp}}">{{exp}}</option>
-                        {{/each}}
-                      </select>
+                        <select class="form-control" name="destroyReason">
+                            <option value="">请选择...</option>
+                            {{each adjustExps as exp i}}
+                            <option value="{{exp}}">{{exp}}</option>
+                            {{/each}}
+                        </select>
                     </div>
                 </div>
             </div>
@@ -110,7 +112,8 @@
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符"></textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true"
+                                  data-fv-stringlength-max="50" placeholder="备注，不超过50个字符"></textarea>
                     </div>
                 </div>
             </div>
@@ -122,48 +125,36 @@
     </script>
     <script>
-        (function() {
+        (function () {
             var modal = '#add-sub-task-other-modal',
-                sch, stationRoutes, parks, information;
+                    sch, stationRoutes, parks, information;
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
-            $(modal).on('init', function(e, data) {
+            $(modal).on('init', function (e, data) {
                 sch = data.sch;
-                var formHtml = template('sub-task-other-form-temp', {sch:sch, adjustExps: adjustExps});
+                var formHtml = template('sub-task-other-form-temp', {sch: sch, adjustExps: adjustExps});
                 $('form', modal).html(formHtml);
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', modal));
-                //----------- Autocomplete --------------
-                // $.get('/basic/cars', function(rs) {
-                //     //车辆
-                //     gb_common.carAutocomplete($('.car-autocom', modal), rs);
-                // });
-                // $.get('/basic/all_personnel', function(rs) {
-                //     //驾驶员
-                //     gb_common.personAutocomplete($('.jsy-autocom', modal), rs);
-                //     //售票员
-                //     gb_common.personAutocomplete($('.spy-autocom', modal), rs);
-                // });
-
                 //站点路由
-                stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function(a, b){
-                  return a.stationRouteCode-b.stationRouteCode;
+                stationRoutes = gb_common.groupBy(gb_data_basic.stationRoutes(sch.xlBm).sort(function (a, b) {
+                    return a.stationRouteCode - b.stationRouteCode;
                 }), 'directions');
                 //停车场
-                $.get('/basic/parks', function(rs){
-                  parks=rs;
+                $.get('/basic/parks', function (rs) {
+                    parks = rs;
                 });
                 //线路标准
-                information=gb_data_basic.getLineInformation(sch.xlBm);
+                information = gb_data_basic.getLineInformation(sch.xlBm);
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
-                f.on('success.form.fv', function(e) {
+                f.on('success.form.fv', function (e) {
                     disabled_submit_btn(this);
                     e.preventDefault();
                     var data = $(this).serializeJSON();
-                    gb_common.$post('/childTask', data, function(rs){
+                    gb_common.$post('/childTask', data, function (rs) {
                         notify_succ('子任务添加成功');
                         gb_schedule_table.updateSchedule(rs.t);
                         $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: rs.t});
@@ -172,49 +163,49 @@
                 });
                 //班次类型
-                $('[name=type2]', f).on('change', function(){
-                  var routes=stationRoutes[sch.xlDir]
-                    ,lastCode=routes[routes.length-1].stationCode
-                    ,opts='',park_opts='';
-                  //station options
-                  $.each(routes, function(){
-                    opts+='<option value="'+this.stationCode+'">'+this.stationName+'</option>'
-                  });
-                  //park options
-                  for(var code in parks)
-                    park_opts+='<option value="'+code+'">'+parks[code]+'</option>';
+                $('[name=type2]', f).on('change', function () {
+                    var routes = stationRoutes[sch.xlDir]
+                            , lastCode = routes[routes.length - 1].stationCode
+                            , opts = '', park_opts = '';
+                    //station options
+                    $.each(routes, function () {
+                        opts += '<option value="' + this.stationCode + '">' + this.stationName + '</option>'
+                    });
+                    //park options
+                    for (var code in parks)
+                        park_opts += '<option value="' + code + '">' + parks[code] + '</option>';
-                  var qdz=$('[name=startStation]', f),zdz=$('[name=endStation]', f);
-                  switch ($(this).val()) {
-                    case '3'://出场
-                      qdz.html(park_opts).val(information.carPark);
-                      zdz.html(opts);
-                      break;
-                    case '2'://进场
-                      qdz.html(opts);
-                      zdz.html(park_opts).val(information.carPark);
-                      break;
-                    default:
-                      qdz.html(opts);
-                      zdz.html(opts).val(lastCode);
-                  }
+                    var qdz = $('[name=startStation]', f), zdz = $('[name=endStation]', f);
+                    switch ($(this).val()) {
+                        case '3'://出场
+                            qdz.html(park_opts).val(information.carPark);
+                            zdz.html(opts);
+                            break;
+                        case '2'://进场
+                            qdz.html(opts);
+                            zdz.html(park_opts).val(information.carPark);
+                            break;
+                        default:
+                            qdz.html(opts);
+                            zdz.html(opts).val(lastCode);
+                    }
                 });
                 //是否烂班
-                $('[name=destroy]', f).on('click', function(){
+                $('[name=destroy]', f).on('click', function () {
                     console.log(this, this.checked);
-                    if(this.checked){
-                      $('.destroy_reason_wrap', modal).show();
+                    if (this.checked) {
+                        $('.destroy_reason_wrap', modal).show();
                     }
                     else {
-                      $('.destroy_reason_wrap', modal).hide();
+                        $('.destroy_reason_wrap', modal).hide();
                     }
                 });
-                $('[name=destroyReason]', f).on('change', function(){
-                  var rem=$('[name=remarks]', f);
-                  rem.val(rem.val() + $(this).val() + '，');
-        				});
+                $('[name=destroyReason]', f).on('change', function () {
+                    var rem = $('[name=remarks]', f);
+                    rem.val(rem.val() + $(this).val() + '，');
+                });
             });
         })();
     </script>
 <div>
   <script id="north-tabs-temp" type="text/html">
-    <ul class="uk-tab" data-uk-tab="{connect:'#main-tab-content'}">
+    <ul class="uk-tab" data-uk-switcher="{connect:'#main-tab-content', swiping: false}" >
         <li class="uk-active" ><a>主页</a></li>
         <li id="north_tabs_map_btn"><a>地图</a></li>
         {{each list as line i}}
@@ -10,7 +10,7 @@
   </script>
   <script id="north-tab-content-temp" type="text/html">
-    <ul id="main-tab-content" class="uk-switcher uk-margin ">
+    <ul id="main-tab-content" class="uk-switcher uk-margin " >
         <li class="uk-active home-panel">主页</li>
         <li class="map-panel">地图未渲染</li>
         {{each list as line i}}