update...

潘钊
1 parent 4ad64ba2
Showing 2 changed files with 62 additions and 4 deletions
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
@@ -1572,4 +1572,12 @@ ul.left_tabs_lg li{
 .ct_describe:before{
     content: "\f059";
     margin-right: 3px;
+}
+
+#add-sub-task-main-modal abbr{
+    display: inline-block;
+    font-size: 12px;
+    margin-left: 25px;
+    vertical-align: bottom;
+    color: #929292;
 }
 \ No newline at end of file
@@ -33,6 +33,8 @@
             <div class="station_to_park_link">
                 <a>站 <i class="uk-icon-exchange"></i> 场</a>
             </div>
+
+            <abbr title="系统基础信息录入的停车场，必须绘制闭合多边形地理位置，才会纳入选项">缺少停车场选项？</abbr>
         </div>
     </div>
@@ -57,7 +59,7 @@
                     <div class="uk-form-row">
                         <label class="uk-form-label">起点 </label>
                         <div class="uk-form-controls">
-                            <select name="startStation" required></select>
+                            <select name="startStation" ></select>
                         </div>
                     </div>
                 </div>
@@ -65,7 +67,7 @@
                     <div class="uk-form-row">
                         <label class="uk-form-label">终点</label>
                         <div class="uk-form-controls">
-                            <select name="endStation" required></select>
+                            <select name="endStation" ></select>
                         </div>
                     </div>
                 </div>
@@ -220,6 +222,8 @@
                 parks = gb_data_basic.simpleParksArray();
                 //线路标准
                 information = gb_data_basic.getLineInformation(sch.xlBm);
+                //停车场排序，常用的放前面
+                parks = sort_parks(parks, information, st_park_data);
                 var st_doms = gb_schedule_context_menu.get_st_doms();
                 //普通
@@ -305,8 +309,10 @@
                     opts += '<option value="' + this.stationCode + '">' + this.stationName + '</option>'
                 });
                 //park options
-                for (var code in parks)
-                    park_opts += '<option value="' + code + '">' + parks[code] + '</option>';
+                for(var i=0,p;p=parks[i++];)
+                    park_opts += '<option value="' + p.code + '">' + p.name + '</option>';
+                /*for (var code in parks)
+                    park_opts += '<option value="' + code + '">' + parks[code] + '</option>';*/
                 var qdz = $f('startStation', f), zdz = $f('endStation', f), mType = $f('mileageType', f);
                 var domainsTemp;
@@ -605,6 +611,50 @@
                     sch: sch
                 }, {center: false, bgclose: false, modal: false});
             });
+
+            /**
+             * 停车场排序
+             * @param parks 停车场 code 2 name
+             * @param information 线路标准
+             * @param st_park_data 站到场
+             */
+            function sort_parks(parks, information, st_park_data) {
+                var array = [], names=[];
+                for(var code in parks){
+                    array.push({code: code, name: parks[code]});
+                }
+
+                if(st_park_data && st_park_data.length > 0){
+                    $.each(st_park_data, function () {
+                        names.push(this.parkName);
+                    });
+                }
+
+                //debugger
+                array.sort(function (a, b) {
+                    if(a.code==information.carPark)
+                        return -1;
+                    if(b.code==information.carPark)
+                        return 1;
+
+                    var ai = names.indexOf(a.name),
+                            bi = names.indexOf(b.name);
+
+                    if(ai!=-1 && bi==-1)
+                        return -1;
+                    else if(ai==-1 && bi!=-1)
+                        return 1;
+                    else
+                        return a.name.localeCompare(b.name);
+                });
+
+                /*var rs = {};
+                $.each(array, function () {
+                    rs[this.code]=this.name;
+                });*/
+
+                return array;
+            }
         })();
     </script>
 </div>
 \ No newline at end of file