Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

徐烜
2 parents 1a8939af 98ed5abf
Showing 3 changed files with 85 additions and 11 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/station_route_spacing_chart.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -369,4 +369,32 @@ li.map-panel{
 .ct-bottom-drawer-body{
     width: 100%;
     height: 100%;
+}
+
+#station_route_spacing_chart_drawer .svg_wrap{
+    width: 80%;height: 100%;display: inline-block;font-size: 14px;overflow: hidden;
+    position: relative;
+}
+
+#station_route_spacing_chart_drawer .drawer_right_map{
+    width: 20%;height: 100%;display: inline-block;
+}
+
+#station_route_spacing_chart_drawer .svg_cont_body{
+    height:100%;
+    position: absolute;
+    top:0;
+    left: 0;
+}
+
+#station_route_spacing_chart_drawer svg{
+    width: 100%;
+    height: 100%;
+}
+
+#station_route_spacing_chart_drawer svg g._item rect{
+    stroke: rgb(62, 80, 179);
+    fill: rgb(62, 80, 179);
+    width: 30px;
+    height: 140px;
 }
 \ No newline at end of file
 <!-- 站点路由间距图 -->
 <div id="station_route_spacing_chart_drawer" style="width: 100%;height: 100%;font-size: 0;">
-    <div style="width: 80%;height: 100%;display: inline-block;font-size: 14px;" class="svg_wrap">
+    <div class="svg_wrap"></div>
-    </div>
-
-    <div style="width: 20%;height: 100%;display: inline-block;">
+    <div class="drawer_right_map" >
     </div>
@@ -12,10 +10,10 @@
         (function () {
             var drawer = '#station_route_spacing_chart_drawer'
-                    , sch, locData;
+                    , sch, locData, stationArr;
+            //var xScale;
             $(drawer).on('drawer-init', function (e, data) {
-                //console.log('data', data);
                 sch = data.sch;
                 locData = window.localStorage.getItem('control_route_distance_' + sch.xlBm);
@@ -26,19 +24,42 @@
             });
             function drawCharts() {
-                //console.log('开始绘图', locData);
-                var stations;
                 try {
-                    stations = JSON.parse(locData).stations[sch.xlDir == 0 ? 'up' : 'down'];
+                    stationArr = JSON.parse(locData).stations[sch.xlDir == 0 ? 'up' : 'down'];
                 }catch (e){
                     alert('数据异常！！');
                     return;
                 }
-                console.log('stations..', stations);
-                //$('.svg_wrap', drawer).
+                var width = 1500;
+                var svgCont = $('<div style="width: '+width+'px;" class="svg_cont_body"></div>');
+                var svg = d3.select(svgCont[0]).append('svg');
+
+                //初始化 X 比例尺
+                var sum=0;
+                $.each(stationArr, function () {
+                   sum += this.toDistance;
+                });
+
+                console.log('stations', stationArr);
+                var items = svg.selectAll('g._item').data(stationArr)
+                        .enter()
+                        .append('g')
+                        .classed({_item: true});
+
+                //rect
+                items.append('rect').attr('x', xScale).attr('y', 40);
+                $('.svg_wrap', drawer).append(svgCont);
             }
+            var xScale = function (d, i) {
+                var sum=0;
+                for(var j = 0; j <= i; j++){
+                    sum+=stationArr[j].toDistance;
+                }
+                return sum / 5;
+            };
+
             //页面切换
             function drawerLoadPage(url, id) {
                 $(drawer).parent('.ct-bottom-drawer-body').load(url, function () {
@@ -191,10 +191,20 @@ var gb_schedule_table = (function () {
         if (!isArray(schArr))
             schArr = [schArr];
+        var tMaps={};
         $.each(schArr, function () {
             line2Schedule[this.xlBm][this.id] = this;
             updateDom(this);
+            //线路_车辆 过滤重复数据
+            tMaps[this.xlBm+'_'+this.clZbh]=1;
         });
+
+        //重新标记末班
+        var ts=[];
+        for(var k in tMaps){
+            ts = k.split('_');
+            markerLastByNbbm(ts[0], ts[1]);
+        }
     };
     //update dom
@@ -389,6 +399,7 @@ var gb_schedule_table = (function () {
             return a.clZbh == nbbm && a.status != -1;
         }).sort(schedule_sort);
+        removeMarkers(lineCode, array);
         markerLastSch(array);
     };
@@ -404,6 +415,20 @@ var gb_schedule_table = (function () {
         $('dd.fcsjActualCell', dl).append(temps['last-sch-sunken-temp'](lastSch));
     }
+    //清除线路下指定班次的 末班标记
+    var removeMarkers = function (lineCode, array) {
+        var idx=[];
+        $.each(array, function () {
+            idx.push(this.id);
+        });
+
+        $('dl.dl-last-sch','li.line_schedule[data-id=' + lineCode + ']').each(function () {
+            if($(this).hasClass('dl-last-sch') && idx.indexOf($(this).data('id'))){
+                $(this).removeClass('dl-last-sch').find('.last-sch-sunken').remove();
+            }
+        });
+    }
+
     var schDestroyFilter = function (a) {
         return a.status != -1;
     }