update

潘钊
1 parent ea43f1bc
Showing 16 changed files with 292 additions and 188 deletions
src/main/java/com/bsth/controller/DeviceGpsController.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/static/real_control_v2/css/ct_table.css
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/home/layout.html
src/main/resources/static/real_control_v2/fragments/home/line_panel.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/home/context_menu.js
src/main/resources/static/real_control_v2/js/home/layout.js
src/main/resources/static/real_control_v2/js/utils/ct_table.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
 package com.bsth.controller;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.util.BeanUtil;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
 @RestController
 @RequestMapping("devicegps")
@@ -121,7 +99,7 @@ public class DeviceGpsController {
 		try {
 			data = new ObjectMapper().readValue(json, List.class);
 			for (Map<String, Object> info : data) {
-				info.put("detail", gpsRealData.findByDeviceId((String)info.get("deviceId")));
+				info.put("detail", gpsRealData.get((String)info.get("deviceId")));
 			}
 			res.put("errCode", 0);
 package com.bsth.data.gpsdata;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
-import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
-import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.util.ConfigUtil;
 import com.google.common.collect.TreeMultimap;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.util.*;
 /**
@@ -42,11 +31,8 @@ public class GpsRealData implements CommandLineRunner {
     //按线路分组设备号
     private static TreeMultimap<String, String> lineCode2Devices;
-    // 网关数据接口地址
-    private static String url;
-
     @Autowired
-    GpsDataLoader gpsDataLoader;
+    GpsDataLoaderThread gpsDataLoader;
     @Autowired
     DayOfSchedule dayOfSchedule;
@@ -60,13 +46,15 @@ public class GpsRealData implements CommandLineRunner {
     public GpsRealData() {
         gpsMap = new HashMap<>();
         lineCode2Devices = TreeMultimap.create();
-        url = ConfigUtil.get("http.gps.real.url");
     }
     @Override
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
+        //定时从网关获取GPS数据
         //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+        //定时扫描掉离线
+
     }
     public void put(GpsEntity gps) {
@@ -146,10 +134,6 @@ public class GpsRealData implements CommandLineRunner {
         return gpsMap.keySet();
     }
-    public GpsEntity findByDeviceId(String deviceId) {
-        return gpsMap.get(deviceId);
-    }
-
     public Collection<GpsEntity> all() {
         return gpsMap.values();
     }
@@ -157,87 +141,4 @@ public class GpsRealData implements CommandLineRunner {
     public void remove(String device) {
         gpsMap.remove(device);
     }
-
-    @Component
-    public static class GpsDataLoader extends Thread {
-
-        Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
-
-        @Autowired
-        GpsRealData gpsRealData;
-
-        @Autowired
-        GpsRealAnalyse gpsRealAnalyse;
-
-        @Override
-        public void run() {
-            try {
-                //如果正在恢复数据
-                if (GpsDataRecovery.run)
-                    return;
-
-                load();
-            } catch (Exception e) {
-                logger.error("", e);
-            }
-        }
-
-        public void load() throws Exception {
-            List<GpsEntity> list = null;
-            List<GpsEntity> updateList = new ArrayList<>();
-            CloseableHttpClient httpClient = null;
-            CloseableHttpResponse response = null;
-            try {
-                httpClient = HttpClients.createDefault();
-                HttpGet get = new HttpGet(url);
-
-                response = httpClient.execute(get);
-
-                HttpEntity entity = response.getEntity();
-                if (null != entity) {
-                    BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-                    StringBuffer stringBuffer = new StringBuffer();
-                    String str = "";
-                    while ((str = br.readLine()) != null)
-                        stringBuffer.append(str);
-
-                    JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-
-                    if (jsonObj != null)
-                        list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
-
-                    String nbbm;
-                    GpsEntity old;
-                    for (GpsEntity gps : list) {
-                        //没有设备号
-                        if (StringUtils.isBlank(gps.getDeviceId()))
-                            continue;
-
-                        old = gpsMap.get(gps.getDeviceId());
-                        if (old != null &&
-                                old.getTimestamp() == gps.getTimestamp())
-                            continue;
-
-                        nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
-                        if (StringUtils.isBlank(nbbm))
-                            gps.setIncomplete(true);//标记为异常数据
-                        else
-                            gps.setNbbm(nbbm);
-                        //有更新的点位
-                        updateList.add(gps);
-                    }
-                    //分析数据
-                    gpsRealAnalyse.analyse(updateList);
-                } else
-                    logger.error("real gps result is null");
-            } catch (Exception e) {
-                logger.error("", e);
-            } finally {
-                if (null != httpClient)
-                    httpClient.close();
-                if (null != response)
-                    response.close();
-            }
-        }
-    }
 }
 \ No newline at end of file
+package com.bsth.data.gpsdata.thread;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.data.BasicData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
+import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.util.ConfigUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by panzhao on 2017/1/11.
+ */
+@Component
+public class GpsDataLoaderThread extends Thread {
+
+    Logger logger = LoggerFactory.getLogger(GpsDataLoaderThread.class);
+
+    /**
+     * 构造函数
+     */
+    public GpsDataLoaderThread() {
+        url = ConfigUtil.get("http.gps.real.url");
+    }
+
+    // 网关数据接口地址
+    private static String url;
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    @Autowired
+    GpsRealAnalyse gpsRealAnalyse;
+
+    @Override
+    public void run() {
+        try {
+            //如果正在恢复数据
+            if (GpsDataRecovery.run)
+                return;
+
+            load();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    public void load() throws Exception {
+        List<GpsEntity> list = null;
+        List<GpsEntity> updateList = new ArrayList<>();
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse response = null;
+        try {
+            httpClient = HttpClients.createDefault();
+            HttpGet get = new HttpGet(url);
+
+            response = httpClient.execute(get);
+
+            HttpEntity entity = response.getEntity();
+            if (null != entity) {
+                BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null)
+                    stringBuffer.append(str);
+
+                JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
+
+                if (jsonObj != null)
+                    list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+
+                String nbbm;
+                GpsEntity old;
+                for (GpsEntity gps : list) {
+                    //没有设备号
+                    if (StringUtils.isBlank(gps.getDeviceId()))
+                        continue;
+
+                    old = gpsRealData.get(gps.getDeviceId());
+                    if (old != null &&
+                            old.getTimestamp() == gps.getTimestamp())
+                        continue;
+
+                    nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                    if (StringUtils.isBlank(nbbm))
+                        gps.setIncomplete(true);//标记为异常数据
+                    else
+                        gps.setNbbm(nbbm);
+                    //有更新的点位
+                    updateList.add(gps);
+                }
+                //分析数据
+                gpsRealAnalyse.analyse(updateList);
+            } else
+                logger.error("real gps result is null");
+        } catch (Exception e) {
+            logger.error("", e);
+        } finally {
+            if (null != httpClient)
+                httpClient.close();
+            if (null != response)
+                response.close();
+        }
+    }
+}
 \ No newline at end of file
+package com.bsth.data.gpsdata.thread;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Collection;
+
+/**
+ * GPS掉离线监控
+ * Created by panzhao on 2017/1/11.
+ */
+public class OfflineMonitorThread extends Thread{
+
+    @Autowired
+    GpsRealData gpsRealData;
+
+    //有任务时 掉线阈值
+    private final static int LOSE_TIME = 1000 * 60 * 2;
+
+    //无任务时 离线阈值
+    private final static int OFFLINE_TIME = 1000 * 60 * 10;
+
+    @Override
+    public void run() {
+        long t = System.currentTimeMillis();
+        Collection<GpsEntity> list = gpsRealData.all();
+
+        String state;
+        for(GpsEntity gps : list){
+            state = gps.getAbnormalStatus();
+
+            if(state.equals("offline"))
+                continue;
+
+
+            //if(state.equals("lose"))
+            //if(!state.equals("lose"))
+            //if(state.equals(""))
+            //if(gps.getTimestamp())
+            //if(gps.getAbnormalStatus().equals("lose"))
+        }
+    }
+}
 package com.bsth.service.directive;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
@@ -24,15 +7,11 @@ import com.bsth.data.BasicData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectiveCreator;
 import com.bsth.data.directive.GatewayHttpUtils;
-import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.directive.D60;
-import com.bsth.entity.directive.D64;
-import com.bsth.entity.directive.D80;
-import com.bsth.entity.directive.DC0_A3;
-import com.bsth.entity.directive.Directive;
+import com.bsth.entity.directive.*;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.directive.D60Repository;
@@ -44,6 +23,15 @@ import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
 @Service
 public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implements DirectiveService {
@@ -265,7 +253,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 		// 根据当前GPS确定 上下行和营运状态
 		Integer upDown = null, state = null;
 		if (null == sch) {
-			GpsEntity gpsData = gpsRealDataBuffer.findByDeviceId(deviceId);
+			GpsEntity gpsData = gpsRealDataBuffer.get(deviceId);
 			if (null == gpsData) {
 				/*
 				 * 短语指令不会变更设备状态，所以在没有gps状态对照的情况下可以下发
@@ -27,6 +27,7 @@
 .ct_table>.ct_table_head dl dt {
     font-weight: normal;
+    font-size: 12px;
 }
 .ct_table>.ct_table_body {
@@ -65,7 +66,7 @@
 }
 .ct_table_wrap {
-    border: 1px solid #e6e6e6;
+    /*border: 1px solid #e6e6e6;*/
     border-left: 0;
 }
+.ct_table.home-gps-table>.ct_table_head dl dt{
+    font-size: 12px;
+}
 #main-tab-content>.home-panel, #main-tab-content>.home-panel>#home-main-content>li {
     height: 100%;
 }
@@ -121,19 +124,16 @@
 .data-wrap .data-title span.data-title-text {
     display: inline-block;
-    color: white;
     padding: 0 8px;
-    border-radius: 0 8px 8px 0;
+    font-weight: 600;
 }
 .data-wrap.up .data-title span.data-title-text {
-    background: #5e96d2;
-    /*background-image: -webkit-linear-gradient(top, #5e96d2, #5788bb);*/
+    color: #3e50b3;
 }
 .data-wrap.down .data-title span.data-title-text {
-    background: #d66868;
-    /*background-image: -webkit-linear-gradient(top, #d66868, #bf6363);*/
+    color: #c94f21;
 }
 .data-wrap .data-body {
@@ -278,4 +278,24 @@ span.signal-state-speed-limit{
     color: #4dc24d;
     font-size: 14px;
     margin-left: 5px;
+}
+
+.home-rb-explain-icon{
+    position: absolute;
+    right: 25px;
+    top: -5px;
+}
+
+.qtip.qtip-home-rb{
+    max-width: 380px;
+    width: 300px;
+}
+
+.qtip-home-rb .uk-list{
+    font-size: 13px;
+    margin-bottom: 0;
+}
+
+.qtip-home-rb .uk-list li{
+    padding: 4px 2px;
 }
 \ No newline at end of file
@@ -121,9 +121,10 @@ svg.line-chart {
 svg.line-chart circle.station_circle {
     fill: #5e96d2;
-    r: 6;
+    r: 5.5;
     stroke: rgb(253, 253, 253);
     stroke-width: 3;
+    Pointer-events: none;
 }
 svg.line-chart circle.station_circle.down {
@@ -131,8 +132,9 @@ svg.line-chart circle.station_circle.down {
 }
 svg.line-chart path.station_link {
-    stroke-width: 5.4px;
+    stroke-width: 3.5px;
     stroke: #5E96D2;
+    Pointer-events: none;
 }
 svg.line-chart path.station_link.down {
@@ -149,6 +151,7 @@ svg.line-chart text.station_text {
     fill: #3e3e3e;
     letter-spacing: -.2px;
     text-shadow: 0 0 2px #dadada;
+    Pointer-events: none;
 }
 svg.line-chart text.station_text.up {
@@ -188,7 +191,7 @@ svg.line-chart g.gps-wrap&gt;rect {
 }
 svg.line-chart g.gps-wrap>rect[updown="0"] {
-    stroke: rgb(62, 80, 179);
+    /*stroke: rgb(62, 80, 179);*/
     fill: rgb(62, 80, 179);
 }
@@ -13,6 +13,9 @@
                 <li {{if i==0}}class="uk-active"{{/if}}><a> {{t}}</a></li>
                 {{/each}}
             </ul>
+            <div class="home-rb-explain-icon uk-icon-hover">
+                <i class="uk-icon-question-circle"></i>
+            </div>
         </div>
     </script>
@@ -32,4 +35,12 @@
       {{/each}}
     </script>
+    <script id="home-rb-explain-help-temp" type="text/html">
+        <ul class="uk-list">
+            <li>场外车辆，距离线路超过100米即为越界</li>
+            <li>线路标准信息限速字段为空，则默认限速60</li>
+            <li>有任务时，连续2分钟无信号即为掉线</li>
+            <li>无任务时，连续10分钟无信号则已离线</li>
+        </ul>
+    </script>
 </div>
@@ -32,9 +32,9 @@
         <dd>
             {{if abnormalStatus != null}}
                 {{if abnormalStatus == 'outBounds'}}
-                <span class="signal-state-outbounds">越界</span>
+                    <span class="signal-state-outbounds">越界</span>
                 {{else if abnormalStatus == 'overspeed'}}
-                <span class="signal-state-speed-limit">超速</span>
+                    <span class="signal-state-speed-limit">超速</span>
                 {{/if}}
             {{/if}}
@@ -7,7 +7,7 @@
                 {{else}}
                 下行/{{line.endStationName}}
                 {{/if}}
-                <i class="uk-icon-question-circle"></i>
+                <i class="uk-icon-question-circle uk-icon-hover"></i>
                 <div class="fixed_legend">
                     <div>
                         <span class="tl-xxfc">消息发出</span>
@@ -161,9 +161,9 @@ var gb_data_basic = (function () {
         //是否是环线
         isLoopLine: function (lineCode) {
             var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
-            //如果上行起终点名称相同，并且距离50米内
+            //如果上行起终点名称相同，并且距离50米内 并且下行只有2个站点
             var len = data[0].length;
-            if(len > 0){
+            if(len > 0 && data[1].length == 2){
                 var first = data[0][0],
                     end = data[0][len - 1];
@@ -37,7 +37,7 @@ var gb_home_context_menu = (function() {
             else
                 notify_err('发送失败，原因参考【指令下发记录】');
         });
-    }
+    };
     // send phrase
     var sendPhrase = function() {
@@ -59,7 +59,7 @@ var gb_home_context_menu = (function() {
                 notify_err_form('发送短语消息失败', f);
             });
         });
-    }
+    };
     //send phrase multiple
     var sendPhraseMulti = function() {
@@ -100,7 +100,7 @@ var gb_home_context_menu = (function() {
                 showMultiSendModal(nbbmArr, data.text);
             }, 200);
         });
-    }
+    };
     // multi send animation modal
     var showMultiSendModal = function(nbbmArray, text) {
@@ -136,7 +136,7 @@ var gb_home_context_menu = (function() {
                 f();
             });
         }();
-    }
+    };
     var state_up_0 = function() {
         changeUpDown(active_car, 0);
@@ -182,7 +182,7 @@ var gb_home_context_menu = (function() {
     var C0_A3 = function(){
       open_modal('/real_control_v2/fragments/home/c0_a3.html', {}, {center: false, bgclose: false});
-    }
+    };
     var callbackHandler = {
         send_phrase: sendPhrase,
@@ -34,10 +34,44 @@ var gb_home_layout = (function () {
                     return false;
             });
+            initRbDxplain();
             cb && cb();
         });
     };
+    //右下角说明icon
+    function initRbDxplain() {
+        $(document).on('mouseenter', '.home-rb-explain-icon', function() {
+            $(this).qtip({
+                show: {
+                    ready: true,
+                    delay: 0
+                },
+                content: {
+                    text: function() {
+                        return temps['home-rb-explain-help-temp']({});
+                    }
+                },
+                position: {
+                    viewport: $(window)
+                },
+                style: {
+                    classes: 'qtip-jtools qtip-home-rb'
+                },
+                hide: {
+                    fixed: true,
+                    delay: 300
+                },
+                events: {
+                    hidden: function(event, api) {
+                        //destroy dom
+                        $(this).qtip('destroy', true);
+                    }
+                }
+            });
+        });
+    }
+
     //click svg edit icon
     $(document).on('click', '.home-svg-edit-icon', function () {
         open_modal('/real_control_v2/fragments/home/svg_edit.html', {lineCode: $(this).data('line-code')});
 var gb_ct_table = (function() {
+    var webkit=true;
+    if(typeof $("body")[0].style.WebkitAnimation=="undefined")
+        webkit = false;
+
     function fixedHead($wrap) {
+        if(!webkit)
+            return;
         $wrap.off('scroll').on('scroll', function() {
             var top = $(this).scrollTop();
@@ -227,11 +227,10 @@ var gb_svg_chart = (function () {
             var x;
             e.transition().attr('x', function (d) {
                 x = gx(d, svg);
-                //找不到停靠点，直接隐藏
                 if(x == -100)
-                    $(this).hide();
+                    $(this).css('transition-duration', 0).hide();
                 else
-                    $(this).show();
+                    $(this).show();//找不到停靠点，直接隐藏
                 return x;
             })
                 .attr('y', function (d) {
@@ -269,7 +268,6 @@ var gb_svg_chart = (function () {
             //聚合gps
             marker_clusterer(this, lineCode);
         });
-
     };
     var draw_gps = function (svg, data) {
@@ -290,7 +288,6 @@ var gb_svg_chart = (function () {
     var marker_clusterer = function (svg, lineCode) {
         //debugger
         var gpsArr, idxMapp = line_gps_index[lineCode];
-        //svgs = $('.line-chart[data-code=' + lineCode + ']');
         for (var stopNo in idxMapp) {
             gpsArr = gb_common.get_keys(idxMapp[stopNo]);
             //remove old merger point