Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 8939a8a1 24249d24
Showing 42 changed files with 754 additions and 220 deletions
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css
src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js
src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/home/c0_a3.html
src/main/resources/static/real_control_v2/fragments/home/svg_edit.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/jhlb.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lp_change.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_tzrc.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
@@ -87,7 +87,7 @@ public class LineConfigData implements CommandLineRunner {
 		//托管状态
 		conf.setTrust(true);
 		//出场时间类型
-		conf.setOutConfig(1);
+		conf.setOutConfig(0);
 		//进场时间类型
 		//conf.setInConfig(1);
 		//短语模板
@@ -84,6 +84,9 @@ public class GpsRealData implements CommandLineRunner {
             //站点名称
             gps.setStationName(getStationName(gps));
             lineCode2Devices.put(gps.getLineId(), device);
+
+            if(old != null && !gps.getLineId().equals(old.getLineId()))
+                lineCode2Devices.remove(old.getLineId(), device);
         }
     }
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+.uk-accordion-title{margin-top:0;margin-bottom:15px;padding:5px 15px;background:#f7f7f7;font-size:18px;line-height:24px;cursor:pointer;border:1px solid #ddd;border-radius:4px}.uk-accordion-content{padding:0 15px 15px 15px}.uk-accordion-content:after,.uk-accordion-content:before{content:"";display:table}.uk-accordion-content:after{clear:both}.uk-accordion-content>:last-child{margin-bottom:0}
 \ No newline at end of file
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+!function(t){var i;window.UIkit&&(i=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-accordion",["uikit"],function(){return i||t(UIkit)})}(function(t){"use strict";function i(i){var e=t.$(i),o="auto";if(e.is(":visible"))o=e.outerHeight();else{var a={position:e.css("position"),visibility:e.css("visibility"),display:e.css("display")};o=e.css({position:"absolute",visibility:"hidden",display:"block"}).outerHeight(),e.css(a)}return o}return t.component("accordion",{defaults:{showfirst:!0,collapse:!0,animate:!0,easing:"swing",duration:300,toggle:".uk-accordion-title",containers:".uk-accordion-content",clsactive:"uk-active"},boot:function(){t.ready(function(i){setTimeout(function(){t.$("[data-uk-accordion]",i).each(function(){var i=t.$(this);i.data("accordion")||t.accordion(i,t.Utils.options(i.attr("data-uk-accordion")))})},0)})},init:function(){var i=this;this.element.on("click.uk.accordion",this.options.toggle,function(e){e.preventDefault(),i.toggleItem(t.$(this).data("wrapper"),i.options.animate,i.options.collapse)}),this.update(!0),t.domObserve(this.element,function(){i.element.children(i.options.containers).length&&i.update()})},toggleItem:function(e,o,a){var n=this;e.data("toggle").toggleClass(this.options.clsactive),e.data("content").toggleClass(this.options.clsactive);var s=e.data("toggle").hasClass(this.options.clsactive);a&&(this.toggle.not(e.data("toggle")).removeClass(this.options.clsactive),this.content.not(e.data("content")).removeClass(this.options.clsactive).parent().stop().css("overflow","hidden").animate({height:0},{easing:this.options.easing,duration:o?this.options.duration:0}).attr("aria-expanded","false")),e.stop().css("overflow","hidden"),o?e.animate({height:s?i(e.data("content")):0},{easing:this.options.easing,duration:this.options.duration,complete:function(){s&&(e.css({overflow:"",height:"auto"}),t.Utils.checkDisplay(e.data("content"))),n.trigger("display.uk.check")}}):(e.height(s?"auto":0),s&&(e.css({overflow:""}),t.Utils.checkDisplay(e.data("content"))),this.trigger("display.uk.check")),e.attr("aria-expanded",s),this.element.trigger("toggle.uk.accordion",[s,e.data("toggle"),e.data("content")])},update:function(i){var e,o,a,n=this;this.toggle=this.find(this.options.toggle),this.content=this.find(this.options.containers),this.content.each(function(i){e=t.$(this),e.parent().data("wrapper")?o=e.parent():(o=t.$(this).wrap('<div data-wrapper="true" style="overflow:hidden;height:0;position:relative;"></div>').parent(),o.attr("aria-expanded","false")),a=n.toggle.eq(i),o.data("toggle",a),o.data("content",e),a.data("wrapper",o),e.data("wrapper",o)}),this.element.trigger("update.uk.accordion",[this]),i&&this.options.showfirst&&this.toggleItem(this.toggle.eq(0).data("wrapper"),!1,!1)}}),t.accordion});
 \ No newline at end of file
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+!function(t){var e;window.UIkit&&(e=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-timepicker",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";function e(t,e){t=t||0,e=e||24;var i,o,a={"12h":[],"24h":[]};for(i=t,o="";e>i;i++)o=""+i,10>i&&(o="0"+o),a["24h"].push({value:o+":00"}),a["24h"].push({value:o+":30"}),0===i&&(o=12,a["12h"].push({value:o+":00 AM"}),a["12h"].push({value:o+":30 AM"})),i>0&&13>i&&12!==i&&(a["12h"].push({value:o+":00 AM"}),a["12h"].push({value:o+":30 AM"})),i>=12&&(o-=12,0===o&&(o=12),10>o&&(o="0"+String(o)),a["12h"].push({value:o+":00 PM"}),a["12h"].push({value:o+":30 PM"}));return a}t.component("timepicker",{defaults:{format:"24h",delay:0,start:0,end:24},boot:function(){t.$html.on("focus.timepicker.uikit","[data-uk-timepicker]",function(){var e=t.$(this);if(!e.data("timepicker")){var i=t.timepicker(e,t.Utils.options(e.attr("data-uk-timepicker")));setTimeout(function(){i.autocomplete.input.focus()},40)}})},init:function(){var i,o=this,a=e(this.options.start,this.options.end);this.options.minLength=0,this.options.template='<ul class="uk-nav uk-nav-autocomplete uk-autocomplete-results">{{~items}}<li data-value="{{$item.value}}"><a>{{$item.value}}</a></li>{{/items}}</ul>',this.options.source=function(t){t(a[o.options.format]||a["12h"])},this.element.is("input")?(this.element.wrap('<div class="uk-autocomplete"></div>'),i=this.element.parent()):i=this.element.addClass("uk-autocomplete"),this.autocomplete=t.autocomplete(i,this.options),this.autocomplete.dropdown.addClass("uk-dropdown-small uk-dropdown-scrollable"),this.autocomplete.on("show.uk.autocomplete",function(){var t=o.autocomplete.dropdown.find('[data-value="'+o.autocomplete.input.val()+'"]');setTimeout(function(){o.autocomplete.pick(t,!0)},10)}),this.autocomplete.input.on("focus",function(){o.autocomplete.value=Math.random(),o.autocomplete.triggercomplete()}).on("blur",t.Utils.debounce(function(){o.checkTime()},100)),this.element.data("timepicker",this)},checkTime:function(){var t,e,i,o,a="AM",u=this.autocomplete.input.val();"12h"==this.options.format?(t=u.split(" "),e=t[0].split(":"),a=t[1]):e=u.split(":"),i=parseInt(e[0],10),o=parseInt(e[1],10),isNaN(i)&&(i=0),isNaN(o)&&(o=0),"12h"==this.options.format?(i>12?i=12:0>i&&(i=12),"am"===a||"a"===a?a="AM":("pm"===a||"p"===a)&&(a="PM"),"AM"!==a&&"PM"!==a&&(a="AM")):i>=24?i=23:0>i&&(i=0),0>o?o=0:o>=60&&(o=0),this.autocomplete.input.val(this.formatTime(i,o,a)).trigger("change")},formatTime:function(t,e,i){return t=10>t?"0"+t:t,e=10>e?"0"+e:e,t+":"+e+("12h"==this.options.format?" "+i:"")}})});
 \ No newline at end of file
@@ -71,7 +71,7 @@ table.ct-fixed-table {
     table-layout: fixed;
 }
-table.ct-fixed-table tr.context-menu-active{
+table.ct-fixed-table tr.context-menu-active {
     background: #f0f0f0;
 }
@@ -141,8 +141,8 @@ svg.line-chart path.station_link.down {
     stroke: #c92121;
 }
-svg.line-chart path.station_link.down.loop_line{
-    stroke-dasharray: 4,3;
+svg.line-chart path.station_link.down.loop_line {
+    stroke-dasharray: 4, 3;
     stroke-width: 1px;
 }
@@ -162,27 +162,27 @@ svg.line-chart text.station_text.down {
     fill: #c94f21;
 }
-svg.line-chart g.item:first-child>text {
+svg.line-chart g.item:first-child > text {
     stroke: #6f6e6e;
     fill: none;
 }
-svg.line-chart g.item:nth-last-child(3)>text {
+svg.line-chart g.item:nth-last-child(3) > text {
     stroke: #6f6e6e;
     fill: none;
 }
-svg.line-chart g.item:first-child>text.up ,
-svg.line-chart g.item:nth-last-child(3)>text.up {
+svg.line-chart g.item:first-child > text.up,
+svg.line-chart g.item:nth-last-child(3) > text.up {
     stroke: #4556b6;
 }
-svg.line-chart g.item:first-child>text.down ,
-svg.line-chart g.item:nth-last-child(3)>text.down {
+svg.line-chart g.item:first-child > text.down,
+svg.line-chart g.item:nth-last-child(3) > text.down {
     stroke: #c94f21;
 }
-svg.line-chart g.gps-wrap>rect {
+svg.line-chart g.gps-wrap > rect {
     width: 30px;
     height: 15px;
     /* fill: #fff; */
@@ -190,42 +190,43 @@ svg.line-chart g.gps-wrap&gt;rect {
     cursor: pointer;
 }
-svg.line-chart g.gps-wrap>rect[updown="0"] {
+svg.line-chart g.gps-wrap > rect[updown="0"] {
     stroke: rgb(62, 80, 179);
     fill: rgb(62, 80, 179);
 }
-svg.line-chart g.gps-wrap>rect[updown="1"] {
+svg.line-chart g.gps-wrap > rect[updown="1"] {
     stroke: #c94f21;
     fill: #c94f21;
 }
-svg.line-chart g.gps-wrap>rect.hover {
+svg.line-chart g.gps-wrap > rect.hover {
     stroke-width: 2;
 }
-svg.line-chart g.gps-wrap>text {
+svg.line-chart g.gps-wrap > text {
     font-size: 12px;
     transform: translate(0, 12px);
     pointer-events: none;
 }
-svg.line-chart g.gps-wrap>text[updown="0"] {
+svg.line-chart g.gps-wrap > text[updown="0"] {
     fill: #fff;
 }
-svg.line-chart g.gps-wrap>text[updown="1"] {
+svg.line-chart g.gps-wrap > text[updown="1"] {
     fill: #fff;
 }
-svg.line-chart g.gps-wrap>rect.abnormal[updown="0"] ,
-svg.line-chart g.gps-wrap>rect.abnormal[updown="1"]{
+svg.line-chart g.gps-wrap > rect.abnormal[updown="0"],
+svg.line-chart g.gps-wrap > rect.abnormal[updown="1"] {
     width: 40px;
     fill: yellow;
     stroke: yellow;
 }
-svg.line-chart g.gps-wrap>text.abnormal[updown="0"],
-svg.line-chart g.gps-wrap>text.abnormal[updown="1"]{
+
+svg.line-chart g.gps-wrap > text.abnormal[updown="0"],
+svg.line-chart g.gps-wrap > text.abnormal[updown="1"] {
     fill: black;
 }
@@ -240,7 +241,7 @@ svg.line-chart g.merge-item rect {
     fill: #19a53a;
     cursor: pointer;
     stroke: #19a53a;
-    stroke-dasharray: 1,2;
+    stroke-dasharray: 1, 2;
     stroke-width: 3px;
 }
@@ -263,15 +264,15 @@ svg.line-chart g.merge-item text {
     width: 220px;
 }
-.multi-tooltip-wrap{
-  width: 100%;
-  max-height: 350px;
-  overflow: auto;
+.multi-tooltip-wrap {
+    width: 100%;
+    max-height: 350px;
+    overflow: auto;
 }
-.tip_map_wrap.multi{
-  width: 100%;
-  height: 130px;
+.tip_map_wrap.multi {
+    width: 100%;
+    height: 130px;
 }
 .tooltip.multi-tooltip {
@@ -335,12 +336,12 @@ canvas.crosshair-layer {
     left: 0;
 }
-li.map-panel{
-  height: 100%;
-  position: relative;
+li.map-panel {
+    height: 100%;
+    position: relative;
 }
-.main-container .load-panel{
+.main-container .load-panel {
     display: block;
     color: #999797;
 }
@@ -348,7 +349,7 @@ li.map-panel{
 .uk-panel-box-danger {
     background-color: #fff1f0;
     /*color: #d85030;*/
-    border-color: rgba(216,80,48,.3);
+    border-color: rgba(216, 80, 48, .3);
 }
 /*.uk-panel-box-danger .uk-panel-title {
@@ -357,25 +358,25 @@ li.map-panel{
 .uk-badge-default {
     background-color: #a09b9c;
-    background-image: -webkit-linear-gradient(top,#9a9898,#8c8687);
-    background-image: linear-gradient(to bottom,#9a9898,#8c8687);
+    background-image: -webkit-linear-gradient(top, #9a9898, #8c8687);
+    background-image: linear-gradient(to bottom, #9a9898, #8c8687);
 }
-.ct-bottom-drawer{
+.ct-bottom-drawer {
     width: 100%;
     background: rgb(255, 255, 255);
     position: fixed;
     bottom: 0;
-    box-shadow: 0 0 10px rgba(0,0,0,.3);
+    box-shadow: 0 0 10px rgba(0, 0, 0, .3);
     transition: all .3s ease;
     height: 0;
 }
-.ct-bottom-drawer.open{
+.ct-bottom-drawer.open {
     height: 320px;
 }
-.ct-bottom-drawer a.ct-bottom-drawer-close{
+.ct-bottom-drawer a.ct-bottom-drawer-close {
     position: absolute;
     right: 10px;
     top: 10px;
@@ -387,7 +388,7 @@ li.map-panel{
     z-index: 99;
 }
-.ct-bottom-drawer a.ct-bottom-drawer-close:hover{
+.ct-bottom-drawer a.ct-bottom-drawer-close:hover {
     text-decoration: none;
     color: grey;
 }
@@ -398,33 +399,39 @@ li.map-panel{
     font-family: FontAwesome;
 }
-.ct-bottom-drawer-body{
+.ct-bottom-drawer-body {
     width: 100%;
     height: 100%;
 }
-#station_route_spacing_chart_drawer .svg_wrap{
-    width: 80%;height: 100%;display: inline-block;font-size: 14px;overflow: hidden;
+#station_route_spacing_chart_drawer .svg_wrap {
+    width: 80%;
+    height: 100%;
+    display: inline-block;
+    font-size: 14px;
+    overflow: hidden;
     position: relative;
 }
-#station_route_spacing_chart_drawer .drawer_right_map{
-    width: 20%;height: 100%;display: inline-block;
+#station_route_spacing_chart_drawer .drawer_right_map {
+    width: 20%;
+    height: 100%;
+    display: inline-block;
 }
-#station_route_spacing_chart_drawer .svg_cont_body{
-    height:100%;
+#station_route_spacing_chart_drawer .svg_cont_body {
+    height: 100%;
     position: absolute;
-    top:0;
+    top: 0;
     left: 0;
 }
-#station_route_spacing_chart_drawer svg{
+#station_route_spacing_chart_drawer svg {
     width: 100%;
     height: 100%;
 }
-#station_route_spacing_chart_drawer svg g._item rect{
+#station_route_spacing_chart_drawer svg g._item rect {
     stroke: rgb(62, 80, 179);
     fill: rgb(62, 80, 179);
     width: 30px;
@@ -433,26 +440,25 @@ li.map-panel{
     transform: translate(-15px);
 }
-
-#station_route_spacing_chart_drawer svg g._item text{
+#station_route_spacing_chart_drawer svg g._item text {
     writing-mode: tb;
     transform: translate(0, 9px);
     fill: #fff;
 }
-#station_route_spacing_chart_drawer svg g._item path{
+#station_route_spacing_chart_drawer svg g._item path {
     stroke-width: 5.4px;
     stroke: #3e50b3;
 }
-#station_route_spacing_chart_drawer svg g._item circle{
+#station_route_spacing_chart_drawer svg g._item circle {
     r: 3px;
     fill: #ffffff;
 }
-#station_route_spacing_chart_drawer svg g._item path.arc_path{
-    stroke-width:1.3px;
-    stroke:#3e50b3;
+#station_route_spacing_chart_drawer svg g._item path.arc_path {
+    stroke-width: 1.3px;
+    stroke: #3e50b3;
     stroke-dasharray: 1000;
     stroke-dashoffset: 1000;
     fill: none;
@@ -466,30 +472,30 @@ li.map-panel{
 @keyframes dash {
     to {
         stroke-dashoffset: 0;
-        stroke-dasharray: 4,4;
+        stroke-dasharray: 4, 4;
     }
 }
-@-webkit-keyframes dash{
+@-webkit-keyframes dash {
     to {
         stroke-dashoffset: 0;
-        stroke-dasharray: 4,4;
+        stroke-dasharray: 4, 4;
     }
 }
-#station_route_spacing_chart_drawer svg g._item text.distance_text{
+#station_route_spacing_chart_drawer svg g._item text.distance_text {
     writing-mode: horizontal-tb;
     fill: #3e50b3;
 }
-#station_route_spacing_chart_drawer svg g._item rect.distance_rect{
+#station_route_spacing_chart_drawer svg g._item rect.distance_rect {
     height: 20px;
     width: 40px;
     fill: #fff !important;
     stroke-width: 0;
 }
-#station_route_spacing_chart_drawer .tl_desc_text{
+#station_route_spacing_chart_drawer .tl_desc_text {
     position: absolute;
     top: 5px;
     left: 5px;
@@ -498,45 +504,43 @@ li.map-panel{
     font-family: 微软雅黑;
 }
-#station_route_spacing_chart_drawer svg g._item:first-child circle{
+#station_route_spacing_chart_drawer svg g._item:first-child circle {
     fill: #3e50b3;
     r: 6px;
 }
-#station_route_spacing_chart_drawer svg g._item:last-child circle{
+#station_route_spacing_chart_drawer svg g._item:last-child circle {
     fill: #3e50b3;
     r: 6px;
 }
-
 /* 下行 */
-#station_route_spacing_chart_drawer svg.down g._item rect{
+#station_route_spacing_chart_drawer svg.down g._item rect {
     stroke: #dd3829;
     fill: #dd3829;
 }
-#station_route_spacing_chart_drawer svg.down g._item path{
+#station_route_spacing_chart_drawer svg.down g._item path {
     stroke: #dd3829;
 }
-#station_route_spacing_chart_drawer svg.down g._item:first-child circle{
+#station_route_spacing_chart_drawer svg.down g._item:first-child circle {
     fill: #dd3829;
 }
-#station_route_spacing_chart_drawer svg.down g._item text.distance_text{
+#station_route_spacing_chart_drawer svg.down g._item text.distance_text {
     fill: #dd3829;
 }
-#station_route_spacing_chart_drawer svg.down g._item path.arc_path{
+#station_route_spacing_chart_drawer svg.down g._item path.arc_path {
     stroke: #dd3829;
 }
-#station_route_spacing_chart_drawer svg.down g._item:last-child circle{
+#station_route_spacing_chart_drawer svg.down g._item:last-child circle {
     fill: #dd3829;
 }
-
-.svg-edit-panel-wrap{
+.svg-edit-panel-wrap {
     width: 48%;
     border: 1px solid #e1d3d3;
     padding: 12px 0 0 0;
@@ -547,7 +551,7 @@ li.map-panel{
     height: 440px;
 }
-.svg-edit-panel-wrap .title-badge{
+.svg-edit-panel-wrap .title-badge {
     position: absolute;
     top: -10px;
     left: 7px;
@@ -557,62 +561,63 @@ li.map-panel{
     color: #888888;
 }
-.svg-edit-panel-wrap .rename-tools{
+.svg-edit-panel-wrap .rename-tools {
     height: 21px;
     padding: 0 0 0 9px;
 }
-.svg-edit-panel-wrap .rename-item-panel{
+.svg-edit-panel-wrap .rename-item-panel {
     border-bottom: 1px solid #ede5e5;
     padding: 4px;
 }
-.svg-edit-panel-wrap .rename-item-panel select{
+.svg-edit-panel-wrap .rename-item-panel select {
     width: 150px;
 }
-.svg-edit-panel-wrap .rename-item-panel input{
+.svg-edit-panel-wrap .rename-item-panel input {
     margin-left: 7px;
 }
-.svg-edit-panel-wrap .rename-item-panel input[type=checkbox]{
+.svg-edit-panel-wrap .rename-item-panel input[type=checkbox] {
     margin-top: 2px;
     margin-right: 4px;
 }
-.svg-edit-panel-wrap .rename-item-panel.active{
+.svg-edit-panel-wrap .rename-item-panel.active {
     background: #65c9f8;
     box-shadow: 0px 3px 7px 0 rgba(101, 201, 248, 0.48), 0px 1px 4px 0 rgba(101, 201, 248, 0.32);
 }
 .svg-edit-panel-wrap .rename-item-panel.active select,
-.svg-edit-panel-wrap .rename-item-panel.active input{
+.svg-edit-panel-wrap .rename-item-panel.active input {
     background: #65c9f8;
     color: #fff;
 }
-.svg-edit-panel-wrap .rename-item-panel.active i{
+.svg-edit-panel-wrap .rename-item-panel.active i {
     color: #e4f6ff;
 }
-.svg-edit-panel-wrap .rename-item-panel.active input[type=checkbox]{
-    border:none;
+.svg-edit-panel-wrap .rename-item-panel.active input[type=checkbox] {
+    border: none;
 }
-.svg-edit-panel-wrap .rename-item-panel.active input[type=checkbox]:before{
+.svg-edit-panel-wrap .rename-item-panel.active input[type=checkbox]:before {
     color: #fff;
 }
-.svg-edit-panel-wrap .rename-tools a{
+.svg-edit-panel-wrap .rename-tools a {
     font-size: 14px;
     padding: 5px;
 }
-.svg-edit-panel-wrap .rename-tools a:hover{
+
+.svg-edit-panel-wrap .rename-tools a:hover {
     background: #e8edef;
     border-radius: 5px;
 }
-.station-list{
+.station-list {
     width: 190px;
     padding: 2px 7px;
     height: 100%;
@@ -620,7 +625,7 @@ li.map-panel{
     display: inline-block;
 }
-.station-list .station-item{
+.station-list .station-item {
     padding: 3px 0;
     margin: 5px 0;
     border-radius: 3px;
@@ -633,37 +638,40 @@ li.map-panel{
 }
 .station-list .station-item.disable,
-.station-list .station-item.disable:hover{
+.station-list .station-item.disable:hover {
     background: #d5c9c9 !important;
     color: #686565 !important;
 }
-.station-list.up .station-item{
+.station-list.up .station-item {
     background: #5364c3;
     color: white;
 }
-.station-list.up .station-item:hover{
+.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{
+.station-list.down .station-item {
     background: #f95858;
     color: white;
 }
-.station-list.down .station-item:hover{
+.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;
 }
-.modal-dotted-hr{
-    height: 1px;border: none;border-top: 1px dashed #d1d1d1;width: calc(100% + 40px);margin-left: -20px;
+.modal-dotted-hr {
+    height: 1px;
+    border: none;
+    border-top: 1px dashed #d1d1d1;
+    width: calc(100% + 40px);
+    margin-left: -20px;
 }
-#add-sub-task-range_turn-modal .main-sch-panel{
+#add-sub-task-range_turn-modal .main-sch-panel {
     height: 60px;
     border: 1px solid #dddddd;
     border-radius: 5px;
@@ -671,7 +679,7 @@ li.map-panel{
     padding: 20px 0 0 8px;
 }
-#add-sub-task-range_turn-modal .main-sch-panel:before{
+#add-sub-task-range_turn-modal .main-sch-panel:before {
     content: '主任务';
     position: absolute;
     top: -10px;
@@ -694,11 +702,64 @@ li.map-panel{
     text-overflow: ellipsis;
 }
-.ct_row .ct_cell label{
+.ct_row .ct_cell label {
     color: #979393;
     margin-right: 3px;
 }
 .ct_row .ct_cell.c_1_3 {
     width: 33%;
+}
+
+#schedule-lp_change-modal .sch-list {
+    margin-top: 25px;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item dl {
+    font-size: 0;
+    border-bottom: 1px solid #e1dbdb;
+    margin: 7px 0;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item dl dd {
+    font-size: 14px;
+    display: inline-block;
+    line-height: 35px;
+    text-align: center;
+    border-right: 1px dashed #e1dbdb;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item dl dd:nth-of-type(1) {
+    width: 33%;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item dl dd:nth-of-type(2) {
+    width: 33%;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item dl dd:nth-of-type(3) {
+    width: 17%;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item dl dd:nth-of-type(4) {
+    width: 15%;
+    border-right:0;
+}
+
+
+#schedule-lp_change-modal .sch-list .sch-item.reverse dl dd:nth-of-type(1) {
+    width: 15%;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item.reverse dl dd:nth-of-type(2) {
+    width: 17%;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item.reverse dl dd:nth-of-type(3) {
+    width: 33%;
+}
+
+#schedule-lp_change-modal .sch-list .sch-item.reverse dl dd:nth-of-type(4) {
+    width: 33%;
+    border-right:0;
 }
 \ No newline at end of file
@@ -8,8 +8,8 @@
     background: linear-gradient(to right, #082F4A, #125688, #0a3f64);
 }
-.north.monitor{
-    background: linear-gradient(to right ,#595959, #7b7b7b,#595959);
+.north.monitor {
+    background: linear-gradient(to right, #595959, #7b7b7b, #595959);
 }
 .north.scok-colse {
@@ -25,7 +25,7 @@
     border-radius: 20px 0 0 20px;
     z-index: 5;
     left: 270px;
-    box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12);
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
     border: 1px solid #caaaaa;
     font-size: 13px;
 }
@@ -107,7 +107,7 @@
     display: none;
 }
-#history-sch-maintain-modal .load-panel{
+#history-sch-maintain-modal .load-panel {
     background: #fff;
     color: #c92121;
 }
@@ -163,7 +163,7 @@
 }
 #history-sch-maintain-modal ul.h-s-time,
-#history-sch-maintain-modal ul.h-s-line{
+#history-sch-maintain-modal ul.h-s-line {
     border: 1px solid #f0f0f0;
     padding: 9px 0 10px 0;
     border-radius: 3px;
@@ -171,7 +171,7 @@
 }
 #history-sch-maintain-modal ul.h-s-time:before,
-#history-sch-maintain-modal ul.h-s-line:before{
+#history-sch-maintain-modal ul.h-s-line:before {
     content: "日期";
     position: absolute;
     top: -9px;
@@ -182,7 +182,7 @@
     left: 10px;
 }
-#history-sch-maintain-modal ul.h-s-line:before{
+#history-sch-maintain-modal ul.h-s-line:before {
     content: "线路";
 }
@@ -197,21 +197,21 @@
 }
 */
-#history-sch-maintain-modal .uk-icon-question-circle{
+#history-sch-maintain-modal .uk-icon-question-circle {
     color: darkgrey;
     font-size: 12px;
     margin: 3px;
 }
 .history-sch-table.ct_table dl.active,
-.history-sch-table.ct_table>.ct_table_body dl.active:hover,
-.history-sch-table.ct_table>.ct_table_body dl.context-menu-active {
+.history-sch-table.ct_table > .ct_table_body dl.active:hover,
+.history-sch-table.ct_table > .ct_table_body dl.context-menu-active {
     background: #8baebc;
     box-shadow: 0 0 4px #656c71;
     color: white;
 }
-#history-sch-edit-modal.ct-form-modal form.uk-form-horizontal .uk-form-label{
+#history-sch-edit-modal.ct-form-modal form.uk-form-horizontal .uk-form-label {
     width: 60px;
 }
@@ -219,6 +219,92 @@
     margin-left: 64px;
 }
+.line-config-tree {
+    padding-top: 15px;
+    border-right: 1px solid #d8d7d7;
+    box-shadow: 3px 1px 17px 0 rgba(0, 0, 0, 0.2), 1px 0px 20px 0 rgba(0, 0, 0, 0.19);
+}
+
+.line-config-tree .title {
+    text-indent: 15px;
+}
+
+.line-config-tree .uk-accordion {
+    /*padding-left: 10px;*/
+}
+
+.line-config-tree .uk-accordion-title {
+    background: none;
+    border: none;
+    color: #000;
+    margin-bottom: 5px;
+    padding-left: 40px;
+}
+
+.line-config-tree .uk-accordion-title:hover {
+    background: #f7f7f7;
+}
+
+.line-config-tree .uk-list-line li {
+    border-color: #ffffff;
+    font-size: 13px;
+    padding-left: 49px;
+    margin-top: 1px;
+}
+
+.line-config-tree .uk-list-line li a {
+    color: #615f5f;
+}
+
+.line-config-tree .uk-list-line li a.disabled{
+    color: #9b9898;
+    cursor: no-drop;
+}
+
+.line-config-tree .uk-accordion-title.uk-active {
+    background: #25a5df;
+    border-radius: 0;
+    color: white;
+    box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.2), 0px 2px 5px 0 rgba(0, 0, 0, 0.19);
+}
+.line-config-tree .uk-list-line li.uk-active a {
+    color: #25a5df;
+}
+.btn_title_line{
+    border-bottom: 1px solid #efeded;
+    margin-top: 35px;
+}
+.z-depth-input{
+    box-shadow: 0px 0px 4px 0 rgba(67, 255, 243, 0.2), 0px 1px 7px 0 rgba(0, 0, 0, 0.19);
+}
+
+.uk-form-icon i{
+    z-index: 999 !important;
+}
+
+.uk-form-icon .uk-autocomplete input{
+    padding-left: 30px;
+}
+
+#nav-line_config-modal form.uk-form{
+    margin-bottom: 7px;
+}
+
+#nav-line_config-modal small{
+    color: #7c7c7c;
+}
+
+#nav-line_config-modal .right-container{
+    padding-top: 20px;
+    overflow: auto;
+    padding-bottom: 20px;
+}
+
+#nav-line_config-modal select,
+#buffer_config_wrap input{
+    margin: 0 5px;
+    width: 110px;
+}
@@ -83,6 +83,7 @@
         (function() {
             var modal = '#home-c0a3-modal';
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 $.post('/directive/c0a4', {nbbm: 'B-99999'});
                 //console.log('init...');
                 setTimeout(function() {
@@ -12,7 +12,7 @@
         <div class="svg-edit-panel-wrap" style="margin-left: 25px;">
             <span class="title-badge">站点重命名</span>
             <div style="height: 100%;">
-                <div style="height: calc(100% - 25px);">
+                <div style="height: calc(100% - 25px);overflow: auto;">
                     <form class="uk-form rename-list-form">
                     </form>
                 </div>
@@ -65,6 +65,7 @@
                     lineCode, names = [], no = 0;
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 lineCode = data.lineCode;
                 var allStationList = gb_data_basic.stationRoutes(lineCode);
                 //站点路由
@@ -125,6 +125,7 @@
             var normalInfo = [];
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 //normal 班次里程和耗时
                 var list = gb_common.get_vals(gb_schedule_table.findScheduleByLine(sch.xlBm));
@@ -131,6 +131,7 @@
                 });
             });
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 parentModal = data.parentModal;
@@ -128,6 +128,7 @@
                 });
             });
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 parentModal = data.parentModal;
@@ -116,6 +116,7 @@
             var modal = '#schedule-dftz-modal'
                     ,sch;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 sch=data.sch;
                 var formHtml = template('schedule-dftz-form-temp', sch);
                 $('form', modal).html(formHtml);
@@ -163,6 +163,7 @@
             var modal = '#schedule-fcxxwt-modal'
               ,sch;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 sch=data.sch;
                 var formHtml = template('schedule-fcxxwt-form-temp', {sch: sch, adjustExps:adjustExps});
                 $('form', modal).html(formHtml);
@@ -87,6 +87,7 @@
             var modal = '#schedule-jhlb-modal',
                 sch;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 //获取车辆所有班次
                 var schArr = gb_common.get_vals(gb_schedule_table.findScheduleByLine(sch.xlBm)).filter(function(item) {
@@ -154,6 +154,7 @@
                     sch, schList, lp2SchMap;
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 f = $('.search-form', modal);
+<div class="uk-modal" id="schedule-lp_change-modal">
+    <div class="uk-modal-dialog" style="width: 900px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>路牌对调</h2></div>
+
+        <div class="uk-grid uk-grid-divider">
+            <div class="uk-width-1-2">
+                <form class="uk-form">
+                    <fieldset>
+                        线路
+                        <select name="lineSelect" style="width: 140px;"></select>
+                        &emsp;
+                        路牌
+                        <select name="lpName" style="width: 90px;"></select>
+                    </fieldset>
+                </form>
+                <div class="sch-list">
+                    <div class="sch-item">
+                        <dl>
+                            <dd>S0568/钱存哗</dd>
+                            <dd>S0J-046</dd>
+                            <dd>5</dd>
+                            <dd>07:58</dd>
+                        </dl>
+                        <dl>
+                            <dd>S0568/钱存哗</dd>
+                            <dd>S0J-046</dd>
+                            <dd>5</dd>
+                            <dd>07:58</dd>
+                        </dl>
+                        <dl>
+                            <dd>S0568/钱存哗</dd>
+                            <dd>S0J-046</dd>
+                            <dd>5</dd>
+                            <dd>07:58</dd>
+                        </dl>
+                        <dl>
+                            <dd>S0568/钱存哗</dd>
+                            <dd>S0J-046</dd>
+                            <dd>5</dd>
+                            <dd>07:58</dd>
+                        </dl>
+                        <dl>
+                            <dd>S0568/钱存哗</dd>
+                            <dd>S0J-046</dd>
+                            <dd>5</dd>
+                            <dd>07:58</dd>
+                        </dl>
+                        <dl>
+                            <dd>S0568/钱存哗</dd>
+                            <dd>S0J-046</dd>
+                            <dd>5</dd>
+                            <dd>07:58</dd>
+                        </dl>
+                        <dl>
+                            <dd>S0568/钱存哗</dd>
+                            <dd>S0J-046</dd>
+                            <dd>5</dd>
+                            <dd>07:58</dd>
+                        </dl>
+                    </div>
+                </div>
+            </div>
+            <div class="uk-width-1-2">
+                <form class="uk-form uk-form-horizontal">
+                    <fieldset>
+                        线路
+                        <select name="lineSelect" style="width: 140px;"></select>
+                        &emsp;
+                        路牌
+                        <select name="lpName" style="width: 90px;"></select>
+                    </fieldset>
+                </form>
+                <div class="sch-list">
+                    <div class="sch-item reverse">
+                        <dl>
+                            <dd>07:58</dd>
+                            <dd>5</dd>
+                            <dd>S0J-046</dd>
+                            <dd>S0568/钱存哗</dd>
+                        </dl>
+                        <dl>
+                            <dd>07:58</dd>
+                            <dd>5</dd>
+                            <dd>S0J-046</dd>
+                            <dd>S0568/钱存哗</dd>
+                        </dl>
+                        <dl>
+                            <dd>07:58</dd>
+                            <dd>5</dd>
+                            <dd>S0J-046</dd>
+                            <dd>S0568/钱存哗</dd>
+                        </dl>
+                        <dl>
+                            <dd>07:58</dd>
+                            <dd>5</dd>
+                            <dd>S0J-046</dd>
+                            <dd>S0568/钱存哗</dd>
+                        </dl>
+                        <dl>
+                            <dd>07:58</dd>
+                            <dd>5</dd>
+                            <dd>S0J-046</dd>
+                            <dd>S0568/钱存哗</dd>
+                        </dl>
+                        <dl>
+                            <dd>07:58</dd>
+                            <dd>5</dd>
+                            <dd>S0J-046</dd>
+                            <dd>S0568/钱存哗</dd>
+                        </dl>
+                        <dl>
+                            <dd>07:58</dd>
+                            <dd>5</dd>
+                            <dd>S0J-046</dd>
+                            <dd>S0568/钱存哗</dd>
+                        </dl>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="uk-modal-footer uk-text-right" >
+            <button type="button" class="uk-button uk-modal-close">取消</button>
+            <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;提交</button>
+        </div>
+    </div>
+
+    <script id="schedule-lp_change-form-temp" type="text/html">
+
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#schedule-lp_change-modal'
+                    , sch;
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+
+            });
+        })();
+    </script>
+</div>
@@ -52,6 +52,7 @@
             var dateStr = moment().format('YYYY-MM-DD');
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 var firstSch = data.list[0];
                 //获取线路配置信息
                 $.get('/lineConfig/getByLineCode', {lineCode: firstSch.xlBm}, function (config) {
@@ -86,6 +86,7 @@
             var modal = '#schedule-multi-tzrc-modal',
                 schArr;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 schArr = data.list;
                 var bodyHtml = template('schedule-multi-tzrc-items-temp', data);
                 $('.tm-grid-truncate', modal).html(bodyHtml);
@@ -71,6 +71,7 @@
             var modal = '#schedule-sftz-modal',
                 sch;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 var formHtml = template('schedule-sftz-form-temp', sch);
                 $('form', modal).html(formHtml);
@@ -248,6 +248,7 @@
                     sch, stationRoutes, parks, information, esCode, timeLocStations;
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 //站点路由
@@ -130,6 +130,7 @@
                     sch, stationRoutes, parks, information;
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 var formHtml = template('sub-task-other-form-temp', {sch: sch, adjustExps: adjustExps});
                 $('form', modal).html(formHtml);
@@ -180,6 +180,7 @@
                     emptyForm = $('form[empty_form]', modal),
                     sch, stationRoutes, parks, information, esCode;
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 $('.linkToLineInfo', modal).attr('href', '/pages/base/lineinformation/list.html?no=' + gb_data_basic.codeToLine[sch.xlBm].id);
@@ -272,6 +272,7 @@
             //掉头站点
             var turnStation, turnStationName;
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 nextSch = gb_schedule_table.getNextSch(sch);
@@ -29,6 +29,7 @@
             });
             $(drawer).on('drawer-init', function (e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 locData = window.localStorage.getItem('control_route_distance_' + sch.xlBm);
@@ -108,7 +108,7 @@
             </dd>
             <dd>{{sch.clZbh}}</dd>
             <dd>{{sch.jGh}}/{{sch.jName}}</dd>
-            <dd>{{sch.sGh}}/{{sch.sName}}</dddd>
+            <dd>{{sch.sGh}}/{{sch.sName}}</dd>
         </dl>
         {{/each}}
     </script>
@@ -117,6 +117,7 @@
             var modal = '#schedule-tzrc-modal',
                 sch, schList, lp2SchMap;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 sch = data.sch;
                 //线路下拉框
@@ -102,6 +102,7 @@
             var pageSize = 12;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 //车辆 autocomplete
                 $.get('/basic/cars', function(rs) {
                     gb_common.carAutocomplete($('.autocomplete-cars', modal), rs);
@@ -107,6 +107,7 @@
             }
             $('#directive-history-modal').on('init', function(e, data) {
+                e.stopPropagation();
                 // autocomplete
                 $.get('/basic/cars', function(rs) {
                     cars = rs;
@@ -104,6 +104,7 @@
         (function () {
             var modal = '#history-sch-maintain-modal';
             $(modal).on('init', function (e, data) {
+                e.stopPropagation();
                 $.get('/realSchedule/dateArray', function (rs) {
                     //日期tab
                     var tsStr = '';
+<!-- 缓冲区设置 和 应急停靠 -->
+<div id="buffer_config_wrap">
+    <div>
+        <h2 class="btn_title_line">
+            <a class="uk-link-reset">到站缓冲区设置</a>
+        </h2>
+        <div>
+            <form class="uk-form">
+                <div class="uk-form-row">
+                    到达上行加
+                    <input type="number" class="z-depth-input" value="60">
+                    秒
+                </div>
+                <div class="uk-form-row">
+                    上行发出减
+                    <input type="number" class="z-depth-input" value="60">
+                    秒
+                </div>
+                <div class="uk-form-row">
+                    到达下行加
+                    <input type="number" class="z-depth-input" value="60">
+                    秒
+                </div>
+                <div class="uk-form-row">
+                    下行发出减
+                    <input type="number" class="z-depth-input" value="60">
+                    秒
+                </div>
+            </form>
+            <a style="font-size: 80%;">编辑电子围栏</a>
+        </div>
+    </div>
+
+    <div>
+        <h2 class="btn_title_line">
+            <a class="uk-link-reset">应急停靠</a>
+        </h2>
+        <div>
+            <form class="uk-form">
+                <table >
+                    <tr>
+                        <td colspan="2" style="padding-left: 30px;">
+                            是否启用
+                            <select class="z-depth-input">
+                                <option>禁用</option>
+                                <option>启用</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="2" style="padding-left: 58px;">
+                            时间
+                            <input type="time" disabled>至
+                            <input type="time" disabled>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            上行停靠时间
+                            <input type="number" disabled>分钟
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            下行停靠时间
+                            <input type="number" disabled>分钟
+                        </td>
+                    </tr>
+                </table>
+            </form>
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var wrap = '#buffer_config_wrap',
+                    conf;
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                conf = data.lineConfig;
+
+
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<div id="nav-line_config-modal" class="uk-modal">
+    <div class="uk-modal-dialog uk-modal-dialog-blank">
+        <button class="uk-modal-close uk-close" type="button"></button>
+        <div class="uk-grid uk-flex-middle" data-uk-grid-margin>
+            <div class="uk-width-medium-1-6 uk-height-viewport line-config-tree" data-uk-observe>
+                <h3 class="title" >线路配置</h3>
+                <div class="uk-accordion" data-uk-accordion="{showfirst:false}"></div>
+            </div>
+            <div class="uk-width-medium-5-6 uk-height-viewport right-container" >
+                <div id="line_config_entity_panel"></div>
+                <div id="buffer_config_panel"></div>
+            </div>
+        </div>
+    </div>
+
+
+    <script id="nav-line_config-modal-tree-temp" type="text/html">
+            {{each array as line i}}
+            <h3 class="uk-accordion-title" data-id="{{line.lineCode}}">{{line.name}}</h3>
+            <div class="uk-accordion-content">
+                <ul class="uk-list uk-list-line">
+                    <li><a>班次更新时间</a></li>
+                    <li><a>出场时间类型</a></li>
+                    <li><a>原线路回场</a></li>
+                    <li><a>到站缓冲区设置</a></li>
+                    <li><a>应急停靠</a></li>
+                    <li><a class="disabled">漂移判定</a></li>
+                    <li><a class="disabled">到离站预测</a></li>
+                    <li><a class="disabled">挂牌时刻表</a></li>
+                </ul>
+            </div>
+            {{/each}}
+    </script>
+
+    <script>
+        (function () {
+            var modal = '#nav-line_config-modal',
+                    lineConfig, activeCode;
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+                var htmlStr = template('nav-line_config-modal-tree-temp', {array: gb_data_basic.activeLines});
+                $('.line-config-tree .uk-accordion', modal).html(htmlStr);
+
+                var $first = $('.uk-accordion-title:eq(0)', modal);
+                activeCode = $first.data('id');
+                load();
+
+                setTimeout(function () {
+                    //选中第一条线路
+                    $first.trigger('click');
+                }, 400);
+            });
+
+            var load = function () {
+                //获取线路配置信息
+                $.get('/lineConfig/getByLineCode', {lineCode: activeCode}, function (conf) {
+                    lineConfig = conf;
+
+                    loadConfigEntity();
+                    loadBufferConfig();
+                });
+            };
+
+            //线路配置表属性设置
+            var loadConfigEntity = function () {
+                $.get('/real_control_v2/fragments/north/nav/line_config/line_config_entity.html', function (attrDom) {
+                    $('.right-container #line_config_entity_panel', modal)
+                            .append(attrDom)
+                            .find('#line_config_entity_wrap')
+                            .trigger('init', {lineConfig: lineConfig});
+                });
+            };
+
+            //缓冲区设置
+            var loadBufferConfig = function () {
+                $.get('/real_control_v2/fragments/north/nav/line_config/buffer_config.html', function (attrDom) {
+                    $('.right-container #buffer_config_panel', modal)
+                            .append(attrDom)
+                            .find('#buffer_config_wrap')
+                            .trigger('init', {lineConfig: lineConfig});
+                });
+            };
+        })();
+    </script>
+</div>
+<!-- 线路配置表相关属性 -->
+<div id="line_config_entity_wrap">
+    <form class="uk-form"></form>
+
+    <script id="line_config_entity_form-temp" type="text/html">
+        <div>
+            <h2 class="btn_title_line">
+                <a class="uk-link-reset">班次更新时间</a>
+            </h2>
+            <div>
+                <div>
+                    闵行11路每天
+                    <div class="uk-form-icon" style="margin: 0 5px;">
+                        <i class="uk-icon-clock-o"></i>
+                        <input type="text" class="z-depth-input" value="{{startOpt}}" style="width: 151px;"
+                               data-uk-timepicker>
+                    </div>
+                    更新到当日排班
+                </div>
+                <ul class="uk-list">
+                    <li>
+                        <small><i class="uk-icon-question-circle"></i> 所有发车时间小于该时间的班次都默认跨过24点，手动调整的实发实达均应用此规则。</small>
+                    </li>
+                </ul>
+                    <a class="uk-button uk-button-mini">删除班次</a>
+                    <a class="uk-button uk-button-mini">重新加载计划排班</a>
+                    <a class="uk-button uk-button-mini">加载历史GPS恢复到离站</a>
+            </div>
+        </div>
+        <div>
+            <h2 class="btn_title_line">
+                <a class="uk-link-reset">出场时间类型</a>
+            </h2>
+            <div>
+                使用
+                <select class="z-depth-input">
+                    <option {{if outConfig==0}}selected{{/if}}>GPS出场</option>
+                    <option {{if outConfig==1}}selected{{/if}}>请求出场</option>
+                    <option {{if outConfig==2}}selected{{/if}}>出站既出场</option>
+                </select>
+                时间作为进出场班次的实际时间
+                <ul class="uk-list">
+                    <li>
+                        <small>1、【GPS出场】 使用GPS信号捕获出场时间</small>
+                    </li>
+                    <li>
+                        <small>2、【请求出场】 驾驶员请求出场，调度员同意后，取请求时间作为出场时间。如无请求出场，则捕获GPS时间。</small>
+                    </li>
+                    <li>
+                        <small>3、【出站既出场】 忽略出场班次，以头班车的发车时间作为出场时间，场既是站或停车场与起点站距离很近时推荐此项。</small>
+                    </li>
+                </ul>
+            </div>
+        </div>
+
+        <div>
+            <h2 class="btn_title_line">
+                <a class="uk-link-reset">原线路回场</a>
+            </h2>
+            <div>
+                是否启用
+                <select class="z-depth-input">
+                    <option>禁用</option>
+                    <option>启用</option>
+                </select>
+
+                <ul class="uk-list">
+                    <li>
+                        <small><i class="uk-icon-question-circle"></i> 回场时先回起点站，然后起点站回场。</small>
+                    </li>
+                    <li>
+                        <small><i class="uk-icon-question-circle"></i> 启用该项后，回场子任务公里 = 中途站到起点站间公里 + 线路标准回场公里 。</small>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </script>
+    <script>
+        (function () {
+
+            var wrap = '#line_config_entity_wrap', conf;
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                conf = data.lineConfig;
+                var htmlStr = template('line_config_entity_form-temp', conf);
+                $('form', wrap).html(htmlStr);
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -77,6 +77,7 @@
             var pageSize = 12;
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 var opt='';
                 for(var code in gb_common.reqCode80){
                     opt+='<option value="'+code+'">'+gb_common.reqCode80[code]+'</option>';
@@ -37,6 +37,7 @@
             var f = $('form', modal);
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
                 var val = gb_signal_state.isEnable()?1:0;
                 $('[name=enable]', f).val(val);
             });
@@ -73,6 +73,7 @@
             var f = $('form', modal);
             $(modal).on('init', function(e, data) {
+                e.stopPropagation();
               var config=gb_tts.defaultConfig();
               for(var name in config)
                 $('[name='+name+']', f).val(config[name]).trigger('change');
@@ -131,7 +131,12 @@ var gb_common = (function () {
         var data = groupBy(get_vals(allGps), 'lineId');
         var name;
         for (var code in data) {
-            name = gb_data_basic.codeToLine[code].name;
+            try{
+                name = gb_data_basic.codeToLine[code].name;
+            }catch(e) {
+                continue;
+            }
+
             data[name] = groupBy(data[code], 'upDown');
             treeData.push({
                 'text': name,
-[      {
-         "id": 1,
-         "text": "数据&统计",
-         "clazz": "dropdown-column-2",
-         "columns": true,
-         "cls_class": "uk-width-1-2",
-         "grid": [
-           [
-             {
-               "id": 1.12,
-               "text": "数据管理",
-               "header": 1
-             },
-             {
-               "id": 1.52,
-               "text": "历史班次维护",
-               "event": "history_sch_maintain"
-             }
-           ],
-           [
-             {
-               "id": 1.1,
-               "text": "统计分析",
-               "header": 1
-             },
-             {
-               "id": 1.2,
-               "text": "出车率",
-               "event": "turnout_rate",
-               "icon": "uk-icon-pie-chart"
-             },
-             {
-               "id": 1.3,
-               "text": "设备上线率",
-               "event": "device_online_rate",
-               "icon": "uk-icon-pie-chart"
-             },
-             {
-               "id": 1.4,
-               "divider": true
-             },
-             {
-               "id": 1.5,
-               "text": "班次执行率",
-               "event": "sch_exec_rate",
-               "icon": "uk-icon-pie-chart"
-             },
-             {
-               "id": 1.6,
-               "text": "线路首末班准点率",
-               "event": "s_e_punctuality_rate_line",
-               "icon": "uk-icon-pie-chart"
-             },
-             {
-               "id": 1.7,
-               "text": "车辆首末班准点率",
-               "event": "s_e_punctuality_rate",
-               "icon": "uk-icon-pie-chart"
-             }
-           ]
-         ]
-       }, {
-    "id": 2,
-    "text": "车载设备",
-    "children": [{
-        "id": 2.1,
-        "text": "设备管理",
-        "event": "",
-        "disabled": "disabled"
-    }, {
-        "id": 2.2,
-        "text": "设备上报记录",
-        "event": "device_report",
-        "disabled": "disabled"
-    }, {
-        "id": 2.3,
-        "text": "指令下发记录",
-        "event": "directive_history"
-    }]
-}, {
-    "id": 3,
-    "text": "系统设置",
-    "children": [{
-        "id": 3.1,
-        "text": "TTS",
-        "event": "",
-        "disabled": "disabled"
-    }, {
-        "id": 3.2,
-        "text": "更新日志",
-        "event": "",
-        "disabled": "disabled"
-    }]
-}]
@@ -90,12 +90,12 @@
     "text": "系统设置",
     "children": [
       {
-        "id": 3.1,
+        "id": 3.2,
         "text": "TTS",
         "event": "tts_config"
       },
       {
-        "id": 3.2,
+        "id": 3.3,
         "text": "信号标记",
         "event": "signal_state"
       }
@@ -117,6 +117,11 @@ var gb_schedule_context_menu = (function () {
                     Cancel: '取消'
                 }
             });
+        },
+        lp_change: function (sch) {
+            open_modal(folder + '/lp_change.html', {
+                sch: sch
+            }, modal_opts);
         }
     };
@@ -161,6 +166,11 @@ var gb_schedule_context_menu = (function () {
             },
             'zlcf': {
                 name: '指令重发'
+            },
+            'sep3': '---------',
+            'lp_change': {
+                name: '路牌对调',
+                disabled: true
             }
         }
     });
@@ -77,8 +77,11 @@ var gb_northToolbar = (function () {
         },
         signal_state: function () {
             open_modal('/real_control_v2/fragments/north/nav/signal_state_config.html', {}, modal_opts);
+        },
+        line_config: function () {
+            open_modal('/real_control_v2/fragments/north/nav/line_config/line_config.html', {}, modal_opts);
         }
-    }
+    };
     return {
         user: function () {
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" />
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" />
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" />
-    <!--<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slider.gradient.min.css" />-->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" />
     <!-- main style -->
     <link rel="stylesheet" href="/real_control_v2/css/main.css" />
@@ -87,7 +87,9 @@
     <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js"></script>
     <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js"></script>
     <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js"></script>
-    <!--<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/slider.min.js"></script>-->
+    <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js"></script>
+    <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js"></script>
+
     <!-- jquery contextMenu -->
     <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"></script>
     <script src="/real_control_v2/assets/js/jquery.ui.position.min.js"></script>
@@ -139,12 +139,35 @@ var gb_map_gps_tree = (function () {
         }, 'last', cb);
     };
+    var openLineNode = function (lineId, cb) {
+        var tree = treeObj.jstree(true);
+        tree.open_node(tree.get_node('map_tree_line_' + lineId), function () {
+            var upNode = tree.get_node('map_tree_route_' + lineId + '_0')
+                ,downNode = tree.get_node('map_tree_route_' + lineId + '_1');
+
+            tree.open_node(upNode, function () {
+                tree.open_node(downNode, cb);
+            });
+        });
+    };
+
+    var moveNode = function (i, gps) {
+        var tree = treeObj.jstree(true)
+            ,lineId = gps.lineId;
+        openLineNode(lineId, function () {
+            var node = tree.get_node('map_tree_device_' + gps.nbbm);
+            //移动节点
+            var parent = tree.get_node('map_tree_route_' + lineId + '_' + gps.upDown);
+            treeObj.jstree(true).move_node(node, parent);
+        });
+    };
+    
     /**
      * 上下行改变
      * @param changeArray
      */
     var changeUpDown = function (changeArray) {
-        console.log('changeUpDown', changeArray);
+        $.each(changeArray, moveNode);
     };
     /**
@@ -193,10 +216,6 @@ var gb_map_gps_tree = (function () {
     };
     var selectitem = function (event, data, acobject) {
-        //var deviceId = gb_data_basic.nbbm2deviceMap()[data.value];
-        //gb_map_imap.call('drawRealGpsMarker', {gpsList: [gb_data_gps.findOne(deviceId)]});
-        //地图定位
-        //gb_map_overlay_mge._focus(gb_data_basic.nbbm2deviceMap()[data.value]);
         var tree = treeObj.jstree(true)
         var deviceId = gb_data_basic.nbbm2deviceMap()[data.value]