潘钊 / bsth_control · Commits

Commit a107ec2dc391fb08a845d5c1e42f7d375968b60e

Authored by 潘钊
1 parent c8d5078d

update

Inline Side-by-side
Showing 3 changed files with 6 additions and 7 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
  View file @a107ec2
1 1 package com.bsth.data.arrival;
2 2  
3   -import com.bsth.data.match.Arrival2Schedule;
4 3 import com.bsth.data.schedule.DayOfSchedule;
5 4 import com.google.common.collect.ArrayListMultimap;
6 5 import com.google.common.collect.ListMultimap;
... ... @@ -59,7 +58,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
59 58  
60 59 @Override
61 60 public void run() {
62   - try{
  61 + /*try{
63 62 logger.info("开始加载到离站数据, " + System.currentTimeMillis());
64 63 List<ArrivalEntity> arrSets = dataLoader.load();
65 64 if(null == arrSets || arrSets.size() == 0)
... ... @@ -86,7 +85,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
86 85 Arrival2Schedule.start(carSet);
87 86 }catch(Exception e){
88 87 logger.error("", e);
89   - }
  88 + }*/
90 89 }
91 90 }
92 91  
... ...
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
  View file @a107ec2
... ... @@ -200,7 +200,7 @@ var gb_svg_chart = (function () {
200 200 var len = (d.nbbm == false ? 0 : d.nbbm.length)
201 201 , t = len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
202 202  
203   - if (d.nbbm.indexOf('-') > 1) {
  203 + if (d.nbbm.indexOf('-') > 0) {
204 204 t = d.nbbm.substr(d.nbbm.indexOf('-') - 1, 1) + t;
205 205 }
206 206 return t;
... ...
src/main/resources/static/real_control_v2/mapmonitor/js/map/iMap.js
  View file @a107ec2
... ... @@ -44,7 +44,7 @@ var gb_map_imap = (function () {
44 44 return mapProxy;
45 45 },
46 46 calcGpsMarkerWidth: function (nbbm) {
47   - var width = 0;
  47 + /* var width = 0;
48 48 $.each(nbbm.split(''), function () {
49 49 if (!isNaN(this))
50 50 width += 7;//icon_num_width[this];
... ... @@ -52,8 +52,8 @@ var gb_map_imap = (function () {
52 52 width += 10;
53 53 else
54 54 width += 16;
55   - });
56   - return width;
  55 + });*/
  56 + return nbbm.length * 9.8;
57 57 }
58 58 };
59 59  
... ...