Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

娄高锋
2 parents 130d36da e968bffb
Showing 42 changed files with 1463 additions and 354 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/sys/RealControAuthorityController.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/entity/sys/RealControAuthority.java
src/main/java/com/bsth/entity/sys/UserLine.java
src/main/java/com/bsth/repository/sys/RealControAuthorityRepository.java
src/main/java/com/bsth/service/realcontrol/RealMapService.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/java/com/bsth/service/sys/RealControAuthorityService.java
src/main/java/com/bsth/service/sys/impl/RealControAuthorityServiceImpl.java
src/main/resources/static/assets/js/common.js
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/pages/permission/user/controlAllot.html
src/main/resources/static/pages/permission/user/list.html
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTable.js
src/main/resources/static/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
@@ -49,6 +49,11 @@ public class RealMapController {
         return realMapService.findRouteByLine(lineCode);
     }
+    @RequestMapping(value = "/multiRouteByLine")
+    public Map<String, Object> multiRouteByLine(@RequestParam String codeStr) {
+        return realMapService.multiRouteByLine(codeStr);
+    }
+
     /**
      * 获取线路的路段路由 和 站点路由信息 （为前端站间距计算提供数据源）
+package com.bsth.controller.sys;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.sys.RealControAuthorityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@RestController
+@RequestMapping("realControAuthority")
+public class RealControAuthorityController extends BaseController<RealControAuthority, Integer> {
+
+    @Autowired
+    RealControAuthorityService realControAuthorityService;
+
+    @RequestMapping("findByUserId")
+    public RealControAuthority findByUserId(@RequestParam Integer userId){
+
+        return realControAuthorityService.findByUserId(userId);
+    }
+
+    @RequestMapping("findByCurrentUser")
+    public RealControAuthority findByUserId(HttpServletRequest request){
+        return realControAuthorityService.findByUserId(SecurityUtils.getCurrentUser().getId());
+    }
+}
@@ -88,6 +88,9 @@ public class GpsEntity {
 	/** 越界距离 */
 	private double outOfBoundDistance;
+	/** gps是否有效 设备端发送的状态 */
+	private int valid;
+
 	public Integer getCompanyCode() {
 		return companyCode;
 	}
@@ -280,4 +283,12 @@ public class GpsEntity {
 	public void setOutOfBoundDistance(double outOfBoundDistance) {
 		this.outOfBoundDistance = outOfBoundDistance;
 	}
+
+	public int getValid() {
+		return valid;
+	}
+
+	public void setValid(int valid) {
+		this.valid = valid;
+	}
 }
@@ -52,7 +52,7 @@ public class GpsRealData implements CommandLineRunner {
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
         //定时从网关获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 15, TimeUnit.SECONDS);
         //定时扫描掉离线
     }
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * 线调权限配置
+ * Created by panzhao on 2017/2/14.
+ */
+@Entity
+@Table(name = "bsth_c_real_control_authority")
+public class RealControAuthority {
+
+    @Id
+    private Integer userId;
+
+    /**
+     * 可调度的线路 , 分隔多个
+     */
+    private String lineCodeStr;
+
+    /**
+     * 调度模式 0: 监控模式  1：主调模式
+     */
+    private int pattern;
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public String getLineCodeStr() {
+        return lineCodeStr;
+    }
+
+    public void setLineCodeStr(String lineCodeStr) {
+        this.lineCodeStr = lineCodeStr;
+    }
+
+    public int getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(int pattern) {
+        this.pattern = pattern;
+    }
+}
 package com.bsth.entity.sys;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
 import com.bsth.entity.Line;
+import javax.persistence.*;
+
 /**
  * 
  * @ClassName: Line(用户线路分配实体类)
@@ -20,6 +15,8 @@ import com.bsth.entity.Line;
  * @Date 2016年8月26日 09:03:33
  *
  * @Version 公交调度系统BS版 0.1
+ *
+ * PS：这个类缺少主调监控模式的配置，暂不使用
  * 
  */
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@Repository
+public interface RealControAuthorityRepository extends BaseRepository<RealControAuthority, Integer>{
+
+    @Query("select t from RealControAuthority t where t.userId=?1")
+    RealControAuthority findByUserId(Integer userId);
+}
@@ -15,4 +15,6 @@ public interface RealMapService {
     Map<String,Object> findRouteAndStationByLine(String lineCode);
     Map<String,Object> multiSectionRoute(String codeIdx);
+
+    Map<String,Object> multiRouteByLine(String codeStr);
 }
@@ -159,6 +159,17 @@ public class RealMapServiceImpl implements RealMapService {
         return rs;
     }
+    @Override
+    public Map<String, Object> multiRouteByLine(String codeStr) {
+        List<String> codeArray = Splitter.on(",").splitToList(codeStr);
+        Map<String, Object> rs = new HashMap<>();
+
+        for(String code : codeArray){
+            rs.put(code + "_route" ,findRouteByLine(code));
+        }
+        return rs;
+    }
+
     /**
      * wgs 坐标数组转 百度
      *
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+public interface RealControAuthorityService extends BaseService<RealControAuthority, Integer> {
+    RealControAuthority findByUserId(Integer userId);
+}
+package com.bsth.service.sys.impl;
+
+import com.bsth.entity.sys.RealControAuthority;
+import com.bsth.repository.sys.RealControAuthorityRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.RealControAuthorityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by panzhao on 2017/2/14.
+ */
+@Service
+public class RealControAuthorityServiceImpl extends BaseServiceImpl<RealControAuthority, Integer> implements RealControAuthorityService {
+
+    @Autowired
+    RealControAuthorityRepository realControAuthorityRepository;
+
+    @Override
+    public RealControAuthority findByUserId(Integer userId) {
+        return realControAuthorityRepository.findByUserId(userId);
+    }
+}
@@ -119,6 +119,8 @@ function initPinYinSelect2(selector, data, cb){
 		$(selector).select2({
 			data: data,
 		    matcher: oldMatcher(function(term, text, item){
+				if(!item.id)
+					return;
 		    	var upTerm = term.toUpperCase();
 				if(item.fullChars.indexOf(upTerm) != -1
 						|| item.camelChars.indexOf(upTerm) != -1)
@@ -289,6 +289,11 @@
     {{/each}}
 </script>
+<script>
+    delete window.require;
+    delete window.exports;
+    delete window.module;
+</script>
 <!-- jQuery -->
 <script src="/metronic_v4.5.4/plugins/jquery.min.js" data-exclude=1></script>
 <!-- bootstrap -->
@@ -220,6 +220,11 @@ h3.logo-text{
 		<div class="login-footer"> © 2016 上海巴士拓华科技发展有限公司 Some Rights Reserved </div>
 	</div>
+<script>
+	delete window.require;
+	delete window.exports;
+	delete window.module;
+</script>
 <!-- jQuery -->
 <script src="/metronic_v4.5.4/plugins/jquery.min.js" ></script>
 <script src="/assets/plugins/jsencrypt.min.js" ></script>
@@ -228,7 +233,7 @@ window.onload=function(){
     var body=document.getElementsByTagName("body")[0];
     if(typeof body.style.WebkitAnimation=="undefined")
     	$('.warn-note').fadeIn();
-}
+};
 !function(){
 	var form = $('#loginPanel form')
 		,nameInput = $('input[name=userName]', form)
@@ -112,10 +112,10 @@
         margin-bottom: 3px;
     }
-    /** 闵行没有分公司，直接隐藏 */
+    /** 闵行没有分公司，直接隐藏
     .company, .sub-company {
         display: none !important;
-    }
+    } */
 </style>
 <div class="page-head">
@@ -138,6 +138,8 @@
                 class="caption-subject font-green bold uppercase">选择线路</span>
         </div>
     </div>
+    <div class="alert alert-info">
+        <strong>ps</strong> 可选择的线路，进入后是监控还是主调模式。可在 权限管理-> 用户管理里 进行配置。 </div>
     <div class="portlet-body">
         <div class="row" style="margin-bottom: 30px;">
             <div class="col-md-8 col-sm-12 col-md-offset-2" style="text-align: center;">
@@ -162,11 +164,11 @@
                     <div class="selected-body"></div>
                     <div class="lb_panel">
-                        <a href="javascript:;" class="btn btn-lg blue gotoControl red" data-status=1>
-                            <i class="fa fa-power-off"></i> 主调模式 </a>
+                        <a href="javascript:;" class="btn btn-lg blue gotoControl" data-status=1>
+                            <i class="fa fa-power-off"></i> 进入线路调度 </a>
-                        <a href="javascript:;" id="monitor" class="btn btn-lg grey gotoControl" data-status=0>
-                            <i class="fa fa-tv"></i> 监控模式 </a>
+                        <!--<a href="javascript:;" id="monitor" class="btn btn-lg grey gotoControl" data-status=0>
+                            <i class="fa fa-tv"></i> 监控模式 </a>-->
                         &nbsp;
                         <a href="javascript:;" id="resetBtn" style="left: 120px;color: #3598DC;">
                             <i class="fa fa-history"></i> 重置</a>
@@ -184,15 +186,13 @@
 </div>
 <script id="line_select_cont_temp" type="text/html">
-    {{each data as obj company}}
-    <h3 class="company">{{company}}</h3>
-    {{each data[company] as subObj subCompany}}
-    <h5 class="sub-company" style="font-family: 仿宋;">{{company}}_{{subCompany}}</h5>
-    {{each data[company][subCompany] as line i}}
+    {{each list as line i}}
     <div class="line" name="line_{{line.lineCode}}" data-id={{line.lineCode}}>{{line.name}}</div>
     {{/each}}
-    {{/each}}
-    {{/each}}
+
+    {{if list.length == 0}}
+    <span style="color: #ff4444;font-family: 微软雅黑;"><i class="fa fa-question-circle"></i> 当前用户没有可调度的线路</span>
+    {{/if}}
 </script>
 <script src="/assets/js/eventproxy.js"></script>
 <script>
@@ -213,64 +213,58 @@
         var lineIds = {};
         var storage = window.localStorage;
-
+        //线调权限
+        var auth;
         $get('/line/all', {destroy_eq: 0}, function (allLine) {
-            $('#searchLineInput').focus();
-            //按公司分组
-            var companyJson = groupData(allLine, 'company');
-            //按分公司分组
-            for (var company in companyJson) {
-                companyJson[company] = groupData(companyJson[company], 'brancheCompany');
-            }
+            //用户分配的线路
+            $.get('/realControAuthority/findByCurrentUser', function (t) {
+                auth = t;
+                var newArray = [], authArray = [];
+
+                try{
+                    authArray = t.lineCodeStr.split(',');
+                }catch (e){}
+
+                $.each(allLine, function () {
+                    if (this.lineCode && authArray.indexOf(this.lineCode) != -1) {
+                        newArray.push(this);
+                    }
+                });
-            var htmlStr = template('line_select_cont_temp', {data: companyJson});
-            $('.line-select-body').html(htmlStr)
-                    .slimscroll({//滚动条
-                        height: '270px'
-                    });
-
-            //替换公司编码
-            /* 		var gsmap = {};
-             $get('/business/all', null, function(array){
-             $.each(array, function(i, gs){
-             var k = gs.upCode + '_' + gs.businessCode;
-             if(gs.upCode === '88'){
-             k = gs.businessCode;
-             }
-             gsmap[k] = gs.businessName;
-             });
-
-             $.each($('.company,.sub-company'), function(j , e){
-             var k = $(e).text();
-             gsmap[k] &&	$(e).text(gsmap[k]);
-             })
-             }); */
-
-            //映射
-            $.each(allLine, function (s, line) {
-                camelChars[pinyin.getCamelChars(line.name)] = line.lineCode;
-                fullChars[pinyin.getFullChars(line.name).toUpperCase()] = line.lineCode;
-                zhChars[line.name] = line.lineCode;
-                lineIdMap[line.lineCode] = line;
-
-                lineIds[line.lineCode] = line.name;
-            });
-            //合并映射
-            $.extend(allChars, camelChars, fullChars, zhChars);
-
-            //线路选中事件
-            $('.line-select-body .line').on('click', function () {
-                if ($(this).hasClass('active')) {
-                    $(this).removeClass('active');
-                    $('.selected-body .line[name=' + $(this).attr('name') + ']').remove();
-                }
-                else {
-                    $(this).addClass('active');
-                    $('.selected-body').append($(this).clone());
-                }
+                var htmlStr = template('line_select_cont_temp', {list: newArray});
+                $('.line-select-body').html(htmlStr)
+                        .slimscroll({//滚动条
+                            height: '270px'
+                        });
+
+                //映射
+                $.each(allLine, function (s, line) {
+                    camelChars[pinyin.getCamelChars(line.name)] = line.lineCode;
+                    fullChars[pinyin.getFullChars(line.name).toUpperCase()] = line.lineCode;
+                    zhChars[line.name] = line.lineCode;
+                    lineIdMap[line.lineCode] = line;
+
+                    lineIds[line.lineCode] = line.name;
+                });
+                //合并映射
+                $.extend(allChars, camelChars, fullChars, zhChars);
+
+                //线路选中事件
+                $('.line-select-body .line').on('click', function () {
+                    if ($(this).hasClass('active')) {
+                        $(this).removeClass('active');
+                        $('.selected-body .line[name=' + $(this).attr('name') + ']').remove();
+                    }
+                    else {
+                        $(this).addClass('active');
+                        $('.selected-body').append($(this).clone());
+                    }
+                });
+
+                storage.setItem('lineIds', JSON.stringify(lineIds));
             });
-            storage.setItem('lineIds', JSON.stringify(lineIds));
+            $('#searchLineInput').focus();
         });
         //搜索框事件
@@ -304,9 +298,9 @@
             });
             storage.setItem('lineControlItems', JSON.stringify(lsData));
-            var operationMode = $(this).data('status');
+            //ar operationMode = $(this).data('status');
             //监控模式还是主调模式
-            storage.setItem('operationMode', operationMode);
+            storage.setItem('operationMode', auth.pattern);
             var ep = new EventProxy();
             //缓存车辆自编号和设备号对照
+<div id="pageRealControlAllotWrap" style="overflow: hidden;padding: 15px 15px 0;">
+
+    <style>
+        #pageRealControlAllotWrap span.line-item {
+            background: #efefef;
+            padding: 4px 11px;
+            margin: 0 3px 11px 8px;
+            box-shadow: 0px 1px 3px 0 rgba(71, 69, 69, 0.2), 1px 2px 3px 0 rgba(96, 94, 94, 0.19);
+            position: relative;
+            border: 1px solid #c5c0c0;
+            display: inline-block;
+        }
+
+        #pageRealControlAllotWrap .remove-icon {
+            position: absolute;
+            right: -5px;
+            top: -5px;
+            color: #ffffff;
+            background: #ff4646;
+            border-radius: 99px;
+            font-size: 12px;
+            cursor: pointer;
+            padding: 0px 1px;
+        }
+
+        .select2-container {
+            z-index: 99891017;
+        }
+    </style>
+
+    <h4>
+        mky001/ 系统管理员
+    </h4>
+
+    <div style="border: 1px solid #cccbcb;height: 190px;position: relative;">
+        <span style="display: block;margin: 10px;color: grey;">已分配的线路</span>
+
+        <div class="line-list" style="height: 110px;">
+        </div>
+
+        <div style="padding-left: 8px;">
+            <div style="display: inline-block;">
+                <select name="lineSelect" style="width: 160px;">
+                    <option value="">请选择线路...</option>
+                </select>
+            </div>
+
+            <button disabled type="button" id="addLineItemBtn" class="btn blue btn-sm" style="margin-top: -10px;"><i
+                    class="fa fa-plus"></i> 添加线路
+            </button>
+        </div>
+    </div>
+
+    <div style="margin-top: 15px;">
+        <form class="form-horizontal">
+            <div class="form-group" style="width: 50%;">
+                <label class="col-md-5 control-label">系统运行模式</label>
+                <div class="col-md-7">
+                    <select class="form-control" name="pattern">
+                        <option value="0">监控模式</option>
+                        <option value="1">主调模式</option>
+                    </select>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <button class="btn blue btn-block" id="saveBtn"><i class="fa fa-check"></i> 保存</button>
+    <script>
+        !function () {
+            var wrap = '#pageRealControlAllotWrap'
+                    , lineSelect = $('select[name=lineSelect]', wrap)
+                    , addBtn = $('#addLineItemBtn', wrap);
+
+            var userId;
+            var codeNameMap = {};
+            $(wrap).on('init', function (e, id) {
+                e.stopPropagation();
+                userId = id;
+
+                $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+                    var data = [];
+                    $.each(rs, function () {
+                        data.push({
+                            id: this.lineCode,
+                            text: this.name
+                        });
+                        codeNameMap[this.lineCode] = this.name;
+                    });
+
+                    initPinYinSelect2(lineSelect, data);
+
+                    $.get('/realControAuthority/findByUserId', {userId: userId}, function (t) {
+                        if(!t || !t.lineCodeStr)
+                            return;
+                        var lineArray = t.lineCodeStr.split(',');
+                        var htmlStr = '';
+                        $.each(lineArray, function (i, code) {
+                            if(!code)
+                                return;
+                            htmlStr += '<span class="line-item" data-id="'+code+'"><i class="fa fa-remove remove-icon"></i>'+codeNameMap[code]+'</span>';
+                        });
+
+                        $('.line-list', wrap).html(htmlStr);
+
+                        $('select[name=pattern]', wrap).val(t.pattern);
+                    });
+                });
+            });
+
+            lineSelect.on('change', function () {
+                if ($(this).val() == '') {
+                    addBtn.attr('disabled', 'disabled');
+                }
+                else {
+                    addBtn.removeAttr('disabled');
+                }
+            });
+
+            addBtn.on('click', function () {
+                var code = lineSelect.val(),
+                        name = codeNameMap[code];
+
+                if($('.line-list .line-item[data-id='+code+']').length > 0){
+                    alert(name + '已分配，无法重复操作！');
+                    return;
+                }
+                $('.line-list', wrap).append('<span class="line-item" data-id="'+code+'"><i class="fa fa-remove remove-icon"></i>'+name+'</span>');
+            });
+
+            $(wrap).on('click', '.remove-icon', function () {
+                $(this).parent().remove();
+            });
+
+            //保存
+            $('#saveBtn', wrap).on('click', function () {
+                var data = $('form', wrap).serializeJSON();
+                var lineCodeStr = '';
+                $('.line-list .line-item', wrap).each(function () {
+                    lineCodeStr += ($(this).data('id') + ',');
+                });
+
+                data.lineCodeStr = lineCodeStr;
+
+                if(!userId){
+                    alert('无法获取到用户ID');
+                    return;
+                }
+
+                data.userId = userId;
+
+                $.post('/realControAuthority', data, function (rs) {
+                    alert('保存成功！');
+                });
+            });
+        }();
+    </script>
+</div>
 \ No newline at end of file
@@ -21,29 +21,7 @@
 				</div>
 				<div class="actions">
 					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a>
-					<!-- <button type="button" class="btn btn-circle red" disabled="disabled" id="removeButton"><i class="fa fa-trash"></i> 删除用户</button> -->
-					<div class="btn-group">
-						<a class="btn red btn-outline btn-circle" href="javascript:;"
-							data-toggle="dropdown"> <i class="fa fa-share"></i> <span
-							class="hidden-xs"> 系统工具 </span> <i class="fa fa-angle-down"></i>
-						</a>
-						<ul class="dropdown-menu pull-right" id="datatable_ajax_tools">
-							<li><a href="javascript:;" data-action="0"
-								class="tool-action"> <i class="fa fa-print"></i> 打印
-							</a></li>
-							<li><a href="javascript:;" data-action="1"
-								class="tool-action"> <i class="fa fa-copy"></i> 复制
-							</a></li>
-							<li><a href="javascript:;" data-action="3"
-								class="tool-action"> <i class="fa fa-file-excel-o"></i>
-									导出Excel
-							</a></li>
-							<li class="divider"></li>
-							<li><a href="javascript:;" data-action="5"
-								class="tool-action"> <i class="fa fa-refresh"></i> 刷新数据
-							</a></li>
-						</ul>
-					</div>
+
 				</div>
 			</div>
 			<div class="portlet-body">
@@ -134,6 +112,7 @@
 	</td>
 	<td>
 		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
+		<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>
 	</td>
 </tr>
 {{/each}}
@@ -150,7 +129,7 @@ $(function(){
 	var icheckOptions = {
 	    checkboxClass: 'icheckbox_flat-blue',
 	    increaseArea: '20%'
-	}
+	};
 	jsDoQuery(null,true);
@@ -204,6 +183,8 @@ $(function(){
 				showPagination(data);
 			}
 			layer.close(i);
+
+			$('.line_allot_btn').on('click', openAllotWindow);
 		});
 	}
@@ -244,6 +225,22 @@ $(function(){
 		});
 	}
+	function openAllotWindow() {
+		var id = $(this).data('id');
+		$.get('/pages/permission/user/controlAllot.html', function (content) {
+			layer.open({
+				type: 1,
+				area: ['600px', '395px'],
+				content: content,
+				title: '线路调度权限分配',
+				shift: 5,
+				scrollbar: false,
+				success: function () {
+					$('#pageRealControlAllotWrap').trigger('init', id);
+				}
+			});
+		});
+	}
 	//删除
 	$('#removeButton').on('click', function(){
@@ -259,7 +256,6 @@ $(function(){
 });
 //改变状态
 function changeEnabled(id,enabled){
-	debugger
 	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
 		jsDoQuery(null, true);
 	})
 /**
  * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
  * name（必须），控件的名字
+ * celldbclickFn，单元格双击事件
  * ds，外部数据源
  *
  * TODO：优化开发中
  *
  */
-angular.module('ScheduleApp').directive('saTimetable', ['$compile',
-    function($compile) {
+angular.module('ScheduleApp').directive('saTimetable', ['$compile', '$window',
+    function($compile, $window) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
             scope: { // 独立作用域
                 // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
-                ds: "=ngModel"
+                ds: "=ngModel",
+                celldbclickFn: "&celldbclick"
                 // TODO：
@@ -39,10 +41,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                 if (!$attr_name) {
                     throw new Error("saTimeTable指令 name属性required");
                 }
+                var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
                 // 内部controlAs名字
                 var ctrlAs = '$saTimeTableCtrl';
+                // 当前选中的cell
+                var startRowIndex = undefined;
+                var startColIndex = undefined;
+                var shiftKey = false; // shift键是否被按住
+                var ctrlKey = false; // ctrl是否被按住
+                // shift选中的cell
+                var shiftCells = [];
+
                 // TODO：
                 return {
@@ -57,11 +68,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                         // ------------------- dom事件处理function -----------------//
                         scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
-                            if (cell.ttdid) {
-                                //alert(rowindex + "-" + colindex);
+                            console.log("click " + "row=" + rowindex + ",col=" + colindex);
+
+                            if (cell.ttdid) { // 是班次的单元格才能操作
                                 cell.sel = !cell.sel;
                             }
-                            // TODO：
+
+                        };
+                        scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                            if (cell.ttdid) { // 是班次的单元格才能操作
+                                if ($attr_celldbclick) {
+                                    // 注意调用方法
+                                    scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                }
+                            }
                         };
                         // ------------------- 监控function ------------------//
@@ -301,6 +301,7 @@
                                             <dd ng-repeat="cell in info track by $index"
                                                 ng-init="colIndex = $index"
                                                 ng-click="$saTimeTableCtrl.$$cell_click(rowIndex, colIndex, cell)"
+                                                ng-dblclick="$saTimeTableCtrl.$$cell_dbclick(rowIndex, colIndex, cell)"
                                                 ng-class="{lpName: !cell.ttdid, active: cell.sel}"
                                                     >
                                                 {{cell.fcsj}}
@@ -3662,19 +3662,21 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saBcgroup&#39;, [
 /**
  * saTimeTable指令，时刻表显示指令，excel表格形式，支持菜单，事件处理。
  * name（必须），控件的名字
+ * celldbclickFn，单元格双击事件
  * ds，外部数据源
  *
  * TODO：优化开发中
  *
  */
-angular.module('ScheduleApp').directive('saTimetable', ['$compile',
-    function($compile) {
+angular.module('ScheduleApp').directive('saTimetable', ['$compile', '$window',
+    function($compile, $window) {
         return {
             restrict: 'E',
             templateUrl: '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTableTemplate.html',
             scope: { // 独立作用域
                 // 注意：数据暂时从外部ngModel里获取，以后内部自己处理
-                ds: "=ngModel"
+                ds: "=ngModel",
+                celldbclickFn: "&celldbclick"
                 // TODO：
@@ -3700,10 +3702,19 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                 if (!$attr_name) {
                     throw new Error("saTimeTable指令 name属性required");
                 }
+                var $attr_celldbclick = tAttrs["celldbclick"]; // 单元格双击事件名
                 // 内部controlAs名字
                 var ctrlAs = '$saTimeTableCtrl';
+                // 当前选中的cell
+                var startRowIndex = undefined;
+                var startColIndex = undefined;
+                var shiftKey = false; // shift键是否被按住
+                var ctrlKey = false; // ctrl是否被按住
+                // shift选中的cell
+                var shiftCells = [];
+
                 // TODO：
                 return {
@@ -3718,11 +3729,20 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;saTimetable&#39;, [&#39;$compile&#39;,
                         // ------------------- dom事件处理function -----------------//
                         scope[ctrlAs].$$cell_click = function(rowindex, colindex, cell) {
-                            if (cell.ttdid) {
-                                //alert(rowindex + "-" + colindex);
+                            console.log("click " + "row=" + rowindex + ",col=" + colindex);
+
+                            if (cell.ttdid) { // 是班次的单元格才能操作
                                 cell.sel = !cell.sel;
                             }
-                            // TODO：
+
+                        };
+                        scope[ctrlAs].$$cell_dbclick = function(rowindex, colindex, cell) {
+                            if (cell.ttdid) { // 是班次的单元格才能操作
+                                if ($attr_celldbclick) {
+                                    // 注意调用方法
+                                    scope[ctrlAs].celldbclickFn()(rowindex, colindex);
+                                }
+                            }
                         };
                         // ------------------- 监控function ------------------//
@@ -75,7 +75,7 @@
             <div class="portlet-body">
                 <!--<div ng-view></div>-->
                 <div style="height: {{ctrl.ttHeight}}px;">
-                    <sa-Timetable name="tt" ng-model="ctrl.editInfo" ng-model-options="{ getterSetter: true }">
+                    <sa-Timetable name="tt" ng-model="ctrl.editInfo" ng-model-options="{ getterSetter: true }" celldbclick="ctrl.singleEditBcDetail">
                     </sa-Timetable>
                 </div>
@@ -229,35 +229,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             /**
              * 单独修改班次明细。
              */
-            self.singleEditBcDetail = function() {
-                var id = null;
-                if (self.editInfo &&
-                    self.editInfo.detailInfos &&
-                    self.editInfo.detailInfos.length > 0) { // 找出第一个被选中的就可以了
-                    for (var i = 0; i < self.editInfo.detailInfos.length; i++) {
-                        for (var j = 0; j < self.editInfo.detailInfos[i].length; j++) {
-                            if (self.editInfo.detailInfos[i][j].sel) {
-                                id = self.editInfo.detailInfos[i][j].ttdid;
-                                break;
-                            }
-                        }
-                        if (id) {
-                            break;
-                        }
+            self.singleEditBcDetail = function(r, c) {
+                var id = self.editInfo.detailInfos[r][c].ttdid;
+                $state.go('ttInfoDetailManage_detail_edit',
+                    {
+                        id: id,
+                        xlid: self.xlid,
+                        ttid: self.ttid,
+                        xlname: self.xlname,
+                        ttname: self.ttname
                     }
-                }
-                if (!id) {
-                    alert("请选择具体班次！");
-                } else {
-                    $state.go('ttInfoDetailManage_detail_edit',
-                        {
-                            id: id,
-                            xlid: self.xlid,
-                            ttid: self.ttid,
-                            xlname: self.xlname,
-                            ttname: self.ttname
-                        });
-                }
+                );
             };
             // 批量修改
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+.uk-sortable{position:relative}.uk-sortable>*{touch-action:none}.uk-sortable a,.uk-sortable img{-webkit-touch-callout:none}.uk-sortable>:last-child{margin-bottom:0}.uk-sortable-dragged{position:absolute;z-index:1050;pointer-events:none}.uk-sortable-placeholder{opacity:0}.uk-sortable-empty{min-height:30px}.uk-sortable-handle{touch-action:none}.uk-sortable-handle:hover{cursor:move}.uk-sortable-moving,.uk-sortable-moving *{cursor:move}.uk-sortable-moving iframe{pointer-events:none}
 \ 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-sortable",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";function e(e){e=t.$(e);do{if(e.data("sortable"))return e;e=t.$(e).parent()}while(e.length);return e}function o(t,e){var o=t.parentNode;if(e.parentNode!=o)return!1;for(var n=t.previousSibling;n&&9!==n.nodeType;){if(n===e)return!0;n=n.previousSibling}return!1}function n(t,e){var o=e;if(o==t)return null;for(;o;){if(o.parentNode===t)return o;if(o=o.parentNode,!o||!o.ownerDocument||11===o.nodeType)break}return null}function s(t){t.stopPropagation&&t.stopPropagation(),t.preventDefault&&t.preventDefault(),t.returnValue=!1}var a,r,i,l,d,h,u,p,c,g,f,m="ontouchstart"in window||"MSGesture"in window||window.DocumentTouch&&document instanceof DocumentTouch,v=m?"MSGesture"in window?"pointerdown":"touchstart":"mousedown",b=m?"MSGesture"in window?"pointermove":"touchmove":"mousemove",C=m?"MSGesture"in window?"pointerup":"touchend":"mouseup";return t.component("sortable",{defaults:{animation:150,threshold:10,childClass:"uk-sortable-item",placeholderClass:"uk-sortable-placeholder",overClass:"uk-sortable-over",draggingClass:"uk-sortable-dragged",dragMovingClass:"uk-sortable-moving",baseClass:"uk-sortable",noDragClass:"uk-sortable-nodrag",emptyClass:"uk-sortable-empty",dragCustomClass:"",handleClass:!1,group:!1,stop:function(){},start:function(){},change:function(){}},boot:function(){t.ready(function(e){t.$("[data-uk-sortable]",e).each(function(){var e=t.$(this);e.data("sortable")||t.sortable(e,t.Utils.options(e.attr("data-uk-sortable")))})}),t.$html.on(b,function(e){if(u){var o=e.originalEvent.targetTouches?e.originalEvent.targetTouches[0]:e;(Math.abs(o.pageX-u.pos.x)>u.threshold||Math.abs(o.pageY-u.pos.y)>u.threshold)&&u.apply(o)}if(a){d||(d=!0,a.show(),a.$current.addClass(a.$sortable.options.placeholderClass),a.$sortable.element.children().addClass(a.$sortable.options.childClass),t.$html.addClass(a.$sortable.options.dragMovingClass));var n=a.data("mouse-offset"),s=e.originalEvent.touches&&e.originalEvent.touches[0]||e.originalEvent,r=parseInt(s.pageX,10)+n.left,i=parseInt(s.pageY,10)+n.top;if(a.css({left:r,top:i}),i+a.height()/3>document.body.offsetHeight)return;i<t.$win.scrollTop()?t.$win.scrollTop(t.$win.scrollTop()-Math.ceil(a.height()/3)):i+a.height()/3>window.innerHeight+t.$win.scrollTop()&&t.$win.scrollTop(t.$win.scrollTop()+Math.ceil(a.height()/3))}}),t.$html.on(C,function(t){if(u=h=!1,!r||!a)return r=a=null,void 0;var o=e(r),n=a.$sortable,s={type:t.type};o[0]&&n.dragDrop(s,n.element),n.dragEnd(s,n.element)})},init:function(){function e(){m&&f.touches&&f.touches.length?h.addEventListener(b,y,!1):(h.addEventListener("mouseover",$,!1),h.addEventListener("mouseout",w,!1))}function o(){m&&f.touches&&f.touches.length?h.removeEventListener(b,y,!1):(h.removeEventListener("mouseover",$,!1),h.removeEventListener("mouseout",w,!1))}function a(t){r&&d.dragMove(t,d)}function l(e){return function(o){var s,a,r;f=o,o&&(s=o.touches&&o.touches[0]||o,a=s.target||o.target,m&&document.elementFromPoint&&(a=document.elementFromPoint(s.pageX-document.body.scrollLeft,s.pageY-document.body.scrollTop)),g=t.$(a)),t.$(a).hasClass("."+d.options.childClass)?e.apply(a,[o]):a!==h&&(r=n(h,a),r&&e.apply(r,[o]))}}var d=this,h=this.element[0];p=[],this.checkEmptyList(),this.element.data("sortable-group",this.options.group?this.options.group:t.Utils.uid("sortable-group"));var u=l(function(e){if(!e.data||!e.data.sortable){var o=t.$(e.target),n=o.is("a[href]")?o:o.parents("a[href]");if(!o.is(":input")){if(d.options.handleClass){var s=o.hasClass(d.options.handleClass)?o:o.closest("."+d.options.handleClass,d.element);if(!s.length)return}return e.preventDefault(),n.length&&n.one("click",function(t){t.preventDefault()}).one(C,function(){c||(n.trigger("click"),m&&n.attr("href").trim()&&(location.href=n.attr("href")))}),e.data=e.data||{},e.data.sortable=h,d.dragStart(e,this)}}}),$=l(t.Utils.debounce(function(t){return d.dragEnter(t,this)}),40),w=l(function(){var e=d.dragenterData(this);d.dragenterData(this,e-1),d.dragenterData(this)||(t.$(this).removeClass(d.options.overClass),d.dragenterData(this,!1))}),y=l(function(t){return r&&r!==this&&i!==this?(d.element.children().removeClass(d.options.overClass),i=this,d.moveElementNextTo(r,this),s(t)):!0});this.addDragHandlers=e,this.removeDragHandlers=o,window.addEventListener(b,a,!1),h.addEventListener(v,u,!1)},dragStart:function(e,o){c=!1,d=!1,l=!1;var n=this,s=t.$(e.target);if(!(!m&&2==e.button||s.is("."+n.options.noDragClass)||s.closest("."+n.options.noDragClass).length||s.is(":input"))){r=o,a&&a.remove();var i=t.$(r),h=i.offset(),p=e.touches&&e.touches[0]||e;u={pos:{x:p.pageX,y:p.pageY},threshold:n.options.handleClass?1:n.options.threshold,apply:function(){a=t.$('<div class="'+[n.options.draggingClass,n.options.dragCustomClass].join(" ")+'"></div>').css({display:"none",top:h.top,left:h.left,width:i.width(),height:i.height(),padding:i.css("padding")}).data({"mouse-offset":{left:h.left-parseInt(p.pageX,10),top:h.top-parseInt(p.pageY,10)},origin:n.element,index:i.index()}).append(i.html()).appendTo("body"),a.$current=i,a.$sortable=n,i.data({"start-list":i.parent(),"start-index":i.index(),"sortable-group":n.options.group}),n.addDragHandlers(),n.options.start(this,r),n.trigger("start.uk.sortable",[n,r,a]),c=!0,u=!1}}}},dragMove:function(e){g=t.$(document.elementFromPoint(e.pageX-(document.body.scrollLeft||document.scrollLeft||0),e.pageY-(document.body.scrollTop||document.documentElement.scrollTop||0)));var o,n=g.closest("."+this.options.baseClass),s=n.data("sortable-group"),a=t.$(r),i=a.parent(),l=a.data("sortable-group");n[0]!==i[0]&&void 0!==l&&s===l&&(n.data("sortable").addDragHandlers(),p.push(n),n.children().addClass(this.options.childClass),n.children().length>0?(o=g.closest("."+this.options.childClass),o.length?o.before(a):n.append(a)):g.append(a),UIkit.$doc.trigger("mouseover")),this.checkEmptyList(),this.checkEmptyList(i)},dragEnter:function(e,o){if(!r||r===o)return!0;var n=this.dragenterData(o);if(this.dragenterData(o,n+1),0===n){var s=t.$(o).parent(),a=t.$(r).data("start-list");if(s[0]!==a[0]){var i=s.data("sortable-group"),l=t.$(r).data("sortable-group");if((i||l)&&i!=l)return!1}t.$(o).addClass(this.options.overClass),this.moveElementNextTo(r,o)}return!1},dragEnd:function(e,o){var n=this;r&&(this.options.stop(o),this.trigger("stop.uk.sortable",[this])),r=null,i=null,p.push(this.element),p.forEach(function(e){t.$(e).children().each(function(){1===this.nodeType&&(t.$(this).removeClass(n.options.overClass).removeClass(n.options.placeholderClass).removeClass(n.options.childClass),n.dragenterData(this,!1))})}),p=[],t.$html.removeClass(this.options.dragMovingClass),this.removeDragHandlers(),a&&(a.remove(),a=null)},dragDrop:function(t){"drop"===t.type&&(t.stopPropagation&&t.stopPropagation(),t.preventDefault&&t.preventDefault()),this.triggerChangeEvents()},triggerChangeEvents:function(){if(r){var e=t.$(r),o=a.data("origin"),n=e.closest("."+this.options.baseClass),s=[],i=t.$(r);o[0]===n[0]&&a.data("index")!=e.index()?s.push({sortable:this,mode:"moved"}):o[0]!=n[0]&&s.push({sortable:t.$(n).data("sortable"),mode:"added"},{sortable:t.$(o).data("sortable"),mode:"removed"}),s.forEach(function(t){t.sortable&&t.sortable.element.trigger("change.uk.sortable",[t.sortable,i,t.mode])})}},dragenterData:function(e,o){return e=t.$(e),1==arguments.length?parseInt(e.data("child-dragenter"),10)||0:(o?e.data("child-dragenter",Math.max(0,o)):e.removeData("child-dragenter"),void 0)},moveElementNextTo:function(e,n){l=!0;var s=this,a=t.$(e).parent().css("min-height",""),r=o(e,n)?n:n.nextSibling,i=a.children(),d=i.length;return s.options.animation?(a.css("min-height",a.height()),i.stop().each(function(){var e=t.$(this),o=e.position();o.width=e.width(),e.data("offset-before",o)}),n.parentNode.insertBefore(e,r),t.Utils.checkDisplay(s.element.parent()),i=a.children().each(function(){var e=t.$(this);e.data("offset-after",e.position())}).each(function(){var e=t.$(this),o=e.data("offset-before");e.css({position:"absolute",top:o.top,left:o.left,"min-width":o.width})}),i.each(function(){var e=t.$(this),o=(e.data("offset-before"),e.data("offset-after"));e.css("pointer-events","none").width(),setTimeout(function(){e.animate({top:o.top,left:o.left},s.options.animation,function(){e.css({position:"",top:"",left:"","min-width":"","pointer-events":""}).removeClass(s.options.overClass).removeData("child-dragenter"),d--,d||(a.css("min-height",""),t.Utils.checkDisplay(s.element.parent()))})},0)}),void 0):(n.parentNode.insertBefore(e,r),t.Utils.checkDisplay(s.element.parent()),void 0)},serialize:function(){var e,o,n=[];return this.element.children().each(function(s,a){e={};for(var r,i,l=0;l<a.attributes.length;l++)o=a.attributes[l],0===o.name.indexOf("data-")&&(r=o.name.substr(5),i=t.Utils.str2json(o.value),e[r]=i||"false"==o.value||"0"==o.value?i:o.value);n.push(e)}),n},checkEmptyList:function(e){e=e?t.$(e):this.element,this.options.emptyClass&&e[e.children().length?"removeClass":"addClass"](this.options.emptyClass)}}),t.sortable});
 \ No newline at end of file
+/** 在electron 环境下特定的css样式 */
+
+.north{
+    height: 160px !important;
+}
+
+.north-toolbar{
+    width: 582px !important;
+}
+
+.north>div.uk-grid.uk-grid-match{
+    margin-top: 35px;
+}
+
+
+.main-container {
+    height: calc(100% - 160px) !important;
+}
+
+.uk-navbar-content .icon-item{
+    display: inline-block;
+    margin: 6px 3px 7px 0;
+    font-size: 16px;
+    vertical-align: middle;
+    padding: 5px;
+    cursor: pointer;
+}
+
+.uk-navbar-content .icon-item:hover{
+    box-shadow: 0 4px 7px 0 rgba(0, 0, 0, 0.2), 0 3px 2px 0 rgba(0, 0, 0, 0.19);
+}
+
@@ -245,14 +245,14 @@ span.signal-state-outbounds{
     color: #d42727;
     padding: 2px 3px;
     border-radius: 3px;
-    font-size: 11px;
+    font-size: 12px;
 }
 span.signal-state-speed-limit{
     color: red;
     padding: 2px 3px;
     border-radius: 3px;
-    font-size: 11px;
+    font-size: 12px;
 }
 .home-svg-edit-icon{
@@ -711,61 +711,6 @@ li.map-panel {
     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;
-}*/
-
-
 #schedule-lp_change-modal .sch-list dl dd {
     font-size: 14px;
 }
@@ -791,7 +736,6 @@ li.map-panel {
     width: 15%;
 }
-
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(1), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(1) {
     width: 9%;
     border-left: 1px solid #dedede;
@@ -812,3 +756,32 @@ li.map-panel {
 #schedule-lp_change-modal .sch-list.reverse dl dt:nth-of-type(5), #schedule-lp_change-modal .sch-list.reverse dl dd:nth-of-type(5) {
     width: 30%;
 }
+
+#schedule-lp_change-modal .ct_table.sch-list .ct_table_body dl.active {
+    background: #b9d2ff;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list .ct_table_body dl.active dd {
+    border-top: 1px solid #b9d2ff;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list dl.active input[type=checkbox] {
+    border: none;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list.reverse .ct_table_body dl.active {
+    background: #ffe2b9;
+}
+
+#schedule-lp_change-modal .ct_table.sch-list.reverse .ct_table_body dl.active dd {
+    border-top: 1px solid #ffe2b9;
+}
+
+#cache_data_manage-modal .uk-table td{
+    vertical-align: bottom;
+}
+
+#cache_data_manage-modal .uk-table td,
+#cache_data_manage-modal .uk-table th{
+    padding: 8px 8px 6px;
+}
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta name="renderer" content="webkit"/>
+    <meta charset="utf-8"/>
+    <title>选择线路</title>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
+    <link rel="stylesheet"
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css"/>
+
+    <link rel="stylesheet"
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sortable.gradient.min.css"/>
+
+    <style type="text/css">
+
+        ::-webkit-scrollbar {
+            width: 16px;
+            height: 16px;
+        }
+
+        ::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb {
+            border-radius: 999px;
+            border: 5px solid transparent;
+        }
+
+        ::-webkit-scrollbar-track {
+            box-shadow: 1px 1px 5px rgba(0, 0, 0, .2) inset;
+        }
+
+        ::-webkit-scrollbar-thumb {
+            min-height: 20px;
+            background-clip: content-box;
+            box-shadow: 0 0 0 5px rgba(0, 0, 0, .2) inset;
+        }
+
+        ::-webkit-scrollbar-corner {
+            background: transparent;
+        }
+
+        input[type="checkbox"] {
+            vertical-align: bottom;
+        }
+
+        .line-btn-list {
+            padding: 0 15px 15px 15px;
+            height: 180px;
+            overflow: auto;
+        }
+
+        .line-btn-list-selected {
+            padding: 0 15px 15px 15px;
+            height: 35px;
+            overflow: auto;
+        }
+
+        .line-btn-list span.line-item {
+            border: 1px solid #e0dfdf;
+            padding: 4px 9px;
+            margin: 5px;
+            -webkit-user-select: none;
+            user-select: none;
+            display: inline-block;
+            cursor: default;
+            transition: all .1s;
+        }
+
+        .line-btn-list span.line-item.active {
+            background: #5E96D2;
+            border: 1px solid #5E96D2;
+            box-shadow: 0px 3px 4px 0 rgba(111, 172, 237, 0.3), 0px 3px 5px 0 rgba(111, 172, 237, 0.3);
+            color: #ffffff;
+        }
+
+        input.i-cbox[type=checkbox] {
+            vertical-align: middle;
+            margin-top: -3px;
+        }
+
+        .line-btn-list span.line-item.active input.i-cbox[type=checkbox] {
+            border: 0;
+        }
+
+        .line-btn-list span.line-item.active input.i-cbox[type=checkbox]:checked:before {
+            color: #86f78b;
+        }
+
+        .uk-panel-title {
+            text-indent: 15px;
+        }
+
+        .line-btn-list-selected span.line-item {
+            padding: 4px 9px;
+            margin: 2px;
+            color: #fff;
+            background: #5e96d2;
+            box-shadow: 0px 3px 4px 0 rgba(111, 172, 237, 0.3), 0px 3px 5px 0 rgba(111, 172, 237, 0.3);
+            user-select: none;
+            display: inline-block;
+            cursor: move;
+            border-radius: 5px;
+        }
+
+        #lineSearchInput {
+            width: 300px;
+            box-shadow: 0px 3px 4px 0 rgba(217, 226, 235, 0.3), 0px 3px 5px 0 rgba(200, 217, 236, 0.3);
+            height: 35px;
+        }
+
+        #submitBtn{
+            border-radius: 0;
+            border-color: #00aff2;
+            transition: all .3s;
+        }
+
+        #submitBtn:disabled{
+            border-color: #ebe9e9;
+        }
+    </style>
+</head>
+
+<body>
+<div class="wrapper ng-scope">
+    <div class="dialog dialog-shadow">
+        <form class="uk-form" style="width: 100%;">
+            <div class="uk-grid">
+
+                <div class="uk-width-medium-1-1">
+                    <div class="uk-panel uk-panel-divider">
+                        <div class="uk-form-row">
+                            <div class="uk-form-icon" style="margin: 15px;">
+                                <i class="uk-icon-search"></i>
+                                <input type="text" placeholder="搜索线路..." id="lineSearchInput">
+                            </div>
+                        </div>
+                        <h3 class="uk-panel-title">待选择的线路</h3>
+                        <div class="line-btn-list">
+                        </div>
+                    </div>
+                    <div class="uk-panel uk-panel-divider">
+                        <h3 class="uk-panel-title">已选择的线路</h3>
+                        <div class="line-btn-list-selected uk-sortable" data-uk-sortable data-uk-observe>
+                        </div>
+                        <button disabled class="uk-button uk-button-primary uk-button-large uk-width-1-1" type="button" id="submitBtn">确定
+                        </button>
+                    </div>
+                </div>
+
+            </div>
+        </form>
+
+    </div>
+</div>
+
+<script>
+    delete window.exports;
+    delete window.module;
+</script>
+<!-- jQuery -->
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/sortable.min.js"></script>
+<script src="/assets/plugins/pinyin.js"></script>
+<script src="/real_control_v2/js/common.js"></script>
+
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<script>
+    if (typeof(process) == 'undefined' || !process) {
+        alert('不支持当前环境！！');
+    }
+
+    const ipcMain = require('electron').ipcRenderer
+
+    !function () {
+        var all = {};
+        //线路编码映射
+        var lineIdMap = {};
+        var storage = window.localStorage;
+
+        var auth;
+        gb_common.$get('/line/all', {destroy_eq: 0}, function (list) {
+
+            //用户分配的线路
+            $.get('/realControAuthority/findByCurrentUser', function (t) {
+                auth = t;
+                var newArray = [], authArray = t.lineCodeStr.split(',');
+
+                $.each(list, function () {
+                    if (this.lineCode && authArray.indexOf(this.lineCode) != -1) {
+                        newArray.push(this);
+                    }
+                });
+
+                var htmlStr = '';
+                $.each(newArray, function () {
+                    htmlStr += '<span class="line-item" data-name="' + this.name + '" data-code="' + this.lineCode + '">' +
+                            ' <input class="i-cbox" type="checkbox"> ' + this.name +
+                            '</span>';
+
+                    //拼音首字母
+                    this.camelChars = pinyin.getCamelChars(this.name);
+                    //全拼
+                    this.fullChars = pinyin.getFullChars(this.name).toUpperCase();
+
+                    lineIdMap[this.lineCode] = this;
+                });
+                all = list;
+
+                $('.line-btn-list').html(htmlStr);
+
+                $('.line-btn-list .line-item').on('click', function () {
+                    var box = $(this).find('input[type=checkbox]')[0];
+                    if ($(this).hasClass('active')) {
+                        $(this).removeClass('active');
+                        box.checked = false;
+
+                        removeSelected(this);
+                    }
+                    else {
+                        $(this).addClass('active');
+                        box.checked = true;
+
+                        addSelected(this);
+                    }
+                });
+            });
+        });
+
+
+        $('#lineSearchInput').on('input', function () {
+            var t = $(this).val().toUpperCase();
+            if (!t) {
+                $('.line-btn-list .line-item').show();
+                return;
+            }
+
+            var rs = [];
+            $.each(all, function () {
+                if (this.camelChars.indexOf(t) != -1
+                        || this.fullChars.indexOf(t) != -1
+                        || this.name.indexOf(t) != -1) {
+                    rs.push(this.lineCode);
+                }
+            });
+
+            $('.line-btn-list .line-item').hide().each(function () {
+                var code = $(this).data('code') + '';
+                if (rs.indexOf(code) != -1)
+                    $(this).show();
+            });
+        });
+
+        function addSelected(that) {
+            $('.line-btn-list-selected').append('<span class="line-item" data-code="' + $(that).data('code') + '">' + $(that).data('name') + '</span>');
+
+            $('#submitBtn').removeAttr('disabled');
+        }
+
+        function removeSelected(that) {
+            var code = $(that).data('code');
+            $('.line-btn-list-selected .line-item[data-code='+code+']').remove();
+
+            if($('.line-btn-list-selected .line-item').length == 0){
+                $('#submitBtn').attr('disabled', 'disabled');
+            }
+        }
+
+        function error(rs) {
+            return rs.status == 'ERROR' || rs.status == 500;
+        }
+
+        /**
+         * 确定
+         */
+        $('#submitBtn').on('click', function () {
+            var ep = EventProxy.create('car2DeviceId', 'routes', 'checkLineConfig', function () {
+                ipcMain.send('webPageGotoControl');
+            });
+
+            var lsData = [], codeStr='', code;
+            $('.line-btn-list-selected .line-item').each(function () {
+                code = $(this).data('code');
+                lsData.push(lineIdMap[code]);
+                codeStr += (code + ',');
+            });
+            //将选择的线路信息写入localstorage
+            storage.setItem('lineControlItems', JSON.stringify(lsData));
+
+            //缓存车辆自编号和设备号对照
+            $.get('/gps/Car2DeviceId', function (rs) {
+                storage.setItem('car2DeviceId', JSON.stringify(rs));
+                ep.emitLater('car2DeviceId');
+            });
+
+            //监控模式还是主调模式
+            storage.setItem('operationMode', auth.pattern);
+
+            //缓存线路路由
+            codeStr = codeStr.substr(0, codeStr.length - 1);
+            $.get('/realMap/multiRouteByLine', {codeStr: codeStr}, function (rs) {
+                for(var key in rs){
+                    storage.setItem(key, JSON.stringify(rs[key]));
+                }
+                ep.emitLater('routes');
+            });
+
+            //检查线路配置信息
+            $.ajax({
+                url: '/lineConfig/check',
+                traditional: true,
+                data: {codeArray: codeStr.split(',')},
+                method: 'POST',
+                success: function (rs) {
+                    if (rs.status == 0){
+                        ep.emitLater('checkLineConfig');
+                    }
+                    else if (rs.status == 1){
+                        initLineConfig(rs.not, function () {
+                            ep.emitLater('checkLineConfig');
+                        });
+                    }
+                }
+            });
+        });
+
+
+        function initLineConfig(arr, cb) {
+            var i = 0;
+            (function () {
+                if (i >= arr.length) {
+                    cb && cb();
+                    return;
+                }
+                var f = arguments.callee
+                        , lineCode = arr[i];
+
+                $.post('/lineConfig/init/' + lineCode, function (rs) {
+                    if (rs == 1) {
+                        i++;
+                        f();
+                    }
+                });
+            })();
+        }
+    }();
+</script>
+</body>
+</html>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta name="renderer" content="webkit"/>
+    <meta charset="utf-8"/>
+    <title>登录</title>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
+
+    <style type="text/css">
+        body {
+            overflow: hidden;
+        }
+
+        hr {
+            margin: 20px 0;
+            border: 0;
+            border-top: 1px solid #eee;
+            border-bottom: 0;
+        }
+
+        .uk-form-icon, input {
+            width: 100%;
+        }
+
+        input {
+            height: 48px;
+        }
+
+        input:focus{
+            box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+        }
+
+        #loginPanel{
+            background: linear-gradient(to bottom, #ffffff, #b5c0c7, #3b4044);
+        }
+
+    </style>
+</head>
+
+<body>
+<div class="wrapper ng-scope">
+    <div id="loginPanel" class="dialog dialog-shadow">
+        <div class="uk-grid">
+            <div class="uk-width-5-10">
+            </div>
+            <div class="uk-width-5-10">
+                <div class="uk-panel" style="padding: 56px 25px 36px 0;">
+                    <form class="uk-form">
+                        <div class="uk-form-row">
+                            <div class="uk-form-icon">
+                                <i class="uk-icon-user"></i>
+                                <input autofocus class="uk-form-large" name="userName" type="text" placeholder="输入用户名">
+                            </div>
+                        </div>
+
+                        <div class="uk-form-row">
+                            <div class="uk-form-icon">
+                                <i class="uk-icon-key"></i>
+                                <input class="uk-form-large" name="password" type="password" placeholder="输入密码">
+                            </div>
+                        </div>
+
+                        <br>
+                        <br>
+                        <div class="uk-form-row">
+                            <button id="loginBtn" class="uk-button uk-button-primary uk-button-large uk-width-1-1"
+                            >登录
+                            </button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    delete window.exports;
+    delete window.module;
+</script>
+<!-- jQuery -->
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js"></script>
+<script src="/assets/plugins/jsencrypt.min.js"></script>
+<script>
+    //if()  process
+    if(typeof(process)=='undefined' || !process){
+        alert('不支持当前环境！！');
+    }
+
+    const ipcMain = require('electron').ipcRenderer
+
+    !function () {
+        var form = $('#loginPanel form')
+                , nameInput = $('input[name=userName]', form)
+                , pwdInput = $('input[name=password]', form);
+
+        var keys;
+        $('#loginBtn').on('click', function (e) {
+            e.stopPropagation();
+            try {
+                var userName = nameInput.val()
+                        , pwd = pwdInput.val();
+
+                if(!userName || $.trim(userName)==''){
+                    alert('请输入用户名！！');
+                    return false;
+                }
+
+                if(!pwd || $.trim(pwd)==''){
+                    alert('请输入密码！！');
+                    return false;
+                }
+
+                //获取keys
+                $.get('/user/login/jCryptionKey?t=' + Math.random(), function (data) {
+                    keys = data.publickey;
+
+                    //RSA加密
+                    var encrypt = new JSEncrypt();
+                    encrypt.setPublicKey(keys);
+                    userName = encrypt.encrypt(userName);
+                    pwd = encrypt.encrypt(pwd);
+                    //登录
+                    login(userName, pwd);
+                });
+            }
+            catch (e) {
+                console.log(e);
+            }
+
+            return false;
+        });
+
+
+        function login(userName, pwd) {
+            var params = {
+                userName: userName,
+                password: pwd
+            };
+            $.post('/user/login', params
+                    , function (rs) {
+                        if (error(rs)) {
+                            $('#loginBtn').removeAttr('disabled');
+                            alert(rs.msg);
+                        }
+                        else {
+                            ipcMain.send('webPageLoginSuccess');
+                        }
+                    });
+        }
+
+        function error(rs) {
+            return rs.status == 'ERROR' || rs.status == 500;
+        }
+
+    }();
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -68,25 +68,25 @@
     <script id="schedule-lp_change-list-temp" type="text/html">
         {{if order == 0}}
-            {{each array as sch i}}
-            <dl>
-                <dd><input type="checkbox"></dd>
-                <dd>{{sch.jGh}}/{{sch.jName}}</dd>
-                <dd>{{sch.clZbh}}</dd>
-                <dd>{{sch.lpName}}</dd>
-                <dd>{{sch.dfsj}}</dd>
-            </dl>
-            {{/each}}
+        {{each array as sch i}}
+        <dl>
+            <dd><input type="checkbox"></dd>
+            <dd>{{sch.jGh}}/{{sch.jName}}</dd>
+            <dd>{{sch.clZbh}}</dd>
+            <dd>{{sch.lpName}}</dd>
+            <dd>{{sch.dfsj}}</dd>
+        </dl>
+        {{/each}}
         {{else if order == 1}}
-            {{each array as sch i}}
-            <dl>
-                <dd><input type="checkbox"></dd>
-                <dd>{{sch.dfsj}}</dd>
-                <dd>{{sch.lpName}}</dd>
-                <dd>{{sch.clZbh}}</dd>
-                <dd>{{sch.jGh}}/{{sch.jName}}</dd>
-            </dl>
-            {{/each}}
+        {{each array as sch i}}
+        <dl>
+            <dd><input type="checkbox"></dd>
+            <dd>{{sch.dfsj}}</dd>
+            <dd>{{sch.lpName}}</dd>
+            <dd>{{sch.clZbh}}</dd>
+            <dd>{{sch.jGh}}/{{sch.jName}}</dd>
+        </dl>
+        {{/each}}
         {{/if}}
     </script>
@@ -102,15 +102,15 @@
                 //线路切换事件
                 $('[name=lineSelect]', modal).on('change', function () {
                     var order = $(this).data('order')
-                            ,lineCode = $(this).val();
+                            , lineCode = $(this).val();
                     var array = gb_common.get_vals(gb_schedule_table.findScheduleByLine(lineCode));
                     //按路牌分组
                     list[order] = gb_common.groupBy(array, 'lpName');
                     //设置路牌下拉框
-                    var lpSelect = $(this).next('select'), ops='';
+                    var lpSelect = $(this).next('select'), ops = '';
                     $.each(gb_common.get_keys(list[order]), function (i, lp) {
-                        ops += '<option value="'+lp+'">'+lp+'</option>';
+                        ops += '<option value="' + lp + '">' + lp + '</option>';
                     });
                     lpSelect.html(ops);
                 });
@@ -118,7 +118,7 @@
                 //路牌切换事件
                 $('[name=lpName]', modal).on('change', function () {
                     var order = $(this).data('order')
-                            ,lp = $(this).val();
+                            , lp = $(this).val();
                     var htmlStr = template('schedule-lp_change-list-temp', {array: list[order][lp], order: order});
                     $('.sch-list .ct_table_body', modal).eq(order).html(htmlStr);
@@ -131,7 +131,43 @@
                     lineOps += '<option value="' + this.lineCode + '">' + this.name + '</option>';
                 });
                 $('[name=lineSelect]', modal).html(lineOps);
+
+                //左默认线路路牌
+                $('[name=lineSelect]:eq(0)', modal).val(sch.xlBm).trigger('change');
+                //左默认路牌
+                $('[name=lpName]:eq(0)', modal).val(sch.lpName).trigger('change');
             });
+
+            //选中事件
+            $(modal).on('click', '.sch-list input[type=checkbox]', function (e) {
+                e.stopPropagation();
+                var dl = $(this).parents('dl');
+                if (this.checked)
+                    activeDl(dl);
+                else
+                    cancelActiveDl(dl);
+            });
+
+            $(modal).on('click', '.sch-list dl', function (e) {
+                e.stopPropagation();
+                var cbox = $(this).find('input[type=checkbox]')[0];
+                if (!$(this).hasClass('active')) {
+                    activeDl($(this));
+                    cbox.checked = true;
+                }
+                else {
+                    cancelActiveDl($(this));
+                    cbox.checked = false;
+                }
+            });
+
+            function activeDl(dl) {
+                dl.addClass('active');
+            }
+
+            function cancelActiveDl(dl) {
+                dl.removeClass('active');
+            }
         })();
     </script>
 </div>
+<div class="uk-modal" id="cache_data_manage-modal">
+    <div class="uk-modal-dialog" style="width: 620px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <h2>缓存数据管理</h2>
+
+        <div class="uk-overflow-container">
+            <table class="uk-table">
+                <caption>对照数据列表</caption>
+                <tbody>
+                <tr>
+                    <td><strong>车辆信息</strong></td>
+                    <td>车辆自编号和设备号对照数据</td>
+                    <td>
+                        <div class="uk-button-group" style="margin-top: 2px;">
+                            <button data-type="nbbm2DeviceId" class="uk-button uk-button-primary show-data"><i class="uk-icon-search"></i> 查看</button>
+                            <button class="uk-button"><i class="uk-icon-refresh"></i> 刷新数据</button>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <td><strong>人员信息</strong></td>
+                    <td>人员工号和姓名对照数据</td>
+                    <td>
+                        <div class="uk-button-group" style="margin-top: 2px;">
+                            <button data-type="work2Name" class="uk-button uk-button-primary show-data"><i class="uk-icon-search"></i> 查看</button>
+                            <button class="uk-button"><i class="uk-icon-refresh"></i> 刷新数据</button>
+                        </div>
+                    </td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var modal = '#cache_data_manage-modal';
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+
+
+            });
+
+            var showDetailData = {
+                nbbm2DeviceId: function () {
+                    open_modal('/real_control_v2/fragments/north/nav/cache_data/nbbm_deviceid.html', {}, {bgclose: false, modal: false})
+                }
+            };
+            
+            $('.show-data', modal).on('click', function () {
+                var type = $(this).data('type');
+                if(type)
+                    showDetailData[type]();
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<div class="uk-modal" id="cache_data_nbbm_deviceid-modal">
+    <div class="uk-modal-dialog" style="width: 480px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <h3>车辆自编号和设备号对照数据</h3>
+        <div>
+			
+            <table class="uk-table">
+                <thead>
+                <tr>
+                    <th>自编号</th>
+                    <th>设备号</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <td>W2b-023</td>
+                    <td>559L0028</td>
+                </tr>
+                </tbody>
+            </table>
+
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var modal = '#cache_data_nbbm_deviceid-modal';
+
+
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -63,4 +63,73 @@
         </nav>
     </div>
   </script>
+
+    <script id="north-toolbar-electron-temp" type="text/html">
+        <div class="uk-margin" id="north_toolbar_panel">
+            <nav class="uk-navbar">
+                <a class="uk-navbar-brand" >
+                    <span><i class="uk-icon-user"></i> <span id="north_toolbar_user">{{user.userName}}</span>，在线</span><i class="uk-icon-ellipsis-v"></i>
+                </a>
+                <ul class="uk-navbar-nav">
+                    {{each list as obj i}}
+                    <li class="uk-parent " data-uk-dropdown="{{if obj.columns}}{pos:'top-right'}{{/if}}" aria-haspopup="true" aria-expanded="false">
+                        <a>{{obj.text}} <i class="uk-icon-caret-down"></i></a>
+                        {{if obj.children != null}}
+                        <div class="uk-dropdown uk-dropdown-navbar uk-dropdown-bottom" style="top: 40px; left: 0px;">
+                            <ul class="uk-nav uk-nav-navbar">
+                                {{each obj.children as c j}}
+                                {{if c.header}}
+                                <li class="uk-nav-header">{{c.text}}</li>
+
+                                {{else if c.divider}}
+                                <li class="uk-nav-divider"></li>
+                                {{else}}
+                                <li class="event"><a data-event="{{c.event}}">{{c.text}}</a></li>
+                                {{/if}}
+                                {{/each}}
+                            </ul>
+                        </div>
+                        {{else if obj.columns}}
+                        <div class="uk-dropdown {{obj.clazz}}">
+                            <div class="uk-grid uk-dropdown-grid">
+                                {{each obj.grid as cls s}}
+                                <div class="{{obj.cls_class}}">
+                                    <ul class="uk-nav uk-nav-dropdown uk-panel">
+                                        {{each cls as c z}}
+                                        {{if c.header}}
+                                        <li class="uk-nav-header">{{c.text}}</li>
+
+                                        {{else if c.divider}}
+                                        <li class="uk-nav-divider"></li>
+                                        {{else}}
+                                        <li class="event">
+                                            <a data-event="{{c.event}}">
+                                                {{if c.icon != null}}
+                                                <i class="{{c.icon}}"></i>
+                                                {{/if}}
+                                                {{c.text}}</a>
+                                        </li>
+                                        {{/if}}
+                                        {{/each}}
+                                    </ul>
+                                </div>
+                                {{/each}}
+                            </div>
+                        </div>
+                        {{/if}}
+                    </li>
+                    {{/each}}
+                </ul>
+                <div class="uk-navbar-content uk-navbar-flip uk-hidden-small">
+                    <div class="icon-item" id="mnavbarIconBtnMIN" data-uk-tooltip="{pos:'bottom'}" title="最小化">
+                        <img src="/real_control_v2/assets/imgs/icon/minus.png">
+                    </div>
+                    &nbsp;&nbsp;
+                    <div class="icon-item" id="mnavbarIconBtnCLOSE" data-uk-tooltip="{pos:'bottom'}" title="退出系统">
+                        <img src="/real_control_v2/assets/imgs/icon/remove.png">
+                    </div>
+                </div>
+            </nav>
+        </div>
+    </script>
 </div>
@@ -82,8 +82,7 @@ var gb_common = (function () {
     function successHandle(json, handle) {
         var status = json.status;
         if (status == 407) {
-            //alert('被注销的登录');
-            location.href = '/';
+            location.href = '/real_control_v2/login.html';
             return;
         }
@@ -16,6 +16,11 @@
           "id": 1.52,
           "text": "历史班次维护",
           "event": "history_sch_maintain"
+        },
+        {
+          "id": 1.53,
+          "text": "缓存数据管理",
+          "event": "cache_data_manage"
         }
       ],
       [
@@ -90,6 +95,11 @@
     "text": "系统设置",
     "children": [
       {
+        "id": 3.1,
+        "text": "线路配置",
+        "event": "line_config"
+      }
+    ,{
         "id": 3.2,
         "text": "TTS",
         "event": "tts_config"
@@ -169,8 +169,7 @@ var gb_schedule_context_menu = (function () {
             },
             'sep3': '---------',
             'lp_change': {
-                name: '路牌对调',
-                disabled: true
+                name: '路牌对调'
             }
         }
     });
-
 /* main js  */
 var gb_main_ep = new EventProxy(),
     res_load_ep = EventProxy.create('load_data_basic', 'load_tab', 'load_home_layout', 'load_home_line_panel', function () {
@@ -19,8 +19,23 @@ var gb_northToolbar = (function () {
     });
     var ep = EventProxy.create("template", "data", "user", function (temp, data, user) {
+        var tempId = '#north-toolbar-temp';
+
+        //electron环境
+        if(isElectron){
+            tempId = '#north-toolbar-electron-temp';
+            //最小化
+            $(document).on('click', '#mnavbarIconBtnMIN',  function () {
+                ipcMain.send('webPageMainWindowMinimize');
+            });
+            //关闭
+            $(document).on('click', '#mnavbarIconBtnCLOSE',  function () {
+                ipcMain.send('webPageMainWindowClose');
+            });
+        }
+
         currentUser = user;
-        var t = $('#north-toolbar-temp', temp).html()
+        var t = $(tempId, temp).html()
             , htmlStr = template.render(t)({list: data, user: currentUser});
         $('.north .north-toolbar').html(htmlStr);
@@ -80,6 +95,9 @@ var gb_northToolbar = (function () {
         },
         line_config: function () {
             open_modal('/real_control_v2/fragments/north/nav/line_config/line_config.html', {}, modal_opts);
+        },
+        cache_data_manage: function () {
+            open_modal('/real_control_v2/fragments/north/nav/cache_data/list.html', {}, modal_opts);
         }
     };
@@ -45,7 +45,7 @@ var gb_svg_chart = (function () {
             len = data.length;
         var w = get_width(wrap),
-            h = get_height(wrap)
+            h = parseInt(get_height(wrap))
             //x scale
             ,
             xScale = d3.scale.linear().range([x_padd, w - x_padd]).domain([0, len - 1]),
@@ -82,7 +82,8 @@ var gb_svg_chart = (function () {
             .classed({
                 'line-chart': true
             }).attr('data-code', lineCode)
-            .attr('onselectstart', 'return false');
+            .attr('onselectstart', 'return false')
+            .style('height', h);
         //add item g
         var items = svg.selectAll('g.item').data(data)
@@ -5,149 +5,179 @@
     <meta charset="UTF-8">
     <title>线路调度 v2.0</title>
     <!-- uikit  core style-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />
-    <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/accordion.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css"/>
+    <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/accordion.gradient.min.css"/>
     <!-- main style -->
-    <link rel="stylesheet" href="/real_control_v2/css/main.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/main.css"/>
     <!-- north style -->
-    <link rel="stylesheet" href="/real_control_v2/css/north.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/north.css"/>
     <!-- home style -->
-    <link rel="stylesheet" href="/real_control_v2/css/home.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/home.css"/>
     <!-- line style -->
-    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css" />
-    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/line_schedule.css"/>
+    <link rel="stylesheet" href="/real_control_v2/css/sch_autocomp_result.css"/>
     <!-- custom table -->
-    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css"/>
     <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"/>
     <!-- formvalidation style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"/>
     <!-- js tree -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"/>
     <!-- tooltip css-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/css/pace.css" />
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css"/>
 </head>
 <body>
-    <div class="north uk-width-1-1 uk-panel-box">
-        <div class="uk-grid uk-grid-match">
-            <div class="uk-width-4-10">
-                <div class="uk-panel">
-                    <h2 class="north-logo">
+<div class="north uk-width-1-1 uk-panel-box">
+    <div class="uk-grid uk-grid-match">
+        <div class="uk-width-4-10">
+            <div class="uk-panel">
+                <h2 class="north-logo">
                     <i class="uk-icon-life-ring"></i> 闵行公交线路调度
-                  </h2>
-                </div>
-            </div>
-            <div class="uk-width-6-10">
-                <div class="uk-panel uk-width north-toolbar"></div>
+                </h2>
             </div>
         </div>
-        <div class="north-tabs"></div>
+        <div class="uk-width-6-10">
+            <div class="uk-panel uk-width north-toolbar"></div>
+        </div>
     </div>
+    <div class="north-tabs"></div>
+</div>
-    <div class="main-container">
-        <div class="load-panel">
-            <i class="uk-icon-spinner uk-icon-spin"></i>
-            正在加载数据
-        </div>
+<div class="main-container">
+    <div class="load-panel">
+        <i class="uk-icon-spinner uk-icon-spin"></i>
+        正在加载数据
     </div>
+</div>
-    <!-- 地图相关 -->
-    <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT" ></script>
-    <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
-    <script src="/assets/js/baidu//MarkerClusterer.js"></script>
-    <script src="/assets/js/TransGPS.js" ></script>
-    <!-- 高德  -->
-    <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda" ></script>
-    <!-- jquery -->
-    <script src="/real_control_v2/assets/js/jquery.min.js"></script>
-    <!-- jquery actual -->
-    <script src="/real_control_v2/assets/js/jquery.actual.min.js"></script>
-    <!-- jquery.serializejson JSON序列化插件 -->
-    <script src="/assets/plugins/jquery.serializejson.js"></script>
-    <!-- moment.js 日期处理类库 -->
-    <script src="/assets/plugins/moment-with-locales.js"></script>
-    <!-- common js -->
-    <script src="/real_control_v2/js/common.js"></script>
-    <!-- art-template 模版引擎 -->
-    <script src="/assets/plugins/template.js"></script>
-    <!-- d3 -->
-    <script src="/assets/js/d3.min.js"></script>
-    <!-- EventProxy  -->
-    <script src="/assets/js/eventproxy.js"></script>
-    <!-- uikit core -->
-    <script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js"></script>
-    <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js"></script>
-    <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/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>
-    <!-- formvalidation- -->
-    <script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"></script>
-    <script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"></script>
-    <script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"></script>
-    <!-- js tree -->
-    <script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"></script>
-    <!-- simple pinyin -->
-    <script src="/assets/plugins/pinyin.js"></script>
-    <!-- qtip -->
-    <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js"></script>
-
-    <!-- main js -->
-    <script src="/real_control_v2/js/main.js"></script>
-    <!-- 数据 -->
-    <script src="/real_control_v2/js/data/data_basic.js"></script>
-    <script src="/real_control_v2/js/data/data_gps.js"></script>
-    <script src="/real_control_v2/js/data/gps_abnormal.js"></script>
-    <!-- 线路模拟图 -->
-    <script src="/real_control_v2/js/utils/svg_chart.js"></script>
-    <script src="/real_control_v2/js/utils/svg_data_convert.js"></script>
-    <script src="/real_control_v2/js/utils/svg_chart_tooltip.js"></script>
-    <script src="/real_control_v2/js/utils/svg_chart_map.js"></script>
-
-    <!-- custom table js -->
-    <script src="/real_control_v2/js/utils/ct_table.js"></script>
-    <!-- north js -->
-    <script src="/real_control_v2/js/north/toolbar.js"></script>
-    <script src="/real_control_v2/js/north/tabs.js"></script>
-    <!-- home js -->
-    <script src="/real_control_v2/js/home/layout.js"></script>
-    <script src="/real_control_v2/js/home/line_panel.js"></script>
-    <script src="/real_control_v2/js/home/context_menu.js"></script>
-    <!-- line schedule js -->
-    <script src="/real_control_v2/js/line_schedule/legend.js"></script>
-    <script src="/real_control_v2/js/line_schedule/layout.js"></script>
-    <script src="/real_control_v2/js/line_schedule/sch_table.js"></script>
-    <script src="/real_control_v2/js/line_schedule/context_menu.js"></script>
-    <script src="/real_control_v2/js/line_schedule/dbclick.js"></script>
-    <script src="/real_control_v2/js/line_schedule/search.js"></script>
-
-    <!-- 字典相关 -->
-    <script src="/assets/js/dictionary.js"></script>
-    <!-- websocket -->
-    <script src="/assets/js/sockjs.min.js"></script>
-    <script src="/real_control_v2/js/websocket/sch_websocket.js"></script>
-    <!-- tts -->
-    <script src="/real_control_v2/js/utils/tts.js"></script>
-
-    <!-- echart -->
-    <script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
-    <!-- Geolib -->
-    <script src="/real_control_v2/geolib/geolib.js"></script>
-
-    <script src="/real_control_v2/js/signal_state/signal_state.js"></script>
-    <script src="/real_control_v2/js/utils/dispatch_pattern.js"></script>
+<script>
+    delete window.exports;
+    delete window.module;
+
+    var ipcMain;
+    //是否处于electron环境下
+    var isElectron = (function () {
+        try {
+            if (process.versions.electron)
+                return true;
+            else
+                return false;
+        }
+        catch (e) {
+            return false;
+        }
+    })();
+
+    if (isElectron) {
+        var link = document.createElement("link");
+        link.type = "text/css";
+        link.rel = "stylesheet";
+        link.href = "/real_control_v2/css/electron.css";
+        document.getElementsByTagName("head")[0].appendChild(link);
+
+        ipcMain = require('electron').ipcRenderer;
+    }
+</script>
+
+<!-- 地图相关 -->
+<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
+<script src="/assets/js/baidu//MarkerClusterer.js"></script>
+<script src="/assets/js/TransGPS.js"></script>
+<!-- 高德  -->
+<script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
+<!-- jquery -->
+<script src="/real_control_v2/assets/js/jquery.min.js"></script>
+<!-- jquery actual -->
+<script src="/real_control_v2/assets/js/jquery.actual.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"></script>
+<!-- moment.js 日期处理类库 -->
+<script src="/assets/plugins/moment-with-locales.js"></script>
+<!-- common js -->
+<script src="/real_control_v2/js/common.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js"></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- main js -->
+<script src="/real_control_v2/js/main.js"></script>
+<!-- uikit core -->
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js"></script>
+<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/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>
+<!-- formvalidation- -->
+<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"></script>
+<!-- js tree -->
+<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"></script>
+<!-- simple pinyin -->
+<script src="/assets/plugins/pinyin.js"></script>
+<!-- qtip -->
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js"></script>
+
+<!-- 数据 -->
+<script src="/real_control_v2/js/data/data_basic.js"></script>
+<script src="/real_control_v2/js/data/data_gps.js"></script>
+<script src="/real_control_v2/js/data/gps_abnormal.js"></script>
+<!-- 线路模拟图 -->
+<script src="/real_control_v2/js/utils/svg_chart.js"></script>
+<script src="/real_control_v2/js/utils/svg_data_convert.js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_tooltip.js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_map.js"></script>
+
+<!-- custom table js -->
+<script src="/real_control_v2/js/utils/ct_table.js"></script>
+<!-- north js -->
+<script src="/real_control_v2/js/north/toolbar.js"></script>
+<script src="/real_control_v2/js/north/tabs.js"></script>
+<!-- home js -->
+<script src="/real_control_v2/js/home/layout.js"></script>
+<script src="/real_control_v2/js/home/line_panel.js"></script>
+<script src="/real_control_v2/js/home/context_menu.js"></script>
+<!-- line schedule js -->
+<script src="/real_control_v2/js/line_schedule/legend.js"></script>
+<script src="/real_control_v2/js/line_schedule/layout.js"></script>
+<script src="/real_control_v2/js/line_schedule/sch_table.js"></script>
+<script src="/real_control_v2/js/line_schedule/context_menu.js"></script>
+<script src="/real_control_v2/js/line_schedule/dbclick.js"></script>
+<script src="/real_control_v2/js/line_schedule/search.js"></script>
+
+<!-- 字典相关 -->
+<script src="/assets/js/dictionary.js"></script>
+<!-- websocket -->
+<script src="/assets/js/sockjs.min.js"></script>
+<script src="/real_control_v2/js/websocket/sch_websocket.js"></script>
+<!-- tts -->
+<script src="/real_control_v2/js/utils/tts.js"></script>
+
+<!-- echart -->
+<script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
+<!-- Geolib -->
+<script src="/real_control_v2/geolib/geolib.js"></script>
+
+<script src="/real_control_v2/js/signal_state/signal_state.js"></script>
+<script src="/real_control_v2/js/utils/dispatch_pattern.js"></script>
 </body>
 </html>