update

潘钊
1 parent f49b8a20
Showing 5 changed files with 36 additions and 11 deletions
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/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
src/main/resources/static/real_control_v2/js/utils/svg_data_convert.js
@@ -191,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);
 }
@@ -38,7 +38,7 @@
     <script id="home-rb-explain-help-temp" type="text/html">
         <ul class="uk-list">
             <li>场外车辆，距离线路超过100米即为越界</li>
-            <li>线路标准信息限速字段为空，则默认限速60</li>
+            <li>超速以线路标准限速为准，为空则默认60</li>
             <li>有任务时，连续2分钟无信号即为掉线</li>
             <li>无任务时，连续10分钟无信号则已离线</li>
         </ul>
@@ -161,14 +161,14 @@ var gb_data_basic = (function () {
         //是否是环线
         isLoopLine: function (lineCode) {
             var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
-            //如果上行起终点名称相同，并且距离50米内 并且下行只有2个站点
+            //如果上行起终点距离50米内 并且下行只有2个站点
             var len = data[0].length;
             if(len > 0 && data[1].length == 2){
                 var first = data[0][0],
                     end = data[0][len - 1];
-                if(first.stationName != end.stationName)
-                    return false;
+                /*if(first.stationName != end.stationName)
+                    return false;*/
                 var fPoint = {latitude: first.station.gLaty, longitude: first.station.gLonx}
                     ,ePoint = {latitude: end.station.gLaty, longitude: end.station.gLonx};
@@ -17,6 +17,8 @@ var gb_svg_chart = (function () {
             return (chart_height - (chart_height / t_max_size * t.length)) / 2 + 5;
         },
         cat_text = function (t) {
+            if(!t)
+                return 0;
             return t.length > t_max_size ? t.substr(0, t_max_size) : t;
         },
         get_width = function (wrap) {
@@ -39,7 +41,7 @@ var gb_svg_chart = (function () {
         var loopLine = gb_data_basic.isLoopLine(lineCode);
         var routes = gb_data_basic.stationRoutes(lineCode);
-        var data = gb_svg_data_convert.mergeRoute(JSON.parse(JSON.stringify(routes)), enableAttr, lineCode),
+        var data = gb_svg_data_convert.mergeRoute(JSON.parse(JSON.stringify(routes)), enableAttr, lineCode, loopLine),
             len = data.length;
         var w = get_width(wrap),
@@ -4,11 +4,11 @@ var gb_svg_data_convert = (function () {
      * 合并上下行路由
      * type 0 上行 1 下行 2 同名合并  3 异名合并
      *
-     * 有时间再重写一些这块代码！！！！！
+     * 因为基础的数据的各种奇葩搞法，这块打了很多补丁，有时间一定要重写
      *
      * enableAttr: 是否启用配置信息
      */
-    function mergeRoute(routes, enableAttr, lineCode) {
+    function mergeRoute(routes, enableAttr, lineCode, loopLine) {
         //按上下行拆分
         routes = gb_common.groupBy(routes, 'directions');
         var up = routes[0],
@@ -16,6 +16,7 @@ var gb_svg_data_convert = (function () {
         //排序
         up.sort(upSort);
         down.sort(downSort);
+        var data = [];
         //根据配置处理一下数据
         if (enableAttr) {
@@ -26,8 +27,30 @@ var gb_svg_data_convert = (function () {
             }
         }
+        //环线 只画上行
+        if(loopLine){
+            for (var j = 0; j < up.length; j++) {
+                var upS = nvl_get(up, j);
+                op = {
+                    name: [upS.stationName],
+                    id: [get_station_code(upS)],
+                    type: 0,
+                    stationMark: upS.stationMark
+                };
+                data.push(op);
+            }
+
+            //上下行GPS容器
+            $.each(data, function () {
+                this.gpsUps = [];
+                this.gpsDowns = [];
+            });
+
+            return data;
+        }
+
+
         //同名站点合并
-        var data = [];
         for (var j = 0; j < up.length; j++) {
             var upS = nvl_get(up, j),
                 downS = nvl_get(down, j),
@@ -43,8 +66,8 @@ var gb_svg_data_convert = (function () {
                 var dIndex = station_indexof(down, upS, j);
                 //上行站点在下行路由中是否存在
                 var uIndex = station_indexof(up, downS, j);
-                if (dIndex == -1) {
-                    if (uIndex == -1) {
+                if (dIndex == -1 || dIndex - j > 4) {
+                    if (uIndex == -1 && dIndex - j < 4) {
                         op.type = 3;
                         op.name = [upS.stationName, downS.stationName];
                     }