Commit 9d2ab2cc2280e481c74844389176ed13a24ebddf

Authored by 潘钊
1 parent ebdd69c4

update...

src/main/resources/static/real_control_v2/css/line_schedule.css
... ... @@ -97,7 +97,7 @@
97 97 }
98 98  
99 99 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
100   - width: calc(2% + 66px);
  100 + width: calc(3% + 66px);
101 101 position: relative;
102 102 }
103 103 .line-schedule-table dl dd:nth-of-type(3)>i{
... ... @@ -118,7 +118,7 @@
118 118 }
119 119  
120 120 .line-schedule-table dl dt:nth-of-type(6), .line-schedule-table dl dd:nth-of-type(6) {
121   - width: calc(13% + 18px);
  121 + width: calc(12% + 18px);
122 122 /*color: #676767;*/
123 123 }
124 124  
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
... ... @@ -321,7 +321,7 @@
321 321 for(var i=0,p;p=parks[i++];)
322 322 park_opts += '<option value="' + p.code + '">' + p.name + '</option>';
323 323 /*for (var code in parks)
324   - park_opts += '<option value="' + code + '">' + parks[code] + '</option>';*/
  324 + park_opts += '<option value="' + code + '">' + parks[code] + '</option>';*/
325 325  
326 326 var qdz = $f('startStation', f), zdz = $f('endStation', f), mType = $f('mileageType', f);
327 327 var domainsTemp;
... ... @@ -416,8 +416,10 @@
416 416 break;
417 417 default:
418 418 //线路上站点间
419   - mileage = calcMileageByRoutes(stationRoutes[upDown], qdzCode, zdzCode);
420   - time = gb_common.mul(gb_common.accDiv(sch.bcsj, sch.jhlcOrig), mileage);
  419 + //mileage = calcMileageByRoutes(stationRoutes[upDown], qdzCode, zdzCode);
  420 + //time = gb_common.mul(gb_common.accDiv(sch.bcsj, sch.jhlcOrig), mileage);
  421 + mileage = sch.jhlc;
  422 + time = sch.bcsj * 60 * 1000;
421 423 }
422 424 }
423 425  
... ... @@ -663,9 +665,9 @@
663 665 });
664 666  
665 667 /*var rs = {};
666   - $.each(array, function () {
667   - rs[this.code]=this.name;
668   - });*/
  668 + $.each(array, function () {
  669 + rs[this.code]=this.name;
  670 + });*/
669 671  
670 672 return array;
671 673 }
... ...
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
... ... @@ -443,7 +443,7 @@
443 443 });
444 444  
445 445 //统计油 -廖磊
446   - gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {
  446 + gb_common.$post('/ylb/updateHistoryJd', {date:rq, line: lineCode}, function () {
447 447 reCountEp.emitLater('ylbUpdate');
448 448 });
449 449  
... ...