update

潘钊
1 parent bb7d840d
Showing 15 changed files with 371 additions and 110 deletions
src/main/java/com/bsth/entity/realcontrol/SvgAttribute.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/css/line_schedule.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/home/svg_edit.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/js/data/gps_abnormal.js
src/main/resources/static/real_control_v2/js/home/layout.js
src/main/resources/static/real_control_v2/js/home/line_panel.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/utils/svg_chart.js
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Id;
+
+/**
+ * 主页SVG模拟图属性设置
+ * Created by panzhao on 2017/1/6.
+ */
+public class SvgAttribute {
+
+    @Id
+    private String lineCode;
+
+    /** 要隐藏的站点编码  , 号分割多个 */
+    private String hideStations;
+
+    /** 站点别名 json对象字符串 */
+    private String nicknames;
+}
@@ -36,6 +36,7 @@ import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.base.Splitter;
 import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.BiMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import org.apache.commons.lang3.StringUtils;
@@ -265,6 +266,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	public Map<String, Object> save(ScheduleRealInfo t) {
 		Map<String, Object> rs = new HashMap<>();
 		try{
+			if(BasicData.deviceId2NbbmMap.inverse().get(t.getClZbh()) == null){
+				rs.put("msg", "车辆 " + t.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
+				rs.put("status", ResponseCode.ERROR);
+				return rs;
+			}
+
 			SysUser user = SecurityUtils.getCurrentUser();
 			String schDate = DayOfSchedule.currSchDateMap.get(t.getXlBm());
@@ -1725,9 +1732,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		Set<ScheduleRealInfo> set = new HashSet<>();
 		ScheduleRealInfo sch;
+		BiMap<String, String> map = BasicData.deviceId2NbbmMap.inverse();
 		for(ChangePersonCar cpc : cpcs){
-			
+
+			if(map.get(cpc.getClZbh()) == null){
+				rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
+				rs.put("status", ResponseCode.ERROR);
+				return rs;
+			}
+
 			sch = dayOfSchedule.get(cpc.getSchId());
 			if(sch==null)
 				continue;
@@ -1741,13 +1755,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			if(StringUtils.isNotEmpty(cpc.getSpy())){
 				persoChangeSPY(sch, cpc.getSpy().split("/")[0]);
 			}
-			
+
 			//换车
 			if(StringUtils.isNotEmpty(cpc.getClZbh())){
 				set.add(sch);
 				set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
 			}
-			
+
 		}
 		rs.put("ts", set);
 		rs.put("status", ResponseCode.SUCCESS);
@@ -39,7 +39,7 @@
     border: 1px solid #e6e6e6;
     border-radius: 4px;
     margin: 0 1px 4px 1px;
-    min-height: 230px;
+    min-height: 240px;
     height: calc(100% / 3 - 12px);
     padding: 3px;
 }
@@ -75,30 +75,35 @@
 }
 .home-gps-table dl dt:nth-of-type(3), .home-gps-table dl dd:nth-of-type(3) {
-    width: 11%
+    width: 10%
 }
 .home-gps-table dl dt:nth-of-type(4), .home-gps-table dl dd:nth-of-type(4) {
-    width: 19%
+    width: 10%
 }
 .home-gps-table dl dt:nth-of-type(5), .home-gps-table dl dd:nth-of-type(5) {
-    width: 18%
+    width: 19%
 }
 .home-gps-table dl dt:nth-of-type(6), .home-gps-table dl dd:nth-of-type(6) {
-    width: 10%
+    width: 18%
 }
 .home-gps-table dl dt:nth-of-type(7), .home-gps-table dl dd:nth-of-type(7) {
-    width: 9%
+    width: 10%
 }
 .home-gps-table dl dt:nth-of-type(8), .home-gps-table dl dd:nth-of-type(8) {
-    width: 8%;
+    width: 9%;
     border-right: 0;
 }
+/*.home-gps-table dl dt:nth-of-type(9), .home-gps-table dl dd:nth-of-type(9) {
+    width: 8%;
+    border-right: 0;
+}*/
+
 .data-wrap.up {
     /*border-left: 1px solid #dadada;*/
 }
@@ -234,3 +239,30 @@
 .data-wrap.down::-webkit-scrollbar-thumb{
     box-shadow: 0 0 0 5px rgba(210, 103, 103, 0.44) inset;
 }*/
+
+span.signal-state-outbounds{
+    background: #f3ff00;
+    color: #d42727;
+    padding: 2px 3px;
+    border-radius: 3px;
+    font-size: 11px;
+}
+
+.home-svg-edit-icon{
+    position: absolute;
+    right: 10px;
+    top: 5px;
+    cursor: pointer;
+    z-index: 3;
+    opacity: 0;
+    transition: all .3s ease;
+}
+
+.home-svg-edit-icon:hover{
+    opacity: 1;
+}
+
+.home-svg-edit-icon:before{
+    font-family: FontAwesome;
+    content: "\f040";
+}
 \ No newline at end of file
@@ -151,13 +151,13 @@
 }
 .ct_table .uk-badge {
-  padding: 0 1px 0 1px;
-  text-indent: 0;
-  font-family: 华文细黑;
+    padding: 0 1px 0 1px;
+    text-indent: 0;
+    font-family: 华文细黑;
 }
 .ct_table .uk-badge.uk-badge-notification{
-  text-indent: -1px;
+    text-indent: -1px;
 }
 .schedule-body .ct_table dl._active, .schedule-body .ct_table>.ct_table_body dl._active:hover {
@@ -200,7 +200,7 @@
 }
 .schedule-body .ct_table dl._search_hide{
-  display: none !important;
+    display: none !important;
 }
 .context-menu-list.schedule-ct-menu {
@@ -246,34 +246,34 @@ span.fcsj-diff {
 /** 图例 */
 .tl-yzx {
-    background: #c1ddf0;
+    background: rgb( 192,192,255);
     border-top: 1px solid #ebebeb !important;
     color: #444;
 }
 .tl-xxfc{
-    background: #ff7878;
-    color: #f1f1f1;
+    background: rgb(0,255,255);
+    color: #484747;
 }
 .tl-wd{
-    background: #dede57;
+    background: rgb(255,255,0);
     color: #444;
 }
 .tl-xxsd{
-    background: #e2de94;
-    color: #444;
+    background: rgb(205,133,63);
+    color: #f5f4f4;
 }
 .tl-xxrd{
-    background: #c1ddf0;
+    background: rgb(255,99,71);
     border-top: 1px solid #ebebeb !important;
-    color: #444;
+    color: #fff;
 }
 .tl-qrlb {
-    background: #7B6B24;
+    background: rgb( 128,128,0);
     color: #EAEBEC;
     font-size: 13px;
 }
@@ -283,7 +283,7 @@ span.fcsj-diff {
 }
 .tl-zzzx {
-    background: #96F396;
+    background: rgb(173,255,47);
     color: #444;
 }
@@ -370,8 +370,8 @@ span.fcsj-diff {
 .ct-form-modal span.uk-form-help-inline,
 .ct-form-modal p.uk-form-help-block{
-  color: #888888;
-  font-size: 13px;
+    color: #888888;
+    font-size: 13px;
 }
@@ -532,8 +532,8 @@ dl.relevance-active dd:nth-child(n+2) {
 }
 dl.relevance-active.intimity dd:nth-child(n+2) {
-  background: #76a6c7 !important;
-  color: white;
+    background: #8baabf !important;
+    color: white;
 }
 dl.relevance-active.intimity dd:nth-child(n+2) a {
@@ -542,13 +542,24 @@ dl.relevance-active.intimity dd:nth-child(n+2) a {
 dl.relevance-active dd.tl-qrlb,
 dl.relevance-active.intimity dd.tl-qrlb{
-    background: linear-gradient(to right, #7B6B24, #4992c3) !important;
+    background: linear-gradient(to right, #a9a911, #808000, #8baabf) !important;
     color: #f8e9cd;
 }
+dl.relevance-active dd.tl-wd,
+dl.relevance-active.intimity dd.tl-wd{
+    background: linear-gradient(to right, #ffff00, rgb(226, 226, 168), rgb(139, 170, 191)) !important;
+}
+
+dl.relevance-active dd.tl-qrlb,
+dl.relevance-active.intimity dd.tl-yzx{
+    background: linear-gradient(to right, #dcdcfd, #c0c0ff, #8baabf) !important;
+    color: #272727;
+}
+
 dl.relevance-active dd.tl-zzzx,
 dl.relevance-active.intimity dd.tl-zzzx {
-    background: linear-gradient(to right, #96F396, #4992c3) !important;
+    background: linear-gradient(to right, #def5bb, #adff2f, #8baabf) !important;
     color: #565252;
 }
@@ -557,8 +568,23 @@ dl.relevance-active.intimity dd.tl-zzzx span.fcsj-diff {
     color: #5e5a5a
 }
+dl.relevance-active dd.tl-xxsd,
+dl.relevance-active.intimity dd.tl-xxsd {
+    background: linear-gradient(to right, #8baabf, #cd853f, #dc9958) !important;
+}
+
+dl.relevance-active dd.tl-xxrd,
+dl.relevance-active.intimity dd.tl-xxrd {
+    background: linear-gradient(to right, #8baabf, #ff6347, #ff8f7b) !important;
+}
+
+dl.relevance-active dd.tl-xxfc,
+dl.relevance-active.intimity dd.tl-xxfc {
+    background: linear-gradient(to right, #8baabf, rgb(43, 185, 185), rgb(0,255,255)) !important;
+}
+
 dl.relevance-active.intimity dd span.fcsj-diff {
-    color: #d7d6d6;
+    color: #616060;
 }
 dl.relevance-active dd span.fcsj-diff{
@@ -604,10 +630,10 @@ div.drop-rail.over {
 }
 label.destroy-sch{
-  color: #928e8e;
+    color: #928e8e;
 }
 label.destroy-sch small{
-  color: #e25e5e;
+    color: #e25e5e;
 }
 .main-schedule-table dl dt:nth-of-type(1), .main-schedule-table dl dd:nth-of-type(1) {
@@ -639,20 +665,20 @@ label.destroy-sch small{
 .main-schedule-table.ct_table dl.active,
 .main-schedule-table.ct_table>.ct_table_body dl.active:hover,
 .main-schedule-table.ct_table>.ct_table_body dl.context-menu-active{
-  background: #9393bf;
-  box-shadow: 0 0 4px #656c71;
-  color: white;
+    background: #9393bf;
+    box-shadow: 0 0 4px #656c71;
+    color: white;
 }
 .main-schedule-table span.sjfc-time{
-  color:#07d
+    color:#07d
 }
 .main-schedule-table dl.active span.sjfc-time{
-  background: white;
-  border-radius: 5px;
-  padding: 2px 1px;
-  vertical-align: middle;
+    background: white;
+    border-radius: 5px;
+    padding: 2px 1px;
+    vertical-align: middle;
 }
 .sub-task-table dl dt:nth-of-type(1), .sub-task-table dl dd:nth-of-type(1) {
@@ -682,7 +708,7 @@ label.destroy-sch small{
 }
 .sub-task-table>.ct_table_body>dl:last-child dd{
-  border-bottom: 0;
+    border-bottom: 0;
 }
 .add-temp-sch-icon{
@@ -700,16 +726,16 @@ label.destroy-sch small{
 input.i-cbox[type=checkbox]{
-  width: 20px;
-  height: 18px;
-  vertical-align: middle;
-  margin-top: -3px;
+    width: 20px;
+    height: 18px;
+    vertical-align: middle;
+    margin-top: -3px;
 }
 .sys-note-80,
 .sys-note-42{
-  width: calc(100% - 10px) !important;
-  margin: 5px !important;
+    width: calc(100% - 10px) !important;
+    margin: 5px !important;
     cursor: default;
 }
@@ -720,21 +746,21 @@ input.i-cbox[type=checkbox]{
 .sys-note-80 .uk-panel-box,
 .sys-note-42 .uk-panel-box{
-  padding: 10px;
+    padding: 10px;
 }
 .sys-note-80 .uk-panel-title{
-  margin-bottom: 3px;
-  font-size: 15px;
+    margin-bottom: 3px;
+    font-size: 15px;
 }
 .sys-note-42 .title{
-  font-family: 微软雅黑;
-  margin-bottom: 3px;
+    font-family: 微软雅黑;
+    margin-bottom: 3px;
 }
 .sys-note-80 .uk-button-group,
 .sys-note-42 .uk-button-group{
-  display: block;
-  margin-top: 5px;
+    display: block;
+    margin-top: 5px;
 }
@@ -759,7 +785,7 @@ input.i-cbox[type=checkbox]{
 .sch-tzrc-table.ct_table dl.active,
 .sch-tzrc-table.ct_table>.ct_table_body dl.active:hover,
 .sch-tzrc-table.ct_table>.ct_table_body dl.context-menu-active{
-  background: #e6e6e6;
+    background: #e6e6e6;
 }
 .search_sch_panel{
@@ -767,17 +793,17 @@ input.i-cbox[type=checkbox]{
 }
 .search_sch_panel .uk-form input[type=text]{
-  width: 80px;
-  background: #fafafa;
-  border: 0;
-  border-bottom: 1px solid #ddd;
-  font-size: 14px;
-  height: 20px;
-  transition: all .3s ease;
+    width: 80px;
+    background: #fafafa;
+    border: 0;
+    border-bottom: 1px solid #ddd;
+    font-size: 14px;
+    height: 20px;
+    transition: all .3s ease;
 }
 .search_sch_panel .uk-form div.uk-form-icon.active input[type=text]{
-  width: 145px;
+    width: 145px;
 }
 .search_sch_panel .uk-form div.uk-form-icon i.cancel{
@@ -802,8 +828,8 @@ input.i-cbox[type=checkbox]{
 }
 .search_sch_panel .uk-form input[type=text]::-webkit-input-placeholder{
-  font-size: 12px;
-  color: #cecece;
+    font-size: 12px;
+    color: #cecece;
 }
 .device_event_str{
     font-size: 10px;
@@ -1057,7 +1083,7 @@ i.signal_state_icon.uk-icon-reply{
 .child-task-status.fail{
     color: red;
-    text-shadow: red 0px 0px 20px;
+    /*text-shadow: red 0px 0px 20px;*/
 }
 .child-task-status.fail span.calc-detail{
@@ -147,11 +147,11 @@ svg.line-chart text.station_text {
 }
 svg.line-chart text.station_text.up {
-    fill: #5E96D2;
+    fill: #4556b6;
 }
 svg.line-chart text.station_text.down {
-    fill: #C92121;
+    fill: #c94f21;
 }
 svg.line-chart g.item:first-child>text {
@@ -166,7 +166,7 @@ svg.line-chart g.item:nth-last-child(3)&gt;text {
 svg.line-chart g.gps-wrap>rect {
     width: 34px;
-    height: 18px;
+    height: 15px;
     /*fill: #fff;*/
     rx: 4px;
     cursor: pointer;
@@ -188,7 +188,7 @@ svg.line-chart g.gps-wrap&gt;rect.hover {
 svg.line-chart g.gps-wrap>text {
     font-size: 13px;
-    transform: translate(2px, 14px);
+    transform: translate(2px, 12px);
     pointer-events: none;
 }
@@ -506,3 +506,70 @@ li.map-panel{
     fill: #dd3829;
 }
+
+.svg-edit-panel-wrap{
+    width: 48%;
+    border: 1px solid #e1d3d3;
+    padding: 12px 0 0 0;
+    border-radius: 4px;
+    position: relative;
+    display: inline-block;
+    vertical-align: top;
+}
+
+.svg-edit-panel-wrap .title-badge{
+    position: absolute;
+    top: -10px;
+    left: 7px;
+    font-size: 13px;
+    background: #fff;
+    padding: 0 3px;
+    color: #888888;
+}
+
+.station-list{
+    width: 190px;
+    padding: 2px 7px;
+    height: 440px;
+    overflow: auto;
+    display: inline-block;
+}
+
+.station-list .station-item{
+    padding: 3px 0;
+    margin: 5px 0;
+    border-radius: 3px;
+    font-size: 13px;
+    text-indent: 7px;
+    cursor: pointer;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.station-list .station-item.disable,
+.station-list .station-item.disable:hover{
+    background: #d5c9c9 !important;
+    color: #686565 !important;
+}
+
+.station-list.up .station-item{
+    background: #5364c3;
+    color: white;
+}
+
+.station-list.up .station-item:hover{
+    box-shadow: 0px 3px 6px 0 rgba(0, 0, 0, 0.2), 0px 1px 4px 0 rgba(0, 0, 0, 0.19);
+    background: #4556b6;
+}
+
+
+.station-list.down .station-item{
+    background: #f95858;
+    color: white;
+}
+
+.station-list.down .station-item:hover{
+    box-shadow: 0px 3px 6px 0 rgba(0, 0, 0, 0.2), 0px 1px 4px 0 rgba(0, 0, 0, 0.19);
+    background: #e95151;
+}
 \ No newline at end of file
@@ -22,6 +22,7 @@
       <div class="uk-grid home-line-card" data-line-code="{{line.lineCode}}">
           <div class="uk-width-medium-1-5 data-wrap up" id="home_{{line.lineCode}}_0"></div>
           <div class="uk-width-medium-3-5 svg-chart-wrap">
+              <div class="home-svg-edit-icon" data-line-code="{{line.lineCode}}"></div>
             <div class="top-center-big-text">
               {{line.name}}
             </div>
@@ -10,12 +10,12 @@
                         <dl>
                             <dt>车辆编码</dt>
                             <dt>速度</dt>
-                            <dt>终点时间</dt>
+                            <dt>终点</dt>
+                            <dt>状态</dt>
                             <dt>当前站点</dt>
                             <dt>终点站</dt>
                             <dt>计划到达</dt>
                             <dt>驾驶员</dt>
-                            <dt>售票员</dt>
                         </dl>
                     </div>
                     <div class="ct_table_body"></div>
@@ -29,11 +29,29 @@
         <dd title="{{nbbm}}"><a>{{nbbm}}</a></dd>
         <dd>{{speed}}</dd>
         <dd>{{expectStopTime}}</dd>
+        <dd>
+            {{if abnormal != null}}
+                {{if abnormal == 'outBounds'}}
+                    越界
+                {{/if}}
+            {{else}}
+                正常
+            {{/if}}
+        </dd>
         <dd title="{{stationName}}">{{stationName}}</dd>
         <dd></dd>
         <dd></dd>
         <dd></dd>
-        <dd></dd>
     </dl>
-</script>
+    </script>
+
+    <script id="home-gps-abnormal-temp" type="text/html">
+        {{if abnormal != null}}
+            {{if abnormal == 'outBounds'}}
+                <span class="signal-state-outbounds">越界</span>
+            {{/if}}
+        {{else}}
+            正常
+        {{/if}}
+    </script>
 </div>
+<div class="uk-modal" id="home-svg-edit-modal">
+    <div class="uk-modal-dialog" style="width: 930px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>模拟图数据编辑</h2></div>
+
+        <div class="svg-edit-panel-wrap station-list-wrap" >
+            <span class="title-badge">站点缩略</span>
+        </div>
+
+
+        <div class="svg-edit-panel-wrap" style="margin-left: 25px;">
+            <span class="title-badge">站点重命名</span>
+        </div>
+
+    </div>
+
+    <script id="svg-edit-station-list-temp" type="text/html">
+        <div class="station-list up">
+            {{each list[0] as s i}}
+            <div class="station-item">{{s.stationName}}</div>
+            {{/each}}
+        </div>
+
+        <div class="station-list down" style="margin-left: 8px;">
+            {{each list[1] as s i}}
+            <div class="station-item">{{s.stationName}}</div>
+            {{/each}}
+        </div>
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#home-svg-edit-modal',
+                    lineCode;
+
+            $(modal).on('init', function (e, data) {
+                lineCode = data.lineCode;
+                //站点路由
+                var routeArray = gb_common.groupBy(gb_data_basic.stationRoutes(lineCode), 'directions');
+                //下行倒序
+                routeArray[1].sort(function (a, b) {
+                    return b.stationRouteCode - a.stationRouteCode;
+                });
+                $('.station-list-wrap', modal).append(template('svg-edit-station-list-temp', {list: routeArray}));
+
+                $('.station-item', modal).on('click', function () {
+                    if($(this).hasClass('disable')){
+                        $(this).removeClass('disable');
+                    }
+                    else
+                        $(this).addClass('disable');
+                });
+            });
+        })();
+    </script>
+</div>
@@ -98,11 +98,11 @@ var gb_data_basic = (function () {
         }
         return null;
-    }
+    };
     var getLineInformation = function (lineCode) {
         return lineInformations[lineCode];
-    }
+    };
     //文件载入完毕
     res_load_ep.emitLater('load_data_basic');
@@ -3,7 +3,7 @@
 var gb_data_gps = (function() {
     //fixed time refresh delay
-    var delay = 1000 * 6;
+    var delay = 1000 * 5;
     //deviceId ——> gps
     var realData = {};
     //refresh after callback
@@ -34,6 +34,7 @@ var gb_data_gps = (function() {
             upArr = [],
             upDownChange = [];
+        var schArray;
         $.each(rs, function() {
             old = realData[this.deviceId];
             if (old) {
@@ -45,16 +46,26 @@ var gb_data_gps = (function() {
             } else
                 addArr.push(this);
+            //班次信息
+            if(this.schId){
+                schArray=gb_schedule_table.findScheduleByLine(this.lineId);
+                if(schArray)
+                    this.sch = schArray[this.schId];
+            }
+
             //时间格式化
             this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
+            //异常检测
+            gb_gps_abnormal.check(this);
             realData[this.deviceId] = this;
         });
-        console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
+        //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
         //CCCallFuncN
         $.each(refreshEventCallbacks, function(i, cb) {
             cb(addArr, upArr, upDownChange);
         });
+
     };
     var startFixedTime;
@@ -81,11 +92,11 @@ var gb_data_gps = (function() {
     };
     var findOne = function(deviceId){
-      return realData[deviceId];
+        return realData[deviceId];
     };
     var findGpsByNbbm = function(nbbm){
-      return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
+        return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
     };
     return {
@@ -24,7 +24,16 @@ var gb_gps_abnormal = (function () {
                 min = distance;
         });
-        //console.log('最短距离', min, gps);
+        //越界阈值 120米
+        var threshold=120;
+        if(gps.sch && gps.sch.bcType == 'in')
+            return;
+
+        if(min > threshold){
+            gps.abnormal = 'outBounds';
+            gps.outBoundsDistance = min;
+        }
+        //console.log('最短距离', min, gps.nbbm);
     };
     /**
 /* home js */
-var gb_home_layout = (function() {
+var gb_home_layout = (function () {
     var temps;
-    var layout = function(cb) {
+    var layout = function (cb) {
         //footer line name tabs
         var codeArray = gb_data_basic.line_idx.split(','),
             tabsArray = [],
             len = codeArray.length;
         for (var i = 0; i < len;) {
-            tabsArray.push(connectArr(codeArray.slice(i, i += 3), ',', function(item) {
+            tabsArray.push(connectArr(codeArray.slice(i, i += 3), ',', function (item) {
                 return gb_data_basic.codeToLine[item].name;
             }));
         }
         //load template
-        $.get('/real_control_v2/fragments/home/layout.html', function(dom) {
+        $.get('/real_control_v2/fragments/home/layout.html', function (dom) {
             temps = gb_common.compileTempByDom(dom);
             var htmlStr = temps['home-layout-tab-temp']({
@@ -26,7 +26,7 @@ var gb_home_layout = (function() {
             //render line panel
             var i = 0,
                 data, renderFun = temps['home-layout-line-temp'];
-            $('ul#home-main-content li').each(function() {
+            $('ul#home-main-content li').each(function () {
                 data = gb_data_basic.findLineByCodes(codeArray.slice(i, i += 3));
                 $(this).html(renderFun({list: data}));
@@ -36,7 +36,12 @@ var gb_home_layout = (function() {
             cb && cb();
         });
-    }
+    };
+
+    //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')});
+    });
     //文件载入完毕
     res_load_ep.emitLater('load_home_layout');
@@ -83,21 +83,18 @@ var gb_home_line_panel = (function() {
         $(cells[1]).text(t.speed);
         $(cells[2]).html(t.expectStopTime == null ? '' : t.expectStopTime);
+        //状态
+        $(cells[3]).html(temps['home-gps-abnormal-temp'](t));
+
         if(!t.stationName)
             t.stationName='';
-        $(cells[3]).text(t.stationName).attr('title', t.stationName);
+        $(cells[4]).text(t.stationName).attr('title', t.stationName);
         //班次信息
-        if(t.schId){
-            var sch=gb_schedule_table.findScheduleByLine(t.lineId)[t.schId];
-            if(!sch)
-                return;
-
-            $(cells[4]).text(sch.zdzName);
-            $(cells[5]).text(sch.zdsj);
-            $(cells[6]).text(sch.jName);
-            if(sch.sName)
-                $(cells[7]).text(sch.sName);
+        if(t.sch){
+            $(cells[5]).text(t.sch.zdzName);
+            $(cells[6]).text(t.sch.zdsj);
+            $(cells[7]).text(t.sch.jName);
         }
     };
@@ -43,7 +43,7 @@ var gb_main_ep = new EventProxy(),
             });
             //初始化gps异常判定
-            //gb_gps_abnormal.initData();
+            gb_gps_abnormal.initData();
             //嵌入地图页面
             $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
@@ -3,9 +3,11 @@
 var gb_svg_chart = (function () {
     //chart height
-    var chart_height = 123;
+    var chart_height = 122;
     //left right padding
     var x_padd = 30;
+    //上空白部分
+    var y_top_padd = 14;
     //text max size
     var t_max_size = 7;
     //svg namespace
@@ -24,7 +26,7 @@ var gb_svg_chart = (function () {
             var h = wrap.actual('outerHeight');
             //隐藏元素取最外层的高度
             return h < 20 ? wrap.parent().actual('outerHeight') - 2 : h;
-        }
+        };
     var draw_line = function (lineCode, wrap) {
@@ -40,7 +42,7 @@ var gb_svg_chart = (function () {
                 return xScale(i);
             },
             cy = function () {
-                return (h - chart_height) / 2;
+                return (h - chart_height) / 2 + y_top_padd;
             },
             ty = function (d) {
                 return cy() + calc_text_y(cat_text(d.name[0]));
@@ -62,7 +64,7 @@ var gb_svg_chart = (function () {
                 $(that).after(dText);
                 return cx(d, i) - 8;
-            }
+            };
         //add svg dom
         var svg = d3.select(wrap[0]).append('svg')
@@ -125,7 +127,10 @@ var gb_svg_chart = (function () {
         items.append('text').classed({
             'station_text': true,
             'up': function (d) {
-                return d.type == 3 ? true : false;
+                return d.type == 3 || d.type == 0 ? true : false;
+            },
+            'down': function (d) {
+                return d.type == 1 ? true : false;
             }
         })
             .text(function (d) {
@@ -168,7 +173,7 @@ var gb_svg_chart = (function () {
             var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
             if (!circle) return -100;
-            return circle.attr('cx') - 14;
+            return circle.attr('cx') - 17.5;
         },
         gy = function (gps, svg) {
             var circle = get_circle(gps.stopNo + '_' + gps.upDown, svg);
@@ -177,7 +182,7 @@ var gb_svg_chart = (function () {
             var cy = parseInt(circle.attr('cy')),
                 index = line_gps_index[gps.lineId][gps.stopNo + '_' + gps.upDown][gps.deviceId];
-            return gps.upDown == 0 ? cy - 25 - (index * 21) : cy + 7 + (index * 21);
+            return gps.upDown == 0 ? cy - 22 - (index * 17) : cy + 6 + (index * 19);
         },
         ups_gps = function (d) {
             return d.gpsUps;
@@ -209,7 +214,7 @@ var gb_svg_chart = (function () {
             return d.deviceId;
         },
         gps_update_point = function (e, svg) {
-            e.transition().attr('x', function (d) {
+            e.transition().duration(3000).attr('x', function (d) {
                 return gx(d, svg);
             })
                 .attr('y', function (d) {
@@ -226,7 +231,7 @@ var gb_svg_chart = (function () {
         },
         tx_id = function (d) {
             return 'tx_' + d.deviceId;
-        }
+        };
     var setGps = function (lineCode) {
         var svgs = $('.line-chart[data-code=' + lineCode + ']'),