线调v2 bug修复 11.1

潘钊
1 parent ae6c249c
Showing 8 changed files with 46 additions and 13 deletions
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/sub_task/add_sub_task_other.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/north/toolbar.js
@@ -118,7 +118,7 @@
     <script>
         (function() {
             var modal = '#schedule-addsch-modal',
-                sch, stationRoutes, parks;
+                sch, stationRoutes, parks, information;
             $(modal).on('init', function(e, data) {
                 sch = data.sch;
                 var formHtml = template('schedule-addsch-form-temp', sch);
@@ -146,6 +146,8 @@
                 $.get('/basic/parks', function(rs){
                   parks=rs;
                 });
+                //线路标准
+                information=gb_data_basic.getLineInformation(sch.xlBm);
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -194,12 +196,12 @@
                   var qdz=$('[name=qdzCode]', f),zdz=$('[name=zdzCode]', f);
                   switch (bcType_e.val()) {
                     case 'out':
-                      qdz.html(park_opts);
+                      qdz.html(park_opts).val(information.carPark);
                       zdz.html(opts);
                       break;
                     case 'in':
                       qdz.html(opts);
-                      zdz.html(park_opts);
+                      zdz.html(park_opts).val(information.carPark);
                       break;
                     default:
                       qdz.html(opts);
@@ -124,7 +124,7 @@
     <script>
         (function() {
             var modal = '#add-sub-task-other-modal',
-                sch, stationRoutes, parks;
+                sch, stationRoutes, parks, information;
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
             $(modal).on('init', function(e, data) {
                 sch = data.sch;
@@ -153,6 +153,8 @@
                 $.get('/basic/parks', function(rs){
                   parks=rs;
                 });
+                //线路标准
+                information=gb_data_basic.getLineInformation(sch.xlBm);
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -185,12 +187,12 @@
                   var qdz=$('[name=startStation]', f),zdz=$('[name=endStation]', f);
                   switch ($(this).val()) {
                     case '3'://出场
-                      qdz.html(park_opts);
+                      qdz.html(park_opts).val(information.carPark);
                       zdz.html(opts);
                       break;
                     case '2'://进场
                       qdz.html(opts);
-                      zdz.html(park_opts);
+                      zdz.html(park_opts).val(information.carPark);
                       break;
                     default:
                       qdz.html(opts);
 <div>
   <script id="line-schedule-table-temp" type="text/html">
   <div class="schedule-wrap {{if dir==0}}up{{else}}down{{/if}}">
-      <h3 class="header-title">上行/江月路地铁站</h3>
+      <h3 class="header-title">
+        {{if dir==0}}
+          上行/{{line.startStationName}}
+        {{else}}
+          下行/{{line.endStationName}}
+        {{/if}}
+      </h3>
       <div class="schedule-body">
           <div class="ct_table_wrap">
               <div class="ct_table line-schedule-table">
@@ -3,7 +3,7 @@
     <div class="uk-margin" id="north_toolbar_panel">
         <nav class="uk-navbar">
             <a class="uk-navbar-brand" >
-                <span><i class="uk-icon-user"></i> admin3，在线</span><i class="uk-icon-ellipsis-v"></i>
+                <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">
               {{each list as obj i}}
@@ -2,10 +2,11 @@
 var gb_data_basic = (function() {
-    var stationRoutes,lineCode2NameAll;
-    var ep = EventProxy.create("stationRoutes", "lineCode2Name", function(routes, code2Name) {
+    var stationRoutes,lineCode2NameAll,lineInformations;
+    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", function(routes, code2Name, informations) {
         stationRoutes = routes;
         lineCode2NameAll = code2Name;
+        lineInformations = informations;
         gb_main_ep.emitLater('data-basic');
     });
@@ -30,6 +31,16 @@ var gb_data_basic = (function() {
         ep.emit('stationRoutes', gb_common.groupBy(list, 'lineCode'));
     });
+    //线路标准信息
+    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function(rs){
+        var informations={};
+          $.each(rs, function(){
+            informations[this.line.lineCode] = this;
+            delete this['line'];
+          });
+          ep.emit('lineInformations', informations);
+    });
+
     //line code to name
     $.get('/basic/lineCode2Name', function(rs){
       ep.emit('lineCode2Name', rs);
@@ -52,6 +63,9 @@ var gb_data_basic = (function() {
       return null;
     }
+    var getLineInformation=function(lineCode){
+      return lineInformations[lineCode];
+    }
     //文件载入完毕
     res_load_ep.emitLater('load_data_basic');
@@ -59,6 +73,7 @@ var gb_data_basic = (function() {
         activeLines: activeLines,
         line_idx: line_idx,
         codeToLine: codeToLine,
+        getLineInformation: getLineInformation,
         stationRoutes: function(lineCode){return stationRoutes[lineCode]},
         findLineByCodes: findLineByCodes,
         lineCode2NameAll: function(){return lineCode2NameAll},
@@ -47,6 +47,7 @@ var gb_schedule_table = (function() {
                 for (var upDown in dirData) {
                     htmlStr = temps['line-schedule-table-temp']({
                         dir: upDown,
+                        line: gb_data_basic.codeToLine[lineCode],
                         list: dirData[upDown]
                     });
@@ -22,7 +22,7 @@ var gb_main_ep = new EventProxy(),
             gb_home_line_panel.init(g_emit('gps-time-refresh'));
         });
-        //start fixed time refresh
+        //start fixed time refresh gps
         eq.once('gps-time-refresh', function() {
             gb_data_gps.fixedTimeRefresh();
             g_emit('line-schedule-layout')();
@@ -3,6 +3,7 @@
 var gb_northToolbar = (function() {
   var modal_opts={center: true,bgclose: false};
+  var currentUser;
   $.get('/real_control_v2/fragments/north/toolbar.html', function(temp){
     ep.emit("template", temp);
@@ -12,9 +13,15 @@ var gb_northToolbar = (function() {
     ep.emit("data", data);
   });
-  var ep = EventProxy.create("template", "data", function (temp, data) {
+  //当前用户信息
+  $.get('/user/currentUser', function(user){
+    ep.emit("user", user);
+  });
+
+  var ep = EventProxy.create("template", "data", "user" , function (temp, data, user) {
+    currentUser=user;
     var t = $('#north-toolbar-temp', temp).html()
-        ,htmlStr = template.render(t)({list: data});
+        ,htmlStr = template.render(t)({list: data, user: currentUser});
     $('.north .north-toolbar').html(htmlStr);
     //exit