update

潘钊
1 parent c8d5078d
Showing 3 changed files with 6 additions and 7 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/iMap.js
 package com.bsth.data.arrival;
-import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
@@ -59,7 +58,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 		@Override
 		public void run() {
-			try{
+			/*try{
 				logger.info("开始加载到离站数据, " + System.currentTimeMillis());
 				List<ArrivalEntity> arrSets = dataLoader.load();
 				if(null == arrSets || arrSets.size() == 0)
@@ -86,7 +85,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 				Arrival2Schedule.start(carSet);
 			}catch(Exception e){
 				logger.error("", e);
-			}
+			}*/
 		}
 	}
@@ -200,7 +200,7 @@ var gb_svg_chart = (function () {
             var len = (d.nbbm == false ? 0 : d.nbbm.length)
                 , t = len > 3 ? d.nbbm.substr(len - 3) : d.nbbm;
-            if (d.nbbm.indexOf('-') > 1) {
+            if (d.nbbm.indexOf('-') > 0) {
                 t = d.nbbm.substr(d.nbbm.indexOf('-') - 1, 1) + t;
             }
             return t;
@@ -44,7 +44,7 @@ var gb_map_imap = (function () {
             return mapProxy;
         },
         calcGpsMarkerWidth: function (nbbm) {
-            var width = 0;
+           /* var width = 0;
             $.each(nbbm.split(''), function () {
                 if (!isNaN(this))
                     width += 7;//icon_num_width[this];
@@ -52,8 +52,8 @@ var gb_map_imap = (function () {
                     width += 10;
                 else
                     width += 16;
-            });
-            return width;
+            });*/
+            return nbbm.length * 9.8;
         }
     };