Commit c1e6e780e81c2ff0b0193f161b91f07583f6ab4a
1 parent
1d7c777b
update
Showing
3 changed files
with
15 additions
and
18 deletions
src/main/java/com/bsth/data/forecast/ForecastRealServer.java
| 1 | package com.bsth.data.forecast; | 1 | package com.bsth.data.forecast; |
| 2 | 2 | ||
| 3 | -import java.text.DecimalFormat; | ||
| 4 | -import java.util.ArrayList; | ||
| 5 | -import java.util.HashMap; | ||
| 6 | -import java.util.List; | ||
| 7 | -import java.util.Map; | ||
| 8 | -import java.util.concurrent.TimeUnit; | ||
| 9 | - | ||
| 10 | -import org.slf4j.Logger; | ||
| 11 | -import org.slf4j.LoggerFactory; | ||
| 12 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 13 | -import org.springframework.boot.CommandLineRunner; | ||
| 14 | -import org.springframework.stereotype.Component; | ||
| 15 | - | ||
| 16 | -import com.bsth.Application; | ||
| 17 | import com.bsth.data.forecast.entity.ForecastResult; | 3 | import com.bsth.data.forecast.entity.ForecastResult; |
| 18 | import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem; | 4 | import com.bsth.data.forecast.entity.ForecastResult.ForecastResultItem; |
| 19 | import com.bsth.data.forecast.entity.SimpleRoute; | 5 | import com.bsth.data.forecast.entity.SimpleRoute; |
| @@ -23,6 +9,17 @@ import com.bsth.data.gpsdata.GpsRealData; | @@ -23,6 +9,17 @@ import com.bsth.data.gpsdata.GpsRealData; | ||
| 23 | import com.bsth.data.schedule.DayOfSchedule; | 9 | import com.bsth.data.schedule.DayOfSchedule; |
| 24 | import com.bsth.entity.realcontrol.ScheduleRealInfo; | 10 | import com.bsth.entity.realcontrol.ScheduleRealInfo; |
| 25 | import com.google.common.collect.ArrayListMultimap; | 11 | import com.google.common.collect.ArrayListMultimap; |
| 12 | +import org.slf4j.Logger; | ||
| 13 | +import org.slf4j.LoggerFactory; | ||
| 14 | +import org.springframework.beans.factory.annotation.Autowired; | ||
| 15 | +import org.springframework.boot.CommandLineRunner; | ||
| 16 | +import org.springframework.stereotype.Component; | ||
| 17 | + | ||
| 18 | +import java.text.DecimalFormat; | ||
| 19 | +import java.util.ArrayList; | ||
| 20 | +import java.util.HashMap; | ||
| 21 | +import java.util.List; | ||
| 22 | +import java.util.Map; | ||
| 26 | 23 | ||
| 27 | /** | 24 | /** |
| 28 | * | 25 | * |
| @@ -61,7 +58,7 @@ public class ForecastRealServer implements CommandLineRunner { | @@ -61,7 +58,7 @@ public class ForecastRealServer implements CommandLineRunner { | ||
| 61 | @Override | 58 | @Override |
| 62 | public void run(String... arg0) throws Exception { | 59 | public void run(String... arg0) throws Exception { |
| 63 | //2小时更新一次站点间耗时数据 | 60 | //2小时更新一次站点间耗时数据 |
| 64 | -// Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS); | 61 | + //Application.mainServices.scheduleWithFixedDelay(dataLoader, 12, 120 * 60, TimeUnit.SECONDS); |
| 65 | } | 62 | } |
| 66 | 63 | ||
| 67 | /** | 64 | /** |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
| @@ -322,8 +322,7 @@ | @@ -322,8 +322,7 @@ | ||
| 322 | name: "添加子任务", | 322 | name: "添加子任务", |
| 323 | items: { | 323 | items: { |
| 324 | 'add_sub_task_in': { | 324 | 'add_sub_task_in': { |
| 325 | - name: '回场', | ||
| 326 | - disabled: true | 325 | + name: '回场' |
| 327 | }, | 326 | }, |
| 328 | 'add_sub_task_out': { | 327 | 'add_sub_task_out': { |
| 329 | name: '出场', | 328 | name: '出场', |
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/station_route_spacing_chart.html
| 1 | <!-- 站点路由间距图 --> | 1 | <!-- 站点路由间距图 --> |
| 2 | <div id="station_route_spacing_chart_drawer" style="width: 100%;height: 100%;font-size: 0;"> | 2 | <div id="station_route_spacing_chart_drawer" style="width: 100%;height: 100%;font-size: 0;"> |
| 3 | - <div style="width: 80%;height: 100%;display: inline-block;font-size: 14px;"> | 3 | + <div style="width: 80%;height: 100%;display: inline-block;font-size: 14px;" class="svg_wrap"> |
| 4 | 4 | ||
| 5 | </div> | 5 | </div> |
| 6 | 6 | ||
| @@ -36,6 +36,7 @@ | @@ -36,6 +36,7 @@ | ||
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | console.log('stations..', stations); | 38 | console.log('stations..', stations); |
| 39 | + //$('.svg_wrap', drawer). | ||
| 39 | } | 40 | } |
| 40 | 41 | ||
| 41 | //页面切换 | 42 | //页面切换 |