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

徐烜
2 parents 3e04b955 c29701fe
Showing 9 changed files with 515 additions and 493 deletions
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/resources/static/pages/forms/calc/calcsingledata.html
src/main/resources/static/pages/forms/calc/statisticsDaily.html
src/main/resources/static/pages/forms/mould/waybill_minhang.xls
src/main/resources/static/pages/forms/mould/waybill_minhang_dl.xls
src/main/resources/static/pages/home.html
src/main/resources/static/pages/mforms/turnoutrates/calcTurnoutrate.html
src/main/resources/static/pages/mforms/turnoutrates/calcTurnoutrateZgf.html
src/main/resources/static/real_control_v2/mapmonitor/js/spatial_data.js
@@ -108,7 +108,7 @@ public class DataHandleProcess {
     				//发送邮件
     				EmailBean mail = new EmailBean();
     				mail.setSubject("线调GPS处理");
-    				mail.setContent("GPS处理超时，检查线程栈文件信息<br/>");
+    				mail.setContent("GPS处理超时，检查文件信息<br/>");
     				sendEmailController.sendMail("113252620@qq.com", mail);
     				logger.info("DataHandlerProcess:邮件发送成功!");
     			} catch (Exception e){
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -40,14 +40,6 @@
                         <span class="item-label" style="width: 80px;">线路: </span>
                         <select class="form-control" name="line" id="line" style="width: 140px;"></select>
                     </div>
-					<div style="display: inline-block; margin-left: 18px;" id="sfdcDiv">
-                        <span class="item-label" style="width: 80px;">是否电车: </span>
-                        <select class="form-control form-filter " name="sfdc" id="sfdc">
-							<option value="">请选择...</option>
-							<option value="0">否</option>
-							<option value="1">是</option>
-						</select>
-                    </div>
 					<div style="margin-top: 10px"></div>
                     <div style="display: inline-block;margin-left: 3px;">
                         <span class="item-label" style="width: 140px;">开始时间: </span>
@@ -108,7 +100,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
  
-		
 		var d = new Date();
 		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
@@ -118,20 +109,13 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		var dateTime = year + "-" + month + "-" + day;
-		$("#startDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn',
-			maxDate : dateTime
-		});
-		$("#endDate").datetimepicker({
+		
+		$("#startDate,#endDate").datetimepicker({
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn',
-			maxDate : dateTime
+			maxDate : year + "-" + month + "-" + day
 		});
-		$("#startDate").val(dateTime);
-		$("#endDate").val(dateTime);
-
+		$("#startDate,#endDate").val(year + "-" + month + "-" + day);
  
 		var fage=false;
 		var xlList;
@@ -211,8 +195,6 @@
 			}
 		});
  
-		$("#sfdcDiv").hide();
-		
 		var cont = "驾驶员", cont1 = "", cont2 = "", cont3 = "";
 		$("#tjtype").on("change",function(){
 			if(cont == "驾驶员"){
@@ -225,13 +207,10 @@
 			cont = $("#tjtype").val();
 			if($("#tjtype").val() == "驾驶员"){
 				$("#cont").val(cont1);
-				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "售票员"){
 				$("#cont").val(cont2);
-				$("#sfdcDiv").hide();
 			} else if($("#tjtype").val() == "车辆自编号"){
 				$("#cont").val(cont3);
-				$("#sfdcDiv").show();
 			}
 		});
  
@@ -252,10 +231,9 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
-		    var sfdc=$("#sfdc").val();
 		    var params = {};
 		    var i = layer.load(2);
-		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){		        
+		    $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont},function(result){		        
 				layer.close(i);
 				var singledata = template('singledata',{list:result});
 				// 把渲染好的模版html文本追加到表格中
@@ -271,12 +249,11 @@
 		    var fgsdmSing = $("#fgsdmSing").val();
 		    var tjtype=$("#tjtype").val();
 		    var cont=$("#cont").val();
-		    var sfdc=$("#sfdc").val();
 			var lineName = $('#line option:selected').text();
 			if(lineName == "全部线路")
 				lineName = $('#fgsdmSing option:selected').text();
 		    var i = layer.load(2);
-			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc,type:'export',lineName:lineName},function(result){
+			$get('/calc_export/singledataExportTj',{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,type:'export',lineName:lineName},function(result){
 				var dateTime = "";
 				if(startDate == endDate){
 					dateTime = moment(startDate).format("YYYYMMDD");
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -150,7 +150,7 @@
 			$('.menu-toggler.sidebar-toggler').click();
  
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		d.setTime(d.getTime() - 4*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
-<style>
-    .system_change_log{
-        background: #fff;
-        color: #666;
-        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
-        height: calc(100% + 10px);
-        margin-top: -10px;
-        font-size: 14px;
-        padding: 10px 0 0 15px;
-        overflow: auto;
-    }
-    .system_change_log>ul{
-        margin:0px;
-        list-style:none;
-    }
-
-    .system_change_log>ul>li.sub_title{
-        text-indent: 0;
-    }
-
-    .system_change_log>ul>li.sub_title>h6{
-        font-size: 12px;
-        font-family: 微软雅黑;
-        color: #000;
-        margin-top: 8px;
-        margin-bottom: 8px;
-    }
-
-    .system_change_log>ul>li{
-        margin: 5px 0;
-        text-indent: 25px;
-    }
-
-    .system_change_log .label{
-        width: 55px;
-        display: inline-block;
-        padding: 0 10px;
-        line-height: 1.5;
-        font-size: 12px;
-        color: #fff;
-        vertical-align: middle;
-        white-space: nowrap;
-        border-radius: 2px !important;
-        text-transform: uppercase;
-        text-align: center;
-        text-indent: 3px;
-        margin-right: 15px;
-    }
-    .system_change_log .label.s_c_add{
-        background-color: #32d296;
-    }
-
-    .system_change_log .label.s_c_change{
-        background-color: #1e87f0;
-    }
-
-    .system_change_log .label.s_c_remove{
-        background-color: #faa05a;
-    }
-</style>
-<div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2020-03-12 更新说明 Changelog</h2>
-    <br><br>
-    <ul >
-        <li class="sub_title"><h6>权限管理</h6></li>
-        <li><span class="label s_c_change">修改</span>1、密码修改加入密码复杂度校验机制</li>
-        <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">新增</span>1、线调页面新增维修上报功能</li>
-    </ul>
-
-</div>
-
-<script type="text/javascript">
-    $.ajax({
-        url: '/eci/validate_get_destroy_info',
-        dataType: "json",
-        success: function(rs) {
-            if (rs && rs.status === "SUCCESS") {
-                if (rs.data && rs.data.length && rs.data.length > 0) {
-                    swal({
-                        title: "人员配置停用信息",
-                        text: rs.data.join("</br>"),
-                        html: true,
-                        type: "warning",
-                        showCancelButton: true,
-                        confirmButtonColor: "RED",
-                        confirmButtonText: "是",
-                        cancelButtonText: "取消"
-                    });
-                }
-            }
-        }
-    });
-
-</script>
+<style>
+    .system_change_log{
+        background: #fff;
+        color: #666;
+        box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+        height: calc(100% + 10px);
+        margin-top: -10px;
+        font-size: 14px;
+        padding: 10px 0 0 15px;
+        overflow: auto;
+    }
+    .system_change_log>ul{
+        margin:0px;
+        list-style:none;
+    }
+
+    .system_change_log>ul>li.sub_title{
+        text-indent: 0;
+    }
+
+    .system_change_log>ul>li.sub_title>h6{
+        font-size: 12px;
+        font-family: 微软雅黑;
+        color: #000;
+        margin-top: 8px;
+        margin-bottom: 8px;
+    }
+
+    .system_change_log>ul>li{
+        margin: 5px 0;
+        text-indent: 25px;
+    }
+
+    .system_change_log .label{
+        width: 55px;
+        display: inline-block;
+        padding: 0 10px;
+        line-height: 1.5;
+        font-size: 12px;
+        color: #fff;
+        vertical-align: middle;
+        white-space: nowrap;
+        border-radius: 2px !important;
+        text-transform: uppercase;
+        text-align: center;
+        text-indent: 3px;
+        margin-right: 15px;
+    }
+    .system_change_log .label.s_c_add{
+        background-color: #32d296;
+    }
+
+    .system_change_log .label.s_c_change{
+        background-color: #1e87f0;
+    }
+
+    .system_change_log .label.s_c_remove{
+        background-color: #faa05a;
+    }
+</style>
+<div class="system_change_log">
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2020-07-30 更新说明 Changelog</h2>
+    <br><br>
+    <ul >
+        <li class="sub_title"><h6>权限管理</h6></li>
+        <li><span class="label s_c_change">修改</span>1、权限加入分级概念，同级、上级不能操作，如:下级账户不能创建管理员账户</li>
+        <li><span class="label s_c_change">修改</span>2、权限操作时验证角色信息</li>
+        <li class="sub_title"><h6>线调</h6></li>
+        <li><span class="label s_c_change">修改</span>1、轨迹回放版本切换问题修复</li>
+        <li><span class="label s_c_change">修改</span>2、批量换人换车可能造成某日班次不能清除问题修复</li>
+        <li><span class="label s_c_change">修改</span>3、调度系统中偶然出现的批量掉线问题修复(调度网关有数据情况)</li>
+        <li><span class="label s_c_change">修改</span>4、安全驾驶添加了安全检查类别、接口地址调整</li>
+        <li><span class="label s_c_change">新增</span>5、与服务热线系统对接,可在线调页填写服务投诉信息</li>
+        <li class="sub_title"><h6>计调</h6></li>
+        <li><span class="label s_c_change">新增</span>1、人员停用在home.html做弹出框，后台获取当前用户权限下的线路人员配置停用信息</li>
+        <li><span class="label s_c_change">新增</span>2、人员管理添加金蝶工号显示</li>
+        <li><span class="label s_c_change">新增</span>3、修改时刻表明细编辑页面，添加班型编辑列，修改相关指令</li>
+        <li><span class="label s_c_change">修改</span>4、修复时刻表批量修改问题所在</li>
+        <li><span class="label s_c_change">新增</span>5、添加车辆同步接口web服务</li>
+        <li><span class="label s_c_change">新增</span>6、调度执勤日报修改人员，车辆时，初始会修改已有车辆人员配置（如套跑某个班次的车辆不一样，初始时会修改）</li>
+        <li><span class="label s_c_change">修改</span>7、排班明细修改班次时，修改去除工号的前缀</li>
+        <li class="sub_title"><h6>基础信息</h6></li>
+        <li><span class="label s_c_change">新增</span>1、添加线路和修改线路时，选择环线或者双向的提示</li>
+        <li><span class="label s_c_change">新增</span>2、添加站点行业编码字段</li>
+    </ul>
+
+</div>
+
+<script type="text/javascript">
+    $.ajax({
+        url: '/eci/validate_get_destroy_info',
+        dataType: "json",
+        success: function(rs) {
+            if (rs && rs.status === "SUCCESS") {
+                if (rs.data && rs.data.length && rs.data.length > 0) {
+                    swal({
+                        title: "人员配置停用信息",
+                        text: rs.data.join("</br>"),
+                        html: true,
+                        type: "warning",
+                        showCancelButton: true,
+                        confirmButtonColor: "RED",
+                        confirmButtonText: "是",
+                        cancelButtonText: "取消"
+                    });
+                }
+            }
+        }
+    });
+
+</script>
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -123,7 +123,7 @@
  
  
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		//d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
-<style type="text/css">
+<style type="text/css">
 	.table-bordered {
 	  border: 1px solid; }
 	  .table-bordered > thead > tr > th,
@@ -113,7 +113,7 @@
  
  
 		var d = new Date();
-		d.setTime(d.getTime() - 1*1000*60*60*24);
+		//d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
-/** 空间数据 */
-
-var gb_map_spatial_data = (function () {
-
-    var storage = window.localStorage;
-
-    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
-    var line_idx = (function () {
-        var str = '';
-        for (var i = 0, item; item = activeLines[i++];) {
-            str += (',' + item.lineCode);
-        }
-        return str.substr(1);
-    })();
-
-    var cont = '#spatial-tree-content';
-    //线路站点路由数据
-    var lineStationArr;
-
-    //停车场数据
-    var carparkArr;
-
-    var init = function () {
-        //加载站点路由数据
-        gb_common.$get('/realMap/stationVersionSpatialData', {idx: line_idx}, function (rs) {
-            var list = rs.list;
-            $.each(list, function () {
-                this.lat = this.gLaty;
-                this.lon = this.gLonx;
-                delete this.gLaty;
-                delete this.gLonx;
-                if(this.shapesType=='d'){
-                    var calcRs = calcPolygonArea(this.gPolygonGrid);
-                    this._polygonArea = calcRs._polygonArea;
-                    this._gPoints = calcRs._gPoints;
-                }
-            });
-            //排序
-            list.sort(function (a, b) {
-                return a.stationRouteCode - b.stationRouteCode;
-            });
-            //按线路分组
-            lineStationArr = gb_common.groupBy(list, 'lineCode');
-            //再按上下行分组
-            for (var lineCode in lineStationArr) {
-                lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
-            }
-
-            ep.emitLater('station');
-        });
-
-        //加载停车场数据
-        gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
-            carparkArr = rs.list;
-            $.each(carparkArr, function () {
-                if(this.shapesType=='d'){
-                    var calcRs = calcPolygonArea(this.gParkPoint);
-                    this._polygonArea = calcRs._polygonArea;
-                    this._gPoints = calcRs._gPoints;
-                }
-            });
-            ep.emitLater('carpark');
-        });
-
-        var ep = EventProxy.create('station', 'carpark', function () {
-            $(".real_spatial_panel").resizable({
-                maxHeight: '100%',
-                minHeight: 18
-            });
-
-            //绘制站点路由树
-            $('.station-route-tree', cont)
-            //state插件 状态恢复完成
-                .on('state_ready.jstree', function () {
-                    //绑定checkbox状态切换事件
-                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawStation);
-                })
-                .on('activate_node.jstree', function (e, n) {
-                    var node = n.node;
-                    if(node.state.checked)
-                        gb_map_overlay_mge._focus_station(node.data);
-                })
-                .jstree({
-                    'core': {
-                        'data': get_st_route_tree_data()
-                    },
-                    'checkbox': {
-                        'keep_selected_style': false,
-                        'whole_node': false,
-                        'tie_selection': false
-                    },
-                    //local storage里的key
-                    'state': {
-                        'key': 'jstree_map_station_route'
-                    },
-                    'plugins': ['checkbox', 'state']
-                });
-
-
-            //停车场
-            $('.carpark-panel', cont)
-                .on('state_ready.jstree', function () {
-                    //绑定checkbox状态切换事件
-                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawCarpark);
-                })
-                .on('activate_node.jstree', function (e, n) {
-                    var node = n.node;
-                    if(node.state.checked)
-                        gb_map_overlay_mge._focus_carpark(node.data);
-                })
-                .jstree({
-                    'core': {
-                        'data': get_st_carpark_tree_data()
-                    },
-                    'checkbox': {
-                        'keep_selected_style': false,
-                        'whole_node': false,
-                        'tie_selection': false
-                    },
-                    //local storage里的key
-                    'state': {
-                        'key': 'jstree_map_carpark'
-                    },
-                    'plugins': ['checkbox', 'state']
-                });
-
-            refresh();
-        });
-    };
-
-    //计算多边形面积
-    function calcPolygonArea(polygonStr) {
-        var pStr = polygonStr.substring(9, polygonStr.length - 2);
-        var array = pStr.split(',');
-        var newArr=[];
-
-        //递归去掉闭合的尾
-        (function () {
-            var f = arguments.callee;
-            var end=array.length - 1;
-            if(array.length > 1 && array[0] == array[end]){
-                array = array.slice(0, end);
-                f();
-            }
-        })();
-
-        //去掉连续的重复点
-        var last;
-        $.each(array, function (i, str) {
-            if(last){
-                if(last != str)
-                    newArr.push(str);
-            }
-            else
-                newArr.push(str);
-            last = str;
-        });
-
-        var gPoints=[],ts;
-        $.each(newArr, function (i, c) {
-            ts=c.split(' ');
-            gPoints.push({
-                lat: parseFloat(ts[1]),
-                lng: parseFloat(ts[0])
-            });
-        });
-
-        //用百度geo工具库计算面积
-        var _polygonArea = BMapLib.GeoUtils.getPolygonArea(gPoints);
-        return {_polygonArea: _polygonArea.toFixed(2), _gPoints: gPoints};
-    }
-
-    var refresh = function (type, checked) {
-        if (!triggerElem())
-            return;
-
-        if ((type == 'carPark' && checked) || (type == 'station' && !checked)) {
-            //显示停车场面板
-            $('.car-park-item', cont).addClass('uk-active');
-            $('li.cp-tab-btn', '.real_spatial_panel').addClass('uk-active');
-            $('.carpark-panel', cont).jstree(true).check_all();
-
-            //绘制停车场
-            gb_map_overlay_mge.drawCarpark();
-        }
-        else {
-            //显示站点路由面板
-            $('.station-route-item', cont).addClass('uk-active');
-            $('li.sr-tab-btn', '.real_spatial_panel').addClass('uk-active');
-
-            //选中相关站点路由树
-            var chs = gb_map_overlay_mge.getCheckedDevice();
-            var idx = {};
-            $.each(chs, function () {
-                idx[this.data.lineId + '_' + this.data.upDown] = 1;
-            });
-
-            var treeObj = $('.station-route-tree', cont).jstree(true);
-            for (var id in idx) {
-                treeObj.check_node(treeObj.get_node(id + '_st'));
-            }
-
-            //drawStation();
-            gb_map_overlay_mge.drawStation();
-        }
-    }
-
-    var triggerElem = function () {
-        var config = gb_map_config.getConfig().spatialData;
-
-        if(config.station || config.carPark){
-            showPanel();
-            return true;
-        }
-        hidePanel();
-        //gb_map_imap.call('hideAllStationMarker');
-        //gb_map_imap.call('hideDrawCarpark');
-        return false;
-    }
-
-    var animationend = 'webkitAnimationEnd animationend';
-    var showPanel = function () {
-        var elem = $('.real_spatial_panel');
-        var config = gb_map_config.getConfig().spatialData;
-
-        if (config.station && config.carPark) {
-            anim_show($('.uk-subnav', elem), 'uk-animation-scale-up');
-            $('.real_spatial_body', elem).addClass('show-tab');
-        }
-        else {
-            $('.uk-subnav', elem).hide();
-            $('.real_spatial_body', elem).removeClass('show-tab');
-        }
-
-        $('li.uk-active', elem).removeClass('uk-active');
-
-        if (!elem.is(":hidden"))
-            return;
-
-        anim_show(elem, 'uk-animation-slide-left');
-    }
-
-    var hidePanel = function () {
-        var elem = $('.real_spatial_panel');
-        elem.hide();
-    }
-
-    function anim_show(e, anim) {
-        e.addClass(anim).show().one(animationend, function () {
-            $(this).removeClass(anim);
-        });
-    }
-
-    function getCheckedStation() {
-        var list = [];
-        var chs = $('.station-route-tree', cont).jstree(true).get_checked(true);
-        chs = chs.filter(function (item) {
-            return item.data;
-        });
-        $.each(chs, function () {
-            list.push(this.data);
-        });
-        return list;
-    }
-
-    function gteCheckedCarpark() {
-        var list = [];
-        var chs = $('.carpark-panel', cont).jstree(true).get_checked(true);
-        $.each(chs, function () {
-            list.push(this.data);
-        });
-        return list;
-    }
-
-    var get_st_route_tree_data = function () {
-        var treeData = [];
-
-        for (var lineCode in lineStationArr) {
-            name = gb_data_basic.codeToLine[lineCode].name;
-            treeData.push({
-                'text': name,
-                'open': true,
-                'children': [
-                    {
-                        'text': '上行',
-                        'children': grabs(lineStationArr[lineCode][0]),
-                        'id': lineCode + '_0_st'
-                    },
-                    {
-                        'text': '下行',
-                        'children': grabs(lineStationArr[lineCode][1]),
-                        'id': lineCode + '_1_st'
-                    }
-                ]
-            })
-        }
-        return treeData;
-    };
-    var get_st_route_tree_data_version = function () {
-        var treeData = [];
-
-        for (var lineCode in lineVersionStationArr) {
-            name = gb_data_basic.codeToLine[lineCode].name;
-            treeData.push({
-                'text': name,
-                'open': true,
-                'children': [
-                    {
-                        'text': '上行',
-                        'children': grabs(lineVersionStationArr[lineCode][0]),
-                        'id': lineCode + '_0_st'
-                    },
-                    {
-                        'text': '下行',
-                        'children': grabs(lineVersionStationArr[lineCode][1]),
-                        'id': lineCode + '_1_st'
-                    }
-                ]
-            })
-        }
-        return treeData;
-    };
-    var get_st_carpark_tree_data = function () {
-        var treeData = [];
-
-        $.each(carparkArr, function () {
-            treeData.push({
-                'text': this.parkName,
-                'data': this
-            });
-        });
-
-        return treeData;
-    }
-
-    var grabs = function (array) {
-        if (!array)
-            return;
-        var rs = [];
-        $.each(array, function () {
-            rs.push({
-                'text': this.stationName,
-                'data': this,
-                'icon': false
-            });
-        });
-        return rs;
-    }
-
-    return {
-        refresh: refresh,
-        init: init,
-        getCheckedStation:getCheckedStation,
-        gteCheckedCarpark: gteCheckedCarpark,
-        getStationArray: function (lineCode) {
-            return lineStationArr[lineCode];
-        },
-        carparkArray: function () {
-            return carparkArr;
-        }
-    };
+/** 空间数据 */
+
+var gb_map_spatial_data = (function () {
+
+    var storage = window.localStorage;
+
+    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
+    var line_idx = (function () {
+        var str = '';
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+        }
+        return str.substr(1);
+    })();
+
+    var cont = '#spatial-tree-content';
+    //线路站点路由数据
+    var lineStationArr, currentLineStationArr;
+
+    //停车场数据
+    var carparkArr;
+
+    var init = function () {
+
+        //加载各线路当前版本站点路由数据
+        gb_common.$get('/realMap/stationSpatialData', {idx: line_idx}, function (rs) {
+            var list = rs.list;
+            $.each(list, function () {
+                this.lat = this.gLaty;
+                this.lon = this.gLonx;
+                delete this.gLaty;
+                delete this.gLonx;
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gPolygonGrid);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            //排序
+            list.sort(function (a, b) {
+                return a.stationRouteCode - b.stationRouteCode;
+            });
+            //按线路分组
+            currentLineStationArr = gb_common.groupBy(list, 'lineCode');
+            //再按上下行分组
+            for (var lineCode in currentLineStationArr) {
+                currentLineStationArr[lineCode] = gb_common.groupBy(currentLineStationArr[lineCode], 'directions');
+            }
+
+            ep.emitLater('currentstation');
+        });
+
+        //加载各线路所有版本站点路由数据(轨迹回放时用)
+        gb_common.$get('/realMap/stationVersionSpatialData', {idx: line_idx}, function (rs) {
+            var list = rs.list;
+            $.each(list, function () {
+                this.lat = this.gLaty;
+                this.lon = this.gLonx;
+                delete this.gLaty;
+                delete this.gLonx;
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gPolygonGrid);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            //排序
+            list.sort(function (a, b) {
+                return a.stationRouteCode - b.stationRouteCode;
+            });
+            //按线路分组
+            lineStationArr = gb_common.groupBy(list, 'lineCode');
+            //再按上下行分组
+            for (var lineCode in lineStationArr) {
+                lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
+            }
+
+            ep.emitLater('station');
+        });
+
+        //加载停车场数据
+        gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+            carparkArr = rs.list;
+            $.each(carparkArr, function () {
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gParkPoint);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            ep.emitLater('carpark');
+        });
+
+        var ep = EventProxy.create('currentstation', 'station', 'carpark', function () {
+            $(".real_spatial_panel").resizable({
+                maxHeight: '100%',
+                minHeight: 18
+            });
+
+            //绘制站点路由树
+            $('.station-route-tree', cont)
+            //state插件 状态恢复完成
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawStation);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_station(node.data);
+                })
+                .jstree({
+                    'core': {
+                        'data': get_st_route_tree_data()
+                    },
+                    'checkbox': {
+                        'keep_selected_style': false,
+                        'whole_node': false,
+                        'tie_selection': false
+                    },
+                    //local storage里的key
+                    'state': {
+                        'key': 'jstree_map_station_route'
+                    },
+                    'plugins': ['checkbox', 'state']
+                });
+
+
+            //停车场
+            $('.carpark-panel', cont)
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawCarpark);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_carpark(node.data);
+                })
+                .jstree({
+                    'core': {
+                        'data': get_st_carpark_tree_data()
+                    },
+                    'checkbox': {
+                        'keep_selected_style': false,
+                        'whole_node': false,
+                        'tie_selection': false
+                    },
+                    //local storage里的key
+                    'state': {
+                        'key': 'jstree_map_carpark'
+                    },
+                    'plugins': ['checkbox', 'state']
+                });
+
+            refresh();
+        });
+    };
+
+    //计算多边形面积
+    function calcPolygonArea(polygonStr) {
+        var pStr = polygonStr.substring(9, polygonStr.length - 2);
+        var array = pStr.split(',');
+        var newArr=[];
+
+        //递归去掉闭合的尾
+        (function () {
+            var f = arguments.callee;
+            var end=array.length - 1;
+            if(array.length > 1 && array[0] == array[end]){
+                array = array.slice(0, end);
+                f();
+            }
+        })();
+
+        //去掉连续的重复点
+        var last;
+        $.each(array, function (i, str) {
+            if(last){
+                if(last != str)
+                    newArr.push(str);
+            }
+            else
+                newArr.push(str);
+            last = str;
+        });
+
+        var gPoints=[],ts;
+        $.each(newArr, function (i, c) {
+            ts=c.split(' ');
+            gPoints.push({
+                lat: parseFloat(ts[1]),
+                lng: parseFloat(ts[0])
+            });
+        });
+
+        //用百度geo工具库计算面积
+        var _polygonArea = BMapLib.GeoUtils.getPolygonArea(gPoints);
+        return {_polygonArea: _polygonArea.toFixed(2), _gPoints: gPoints};
+    }
+
+    var refresh = function (type, checked) {
+        if (!triggerElem())
+            return;
+
+        if ((type == 'carPark' && checked) || (type == 'station' && !checked)) {
+            //显示停车场面板
+            $('.car-park-item', cont).addClass('uk-active');
+            $('li.cp-tab-btn', '.real_spatial_panel').addClass('uk-active');
+            $('.carpark-panel', cont).jstree(true).check_all();
+
+            //绘制停车场
+            gb_map_overlay_mge.drawCarpark();
+        }
+        else {
+            //显示站点路由面板
+            $('.station-route-item', cont).addClass('uk-active');
+            $('li.sr-tab-btn', '.real_spatial_panel').addClass('uk-active');
+
+            //选中相关站点路由树
+            var chs = gb_map_overlay_mge.getCheckedDevice();
+            var idx = {};
+            $.each(chs, function () {
+                idx[this.data.lineId + '_' + this.data.upDown] = 1;
+            });
+
+            var treeObj = $('.station-route-tree', cont).jstree(true);
+            for (var id in idx) {
+                treeObj.check_node(treeObj.get_node(id + '_st'));
+            }
+
+            //drawStation();
+            gb_map_overlay_mge.drawStation();
+        }
+    }
+
+    var triggerElem = function () {
+        var config = gb_map_config.getConfig().spatialData;
+
+        if(config.station || config.carPark){
+            showPanel();
+            return true;
+        }
+        hidePanel();
+        //gb_map_imap.call('hideAllStationMarker');
+        //gb_map_imap.call('hideDrawCarpark');
+        return false;
+    }
+
+    var animationend = 'webkitAnimationEnd animationend';
+    var showPanel = function () {
+        var elem = $('.real_spatial_panel');
+        var config = gb_map_config.getConfig().spatialData;
+
+        if (config.station && config.carPark) {
+            anim_show($('.uk-subnav', elem), 'uk-animation-scale-up');
+            $('.real_spatial_body', elem).addClass('show-tab');
+        }
+        else {
+            $('.uk-subnav', elem).hide();
+            $('.real_spatial_body', elem).removeClass('show-tab');
+        }
+
+        $('li.uk-active', elem).removeClass('uk-active');
+
+        if (!elem.is(":hidden"))
+            return;
+
+        anim_show(elem, 'uk-animation-slide-left');
+    }
+
+    var hidePanel = function () {
+        var elem = $('.real_spatial_panel');
+        elem.hide();
+    }
+
+    function anim_show(e, anim) {
+        e.addClass(anim).show().one(animationend, function () {
+            $(this).removeClass(anim);
+        });
+    }
+
+    function getCheckedStation() {
+        var list = [];
+        var chs = $('.station-route-tree', cont).jstree(true).get_checked(true);
+        chs = chs.filter(function (item) {
+            return item.data;
+        });
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+
+    function gteCheckedCarpark() {
+        var list = [];
+        var chs = $('.carpark-panel', cont).jstree(true).get_checked(true);
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+
+    var get_st_route_tree_data = function () {
+        var treeData = [];
+
+        for (var lineCode in currentLineStationArr) {
+            name = gb_data_basic.codeToLine[lineCode].name;
+            treeData.push({
+                'text': name,
+                'open': true,
+                'children': [
+                    {
+                        'text': '上行',
+                        'children': grabs(currentLineStationArr[lineCode][0]),
+                        'id': lineCode + '_0_st'
+                    },
+                    {
+                        'text': '下行',
+                        'children': grabs(currentLineStationArr[lineCode][1]),
+                        'id': lineCode + '_1_st'
+                    }
+                ]
+            })
+        }
+        return treeData;
+    };
+    var get_st_route_tree_data_version = function () {
+        var treeData = [];
+
+        for (var lineCode in lineVersionStationArr) {
+            name = gb_data_basic.codeToLine[lineCode].name;
+            treeData.push({
+                'text': name,
+                'open': true,
+                'children': [
+                    {
+                        'text': '上行',
+                        'children': grabs(lineVersionStationArr[lineCode][0]),
+                        'id': lineCode + '_0_st'
+                    },
+                    {
+                        'text': '下行',
+                        'children': grabs(lineVersionStationArr[lineCode][1]),
+                        'id': lineCode + '_1_st'
+                    }
+                ]
+            })
+        }
+        return treeData;
+    };
+    var get_st_carpark_tree_data = function () {
+        var treeData = [];
+
+        $.each(carparkArr, function () {
+            treeData.push({
+                'text': this.parkName,
+                'data': this
+            });
+        });
+
+        return treeData;
+    }
+
+    var grabs = function (array) {
+        if (!array)
+            return;
+        var rs = [];
+        $.each(array, function () {
+            rs.push({
+                'text': this.stationName,
+                'data': this,
+                'icon': false
+            });
+        });
+        return rs;
+    }
+
+    return {
+        refresh: refresh,
+        init: init,
+        getCheckedStation:getCheckedStation,
+        gteCheckedCarpark: gteCheckedCarpark,
+        getStationArray: function (lineCode) {
+            return lineStationArr[lineCode];
+        },
+        carparkArray: function () {
+            return carparkArr;
+        }
+    };
 })();
 \ No newline at end of file