潘钊 / bsth_control · Commits

Commit 37d10c0cdd19a10a328ee2f84aaff405e3b567df

Authored by 潘钊
1 parent 4ad64ba2

update...

Inline Side-by-side
Showing 2 changed files with 62 additions and 4 deletions
src/main/resources/static/real_control_v2/css/main.css
  View file @37d10c0
... ... @@ -1572,4 +1572,12 @@ ul.left_tabs_lg li{
1572 1572 .ct_describe:before{
1573 1573 content: "\f059";
1574 1574 margin-right: 3px;
  1575 +}
  1576 +
  1577 +#add-sub-task-main-modal abbr{
  1578 + display: inline-block;
  1579 + font-size: 12px;
  1580 + margin-left: 25px;
  1581 + vertical-align: bottom;
  1582 + color: #929292;
1575 1583 }
1576 1584 \ No newline at end of file
... ...
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
  View file @37d10c0
... ... @@ -33,6 +33,8 @@
33 33 <div class="station_to_park_link">
34 34 <a>站 <i class="uk-icon-exchange"></i> 场</a>
35 35 </div>
  36 +
  37 + <abbr title="系统基础信息录入的停车场，必须绘制闭合多边形地理位置，才会纳入选项">缺少停车场选项？</abbr>
36 38 </div>
37 39 </div>
38 40  
... ... @@ -57,7 +59,7 @@
57 59 <div class="uk-form-row">
58 60 <label class="uk-form-label">起点 </label>
59 61 <div class="uk-form-controls">
60   - <select name="startStation" required></select>
  62 + <select name="startStation" ></select>
61 63 </div>
62 64 </div>
63 65 </div>
... ... @@ -65,7 +67,7 @@
65 67 <div class="uk-form-row">
66 68 <label class="uk-form-label">终点</label>
67 69 <div class="uk-form-controls">
68   - <select name="endStation" required></select>
  70 + <select name="endStation" ></select>
69 71 </div>
70 72 </div>
71 73 </div>
... ... @@ -220,6 +222,8 @@
220 222 parks = gb_data_basic.simpleParksArray();
221 223 //线路标准
222 224 information = gb_data_basic.getLineInformation(sch.xlBm);
  225 + //停车场排序，常用的放前面
  226 + parks = sort_parks(parks, information, st_park_data);
223 227  
224 228 var st_doms = gb_schedule_context_menu.get_st_doms();
225 229 //普通
... ... @@ -305,8 +309,10 @@
305 309 opts += '<option value="' + this.stationCode + '">' + this.stationName + '</option>'
306 310 });
307 311 //park options
308   - for (var code in parks)
309   - park_opts += '<option value="' + code + '">' + parks[code] + '</option>';
  312 + for(var i=0,p;p=parks[i++];)
  313 + park_opts += '<option value="' + p.code + '">' + p.name + '</option>';
  314 + /*for (var code in parks)
  315 + park_opts += '<option value="' + code + '">' + parks[code] + '</option>';*/
310 316  
311 317 var qdz = $f('startStation', f), zdz = $f('endStation', f), mType = $f('mileageType', f);
312 318 var domainsTemp;
... ... @@ -605,6 +611,50 @@
605 611 sch: sch
606 612 }, {center: false, bgclose: false, modal: false});
607 613 });
  614 +
  615 + /**
  616 + * 停车场排序
  617 + * @param parks 停车场 code 2 name
  618 + * @param information 线路标准
  619 + * @param st_park_data 站到场
  620 + */
  621 + function sort_parks(parks, information, st_park_data) {
  622 + var array = [], names=[];
  623 + for(var code in parks){
  624 + array.push({code: code, name: parks[code]});
  625 + }
  626 +
  627 + if(st_park_data && st_park_data.length > 0){
  628 + $.each(st_park_data, function () {
  629 + names.push(this.parkName);
  630 + });
  631 + }
  632 +
  633 + //debugger
  634 + array.sort(function (a, b) {
  635 + if(a.code==information.carPark)
  636 + return -1;
  637 + if(b.code==information.carPark)
  638 + return 1;
  639 +
  640 + var ai = names.indexOf(a.name),
  641 + bi = names.indexOf(b.name);
  642 +
  643 + if(ai!=-1 && bi==-1)
  644 + return -1;
  645 + else if(ai==-1 && bi!=-1)
  646 + return 1;
  647 + else
  648 + return a.name.localeCompare(b.name);
  649 + });
  650 +
  651 + /*var rs = {};
  652 + $.each(array, function () {
  653 + rs[this.code]=this.name;
  654 + });*/
  655 +
  656 + return array;
  657 + }
608 658 })();
609 659 </script>
610 660 </div>
611 661 \ No newline at end of file
... ...