Commit 6d3367ca4125fe88ca9b6bdeb4540e393d05fa46
Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Showing
4 changed files
with
18 additions
and
17 deletions
src/main/resources/static/pages/base/line/editRoute.html
| ... | ... | @@ -149,9 +149,9 @@ $('#edit_route_mobal').on('editRouteMobal.show', function(e,transGPS,editRoute,m |
| 149 | 149 | var stationList = arrayFormat.stationList; |
| 150 | 150 | var sectionListTemp = arrayFormat.sectionList; |
| 151 | 151 | var sectionList = []; |
| 152 | - // 隔50个取一个点（相当于50s） | |
| 153 | - for(var i = 0; i*40 < sectionListTemp.length; i++) { | |
| 154 | - sectionList[i] = sectionListTemp[i*40]; | |
| 152 | + // 隔30个取一个点（相当于30s） | |
| 153 | + for(var i = 0; i*30 < sectionListTemp.length; i++) { | |
| 154 | + sectionList[i] = sectionListTemp[i*30]; | |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | var sectionListFinal = []; |
| ... | ... | @@ -273,7 +273,7 @@ $('#edit_route_mobal').on('editRouteMobal.show', function(e,transGPS,editRoute,m |
| 273 | 273 | //$('#uploadRoute').addClass('hidden'); |
| 274 | 274 | $('#upload').addClass('hidden'); |
| 275 | 275 | layer.msg('请先编辑路段，并保存！！！'); |
| 276 | - }else { | |
| 276 | + }else { | |
| 277 | 277 | layer.msg('生成路线失败！'); |
| 278 | 278 | } |
| 279 | 279 | }); | ... | ... |
src/main/resources/static/pages/base/line/js/line-list-map.js
| ... | ... | @@ -30,7 +30,7 @@ var WorldsBMapLine = function () { |
| 30 | 30 | mapBValue = new BMap.Map("bmap_basic"); |
| 31 | 31 | |
| 32 | 32 | //中心点和缩放级别 |
| 33 | - mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15); | |
| 33 | + mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 20); | |
| 34 | 34 | |
| 35 | 35 | //启用地图拖拽事件，默认启用(可不写) |
| 36 | 36 | mapBValue.enableDragging(); | ... | ... |
src/main/resources/static/pages/base/line/map.html
| ... | ... | @@ -109,11 +109,11 @@ $(function(){ |
| 109 | 109 | }); |
| 110 | 110 | |
| 111 | 111 | // 提交截取事件 |
| 112 | - $('#cutSection').on('click', function() { | |
| 113 | - layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', { | |
| 114 | - btn: ['提交','取消'] //按钮 | |
| 115 | - }, function(){ | |
| 116 | - if(WorldsBMapLine.getPointIndex() > 0) { | |
| 112 | + $('#cutSection').on('click', function() { | |
| 113 | + if(WorldsBMapLine.getPointIndex() > 0) { | |
| 114 | + layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', { | |
| 115 | + btn: ['提交','取消'] //按钮 | |
| 116 | + }, function(){ | |
| 117 | 117 | var sectionList = WorldsBMapLine.getSectionList(); |
| 118 | 118 | var data = {}; |
| 119 | 119 | var section = EditSectionObj.getEitdSection(); |
| ... | ... | @@ -131,10 +131,11 @@ $(function(){ |
| 131 | 131 | layer.msg('提交失败...'); |
| 132 | 132 | } |
| 133 | 133 | }); |
| 134 | - } else { | |
| 135 | - layer.msg("请先截取路段！！！"); | |
| 136 | - } | |
| 137 | - }); | |
| 134 | + }); | |
| 135 | + } else { | |
| 136 | + layer.msg("请先截取路段！！！"); | |
| 137 | + } | |
| 138 | + //}); | |
| 138 | 139 | }); |
| 139 | 140 | |
| 140 | 141 | // 删除最后一个路段 | ... | ... |
src/main/resources/static/pages/mapmonitor/real/js/playBack.js
| ... | ... | @@ -269,9 +269,9 @@ var playBack = (function() { |
| 269 | 269 | |
| 270 | 270 | if(defaultLine){ |
| 271 | 271 | layer.msg('加载线路图层数据...', {icon: 16, time: 0,shade:0.3}); |
| 272 | - $.get('/realMap/findRouteByLine', {lineCode: defaultLine} | |
| 273 | - ,function(route){ | |
| 274 | - lineRoute = route; | |
| 272 | + $.get('/realMap/findRouteByLine', {idx: defaultLine} | |
| 273 | + ,function(rs){ | |
| 274 | + lineRoute = rs[defaultLine]; | |
| 275 | 275 | iMap.call('drawLine', {route: lineRoute}); |
| 276 | 276 | |
| 277 | 277 | cTime = sTime; | ... | ... |