潘钊 / bsth_control · Commits

Commit f72f897c712d0faceb716346e9197e015f447d6b

Authored by 李强
1 parent a74f9f1b
build: skipped

bsthlq 李强<2519941818@qq.com>

Inline Side-by-side
Showing 38 changed files with 227 additions and 113 deletions
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @f72f897
... ... @@ -552,9 +552,11 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
552 552  
553 553 String textStr = newTextFileToFTP(objects,lineId);
554 554  
555   - textStr = line.getName() + " " + "2" + "\r\n" + textStr;
  555 + /*textStr = line.getName() + "\t" + "2" + "\r\n" + textStr;*/
556 556  
557   - InputStream input = new ByteArrayInputStream(textStr.getBytes("utf-8"));
  557 + textStr = line.getName() + "\t" + "2" + "\r" + textStr;
  558 +
  559 + InputStream input = new ByteArrayInputStream(textStr.getBytes("gbk"));
558 560  
559 561 /** 生成text文件 */
560 562 clientUtils.uploadFile(url, port, username, password, remotePath, textFileName, input);
... ... @@ -611,37 +613,37 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
611 613 // 纬度
612 614 String lat = objects.get(i)[1].equals("") ? "" : objects.get(i)[1].toString();
613 615  
614   - lat = " " + lat;
  616 + lat = "\t" + lat;
615 617  
616 618 // 站点类型
617 619 String stationMake = objects.get(i)[3].equals("") ? "" : objects.get(i)[3].toString();
618 620  
619 621 if(stationMake.equals("E")) {
620 622  
621   - stationMake = " " + "2";
  623 + stationMake = "\t" + "2";
622 624  
623 625 }else {
624 626  
625   - stationMake =" " + "1";
  627 + stationMake ="\t" + "1";
626 628  
627 629 }
628 630  
629 631 // 站点序号
630 632 String stationNo = objects.get(i)[4].equals("") ? "" : objects.get(i)[4].toString();
631 633  
632   - stationNo = " " + stationNo;
  634 + stationNo = "\t" + stationNo;
633 635  
634 636 // 站点编码
635 637 String stationCode = objects.get(i)[5].equals("") ? "" : objects.get(i)[5].toString();
636 638  
637   - stationCode = " " +stationCode;
  639 + stationCode = "\t" +stationCode;
638 640  
639 641 double dis = objects.get(i)[6]==null ? 0.0 : Double.parseDouble(objects.get(i)[6].toString());
640 642  
641 643 double tempd = dis*1000;
642 644  
643 645 // 站点距离
644   - String staitondistance = " " + String.valueOf((int) tempd);
  646 + String staitondistance = "\t" + String.valueOf((int) tempd);
645 647  
646 648 // 站点名称
647 649 String stationName = objects.get(i)[7].equals("") ? "" : objects.get(i)[7].toString();
... ... @@ -659,7 +661,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
659 661  
660 662 sleepStr = sobje.get(0)[2] == null ? "" : sobje.get(0)[2].toString();
661 663  
662   - sleepStr = " " + sleepStr;
  664 + sleepStr = "\t" + sleepStr;
663 665  
664 666 }else if(sobje.size()>1){
665 667  
... ... @@ -674,7 +676,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
674 676  
675 677 sleepStr = sobje.get(j)[2].toString();
676 678  
677   - sleepStr = " " + sleepStr;
  679 + sleepStr = "\t" + sleepStr;
678 680  
679 681 }
680 682  
... ... @@ -697,10 +699,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
697 699 }
698 700  
699 701 if(sleepStr.equals(""))
700   - sleepStr = " " + "60";
  702 + sleepStr = "\t" + "60";
701 703  
702 704  
703   - stationName = " " +stationName;
  705 + stationName = "\t" +stationName;
704 706  
705 707 stationRStr = stationRStr + lng + lat + stationMake + stationNo + stationCode + staitondistance + sleepStr + stationName + enterStr;
706 708  
... ...
src/main/resources/static/pages/base/carpark/add.html
  View file @f72f897
... ... @@ -120,7 +120,7 @@
120 120 <!-- 站点位置 -->
121 121 <div class="tab-pane" id="tab2">
122 122 <h3 class="block"> 站点位置 </h3>
123   - <div id="bmap_basic"></div>
  123 + <div id="addCarParkbmap_basic"></div>
124 124  
125 125 <div class="leftUtils">
126 126 <div class="btn-group" style="left: 100px;">
... ...
src/main/resources/static/pages/base/carpark/css/carpark-add.css
  View file @f72f897
... ... @@ -7,7 +7,7 @@
7 7 padding-top: 7px;
8 8 top: 400px;
9 9 }
10   -#bmap_basic{
  10 +#addCarParkbmap_basic{
11 11 min-width: 100%;
12 12 width: 100%;
13 13 margin-top: -28px;
... ...
src/main/resources/static/pages/base/carpark/css/positions.css
  View file @f72f897
1   -#bmap_basic{
  1 +#carParkbmap_basic{
2 2 min-width: 100%;
3 3 width: calc(100% + 26px);
4 4 margin-top: -28px;
... ...
src/main/resources/static/pages/base/carpark/edit_select.html
  View file @f72f897
... ... @@ -143,6 +143,10 @@ $(&#39;#editPositions_select_mobal&#39;).on(&#39;editSelectMobal_show&#39;, function(e, map,fun,
143 143 // 隐藏弹出层
144 144 $('#editPositions_select_mobal').modal('hide');
145 145  
  146 + $('#eidt').attr("disabled",true);
  147 + 　
  148 + $('#eidt').addClass('btn disabled');
  149 +
146 150 // 表单序列
147 151 var params = form.serializeJSON();
148 152  
... ...
src/main/resources/static/pages/base/carpark/js/add-form-events.js
  View file @f72f897
... ... @@ -12,13 +12,13 @@ $(function(){
12 12  
13 13 $('#oppenDrawingManager').on('click',function() {
14 14  
15   - VmapWorlds.drawingManagerOpen();
  15 + addCarParkVmapWorlds.drawingManagerOpen();
16 16  
17 17 });
18 18  
19 19 $('#closeDrawingManager').on('click',function() {
20 20  
21   - VmapWorlds.drawingManagerClose();
  21 + addCarParkVmapWorlds.drawingManagerClose();
22 22  
23 23 });
24 24  
... ...
src/main/resources/static/pages/base/carpark/js/add-form-reload.js
  View file @f72f897
... ... @@ -25,7 +25,7 @@
25 25  
26 26 FormWizard.init();
27 27  
28   - mapB = VmapWorlds.init();
  28 + mapB = addCarParkVmapWorlds.init();
29 29  
30 30 PublicFunctions.getCarParkCode(function(carParkCode) {
31 31  
... ...
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
  View file @f72f897
... ... @@ -266,19 +266,27 @@ var FormWizard = function() {
266 266 // 设置停车场名称
267 267 $('#parkNameInput').val(stationNameV);
268 268  
269   - VmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
270   -
271 269 if(baseResValue == 0) {
272   -
273   - $('.leftUtils').hide();
274   -
275   - VmapWorlds.pointsCircle(p);
276 270  
  271 + $('.leftUtils').hide();
  272 +
  273 + addCarParkVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
  274 +
  275 + if(p) {
  276 +
  277 + addCarParkVmapWorlds.pointsCircle(p);
  278 +
  279 + }
  280 +
  281 + });
  282 +
277 283 }else if(baseResValue ==1) {
278 284  
  285 + addCarParkVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
  286 +
279 287 $('.leftUtils').show();
280 288  
281   - VmapWorlds.drawingManagerOpen();
  289 + addCarParkVmapWorlds.drawingManagerOpen();
282 290  
283 291 }
284 292 }
... ... @@ -353,9 +361,9 @@ var FormWizard = function() {
353 361  
354 362 if(index==2) {
355 363  
356   - VmapWorlds.clearMarkAndOverlays();
  364 + addCarParkVmapWorlds.clearMarkAndOverlays();
357 365  
358   - VmapWorlds.drawingManagerClose();
  366 + addCarParkVmapWorlds.drawingManagerClose();
359 367  
360 368 }
361 369  
... ... @@ -372,11 +380,11 @@ var FormWizard = function() {
372 380  
373 381 if(index ==0) {
374 382  
375   - VmapWorlds.drawingManagerClose();
  383 + addCarParkVmapWorlds.drawingManagerClose();
376 384  
377 385 }
378 386  
379   - VmapWorlds.clearMarkAndOverlays();
  387 + addCarParkVmapWorlds.clearMarkAndOverlays();
380 388  
381 389 handleTitle(tab, navigation, index);
382 390  
... ...
src/main/resources/static/pages/base/carpark/js/add-vmap-world.js
  View file @f72f897
1   -var VmapWorlds = function() {
  1 +var addCarParkVmapWorlds = function() {
2 2  
3 3 var mapB = '', circle = '', drawingManager = '',circle='',marker='';
4 4  
... ... @@ -13,7 +13,7 @@ var VmapWorlds = function() {
13 13 var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
14 14  
15 15 // 初始化百度地图
16   - mapB = new BMap.Map("bmap_basic");
  16 + mapB = new BMap.Map("addCarParkbmap_basic");
17 17  
18 18 //中心点和缩放级别
19 19 mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
... ...
src/main/resources/static/pages/base/carpark/js/carpark-positions-events.js
  View file @f72f897
... ... @@ -16,7 +16,7 @@ $(function(){
16 16  
17 17 $(pjaxContainer).append(m);
18 18  
19   - $('#editPositions_select_mobal').trigger('editSelectMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
  19 + $('#editPositions_select_mobal').trigger('editSelectMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
20 20  
21 21 });
22 22  
... ...
src/main/resources/static/pages/base/carpark/js/carpark-positions-function.js
  View file @f72f897
... ... @@ -41,10 +41,10 @@ var PublicFunctions = function () {
41 41 var nameV = r[0].carParkName;
42 42  
43 43 /** 根据名称定位 */
44   - WorldsBMap.localSearchFromAdreesToPoint(nameV);
  44 + CarParkPWorldsBMap.localSearchFromAdreesToPoint(nameV);
45 45  
46 46 // 打开绘制工具
47   - WorldsBMap.openDrawingManager();
  47 + CarParkPWorldsBMap.openDrawingManager();
48 48  
49 49 });
50 50  
... ... @@ -213,12 +213,12 @@ var PublicFunctions = function () {
213 213 if(stationShapesType == 'r') {
214 214  
215 215 /** 画圆 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
216   - WorldsBMap.pointsCircle(r,point,htm,opts);
  216 + CarParkPWorldsBMap.pointsCircle(r,point,htm,opts);
217 217  
218 218 }else if(stationShapesType == 'd'){
219 219  
220 220 /** 画多边形 @param：<r：停车场信息；point：中心点；htm：信息窗口html文本；pots：信息窗口参数属性> */
221   - WorldsBMap.pointsPolygon(r,point,htm,opts);
  221 + CarParkPWorldsBMap.pointsPolygon(r,point,htm,opts);
222 222  
223 223 }
224 224 }
... ...
src/main/resources/static/pages/base/carpark/js/carpark-positions-map.js
  View file @f72f897
... ... @@ -3,7 +3,7 @@
3 3 *
4 4 */
5 5  
6   -var WorldsBMap = function () {
  6 +var CarParkPWorldsBMap = function () {
7 7  
8 8 var mapValue='',drawingManager='',marker='',circle='',polygon='';
9 9  
... ... @@ -18,7 +18,7 @@ var WorldsBMap = function () {
18 18 var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
19 19  
20 20 // 初始化百度地图
21   - mapValue = new BMap.Map("bmap_basic");
  21 + mapValue = new BMap.Map("carParkbmap_basic");
22 22  
23 23 //中心点和缩放级别
24 24 mapValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
... ... @@ -141,7 +141,7 @@ var WorldsBMap = function () {
141 141  
142 142 $(pjaxContainer).append(m);
143 143  
144   - $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
  144 + $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
145 145  
146 146 });
147 147  
... ... @@ -370,7 +370,7 @@ var WorldsBMap = function () {
370 370  
371 371 $(pjaxContainer).append(m);
372 372  
373   - $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
  373 + $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
374 374  
375 375 });
376 376  
... ... @@ -428,7 +428,7 @@ var WorldsBMap = function () {
428 428  
429 429 $(pjaxContainer).append(m);
430 430  
431   - $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [WorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
  431 + $('#editPoitsions_carpark_mobal').trigger('editCarParkMobal_show', [CarParkPWorldsBMap,PublicFunctions,EditCarParkObj,GetAjaxData]);
432 432  
433 433 });
434 434  
... ...
src/main/resources/static/pages/base/carpark/js/carpark-positions-reload.js
  View file @f72f897
... ... @@ -28,7 +28,7 @@
28 28 setTimeout(function(){
29 29  
30 30 // 地图初始化
31   - mapB = WorldsBMap.init();
  31 + mapB = CarParkPWorldsBMap.init();
32 32  
33 33 /** 停车场信息初始化 @param：<id：停车场ID> */
34 34 PublicFunctions.initCarPark(id);
... ...
src/main/resources/static/pages/base/carpark/positions.html
  View file @f72f897
1 1 <link href="/pages/base/carpark/css/positions.css" rel="stylesheet" type="text/css" />
2 2  
3 3 <!-- 地图容器-->
4   -<div id="bmap_basic"></div>
  4 +<div id="carParkbmap_basic"></div>
5 5  
6 6 <!-- 操作工具容器 -->
7 7 <div class="leftUtils">
... ...
src/main/resources/static/pages/base/section/add.html
  View file @f72f897
1   -<link href="/pages/base/station/css/addmap.css" rel="stylesheet" type="text/css" />
  1 +<link href="/pages/base/section/css/addmap.css" rel="stylesheet" type="text/css" />
2 2 <div class="page-head">
3 3 <div class="page-title">
4 4 <h1>添加路段</h1>
... ... @@ -131,7 +131,7 @@
131 131 <!-- 站点位置 -->
132 132 <div class="tab-pane" id="tab2">
133 133 <h3 class="block"> 路段位置 </h3>
134   - <div id="bmap_basic"></div>
  134 + <div id="sectionBmap_basic"></div>
135 135 </div>
136 136  
137 137 <!-- 站点信息 -->
... ...
src/main/resources/static/pages/base/section/css/addmap.css 0 → 100644
  View file @f72f897
  1 +#sectionBmap_basic{
  2 + min-width: 100%;
  3 + width: 100%;
  4 + margin-top: -28px;
  5 + border: 2px solid #fdfdfd;
  6 + min-height: 400px;
  7 + height:100%;
  8 + overflow: hidden;
  9 + top: 15px;
  10 +}
  11 +
  12 +
  13 +/* 隐藏百度地图logo */
  14 +.anchorBL,
  15 +.anchorBL,
  16 +.amap-logo,
  17 +.amap-copyright{
  18 + display: none;
  19 +}
  20 +
  21 +.BMap_pop div:nth-child(1) ,
  22 +.BMap_pop div:nth-child(2) ,
  23 +.BMap_pop div:nth-child(3) ,
  24 +.BMap_pop div:nth-child(4) ,
  25 +.BMap_pop div:nth-child(5) ,
  26 +.BMap_pop div:nth-child(6) ,
  27 +.BMap_pop div:nth-child(7) {
  28 +
  29 + border:0px solid rgb(255, 255, 255) !important;
  30 + background-color:#3B3F51 !important;
  31 +
  32 +}
  33 +
  34 +.BMap_pop div:nth-child(3){
  35 +
  36 + width:23px !important;
  37 +
  38 +}
  39 +
  40 +.BMap_pop div:nth-child(7) {
  41 +
  42 + width:23px !important;
  43 +
  44 + height:24px !important;
  45 +
  46 +}
  47 +
  48 +.BMap_pop div:nth-child(5) {
  49 +
  50 + height:24px !important;
  51 +
  52 +}
  53 +
  54 +/* 图片以后在弄，先隐藏div */
  55 +.BMap_pop div:nth-child(8) {
  56 +
  57 + height:0px !important;
  58 + /* background:url('/pages/base/stationroute/css/img/iw3-1.png') no-repeat !important; */
  59 + /* background-image:url('/pages/base/stationroute/css/img/windowinfo_b.jpg') !important; */
  60 +
  61 +}
  62 +
  63 +.BMap_pop {
  64 +
  65 + box-shadow: 0 12px 15px 0 rgba(204, 204, 204, 0.33),0 17px 50px 0 rgba(204, 204, 204, 0.33)!important;
  66 +
  67 +}
0 68 \ No newline at end of file
... ...
src/main/resources/static/pages/base/section/css/positions.css
  View file @f72f897
1   -#bmap_basic{
  1 +#sectionPbmap_basic{
2 2 min-width: 100%;
3 3 width: calc(100% + 26px);
4 4 margin-top: -28px;
... ...
src/main/resources/static/pages/base/section/js/add-form-events.js
  View file @f72f897
... ... @@ -12,13 +12,13 @@ $(function(){
12 12  
13 13 $('#oppenDrawingManager').on('click',function() {
14 14  
15   - VmapWorlds.drawingManagerOpen();
  15 + SectionVmapWorlds.drawingManagerOpen();
16 16  
17 17 });
18 18  
19 19 $('#closeDrawingManager').on('click',function() {
20 20  
21   - VmapWorlds.drawingManagerClose();
  21 + SectionVmapWorlds.drawingManagerClose();
22 22  
23 23 });
24 24  
... ...
src/main/resources/static/pages/base/section/js/add-form-reload.js
  View file @f72f897
... ... @@ -27,7 +27,7 @@
27 27 FormWizard.init();
28 28  
29 29 // 地图初始化
30   - var mapB = VmapWorlds.init();
  30 + var mapB = SectionVmapWorlds.init();
31 31  
32 32 /** 路段编码 */
33 33 PublicFunctions.getSectionCode(function(sectionCode) {
... ...
src/main/resources/static/pages/base/section/js/add-form-wizard.js
  View file @f72f897
... ... @@ -317,12 +317,12 @@ var FormWizard = function() {
317 317 if(baseResValue == 0) {
318 318  
319 319 // 根据站点名称获取百度坐标
320   - VmapWorlds.stationsNameToPoints(paramsStationsArray,function(resultJson) {
  320 + SectionVmapWorlds.stationsNameToPoints(paramsStationsArray,function(resultJson) {
321 321  
322 322 // 根据坐标点获取两点之间的时间与距离
323   - VmapWorlds.getDistanceAndDuration(resultJson,function(stationdataList) {
  323 + SectionVmapWorlds.getDistanceAndDuration(resultJson,function(stationdataList) {
324 324  
325   - VmapWorlds.getSectionListPlonly(stationdataList,function(sectiondata) {
  325 + SectionVmapWorlds.getSectionListPlonly(stationdataList,function(sectiondata) {
326 326  
327 327 $('#bsectionVectorInput').val(JSON.stringify(sectiondata));
328 328  
... ... @@ -333,11 +333,11 @@ var FormWizard = function() {
333 333  
334 334 }else if(baseResValue ==1) {
335 335  
336   - VmapWorlds.localSearchFromAdreesToPoint(stationStartValue);
  336 + SectionVmapWorlds.localSearchFromAdreesToPoint(stationStartValue);
337 337  
338   - VmapWorlds.localSearchFromAdreesToPoint(stationEndValue);
  338 + SectionVmapWorlds.localSearchFromAdreesToPoint(stationEndValue);
339 339  
340   - VmapWorlds.drawingManagerOpen();
  340 + SectionVmapWorlds.drawingManagerOpen();
341 341  
342 342 }else if(baseResValue ==2) {
343 343  
... ... @@ -416,9 +416,9 @@ var FormWizard = function() {
416 416  
417 417 if(index==2) {
418 418  
419   - VmapWorlds.drawingManagerClose();
  419 + SectionVmapWorlds.drawingManagerClose();
420 420  
421   - VmapWorlds.clearMarkAndOverlays();
  421 + SectionVmapWorlds.clearMarkAndOverlays();
422 422  
423 423 }
424 424  
... ... @@ -432,11 +432,11 @@ var FormWizard = function() {
432 432  
433 433 error.hide();
434 434  
435   - VmapWorlds.clearMarkAndOverlays();
  435 + SectionVmapWorlds.clearMarkAndOverlays();
436 436  
437 437 if(index==0) {
438 438  
439   - VmapWorlds.drawingManagerClose();
  439 + SectionVmapWorlds.drawingManagerClose();
440 440  
441 441 }
442 442  
... ...
src/main/resources/static/pages/base/section/js/add-vmap-world.js
  View file @f72f897
1   -var VmapWorlds = function() {
  1 +var SectionVmapWorlds = function() {
2 2  
3 3 var mapB = '', drawingManager = '';
4 4  
... ... @@ -13,7 +13,7 @@ var VmapWorlds = function() {
13 13 var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
14 14  
15 15 // 初始化百度地图
16   - mapB = new BMap.Map("bmap_basic");
  16 + mapB = new BMap.Map("sectionBmap_basic");
17 17  
18 18 //中心点和缩放级别
19 19 mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
... ...
src/main/resources/static/pages/base/section/js/section-positions-events.js
  View file @f72f897
... ... @@ -2,8 +2,8 @@ $(function(){
2 2  
3 3 $('#backUp').on('click',function() {
4 4  
5   - // 获取返回元素并修改url地址
6   - $('#backUp').attr('href','list.html?');
  5 + // 返回list.html页面
  6 + loadPage('/pages/base/section/list.html');
7 7  
8 8 });
9 9  
... ... @@ -17,7 +17,7 @@ $(function(){
17 17 // 弹出添加失败提示消息,2秒关闭（如果不配置，默认是3秒）
18 18 var yindex = layer.msg('编辑完线路走向后,请双击线路走向区域保存',{ offset: '126px',shift: 0,time: 10000});
19 19  
20   - WorldsBMap.editPolyUpline();
  20 + SectionPWorldsBMap.editPolyUpline();
21 21  
22 22 });
23 23  
... ...
src/main/resources/static/pages/base/section/js/section-positions-function.js
  View file @f72f897
... ... @@ -18,7 +18,7 @@ var PositionsPublicFunctions = function () {
18 18  
19 19 EditSectionObj.setEitdSection(sectionInfo);
20 20  
21   - WorldsBMap.drawingUpline(r);
  21 + SectionPWorldsBMap.drawingUpline(r);
22 22 }
23 23  
24 24 });
... ...
src/main/resources/static/pages/base/section/js/section-positions-map.js
  View file @f72f897
... ... @@ -3,7 +3,7 @@
3 3 *
4 4 */
5 5  
6   -var WorldsBMap = function () {
  6 +var SectionPWorldsBMap = function () {
7 7  
8 8 var mapValue = '',marker='', polyUpline='';
9 9  
... ... @@ -18,7 +18,7 @@ var WorldsBMap = function () {
18 18 var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
19 19  
20 20 // 初始化百度地图
21   - mapValue = new BMap.Map('bmap_basic');
  21 + mapValue = new BMap.Map('sectionPbmap_basic');
22 22  
23 23 //中心点和缩放级别
24 24 mapValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
... ... @@ -133,7 +133,7 @@ var WorldsBMap = function () {
133 133 // 禁止覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
134 134 polyUpline.disableMassClear();
135 135  
136   - WorldsBMap.clearMarkAndOverlays();
  136 + SectionPWorldsBMap.clearMarkAndOverlays();
137 137  
138 138 // 允许覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
139 139 polyUpline.enableMassClear();
... ... @@ -161,7 +161,7 @@ var WorldsBMap = function () {
161 161  
162 162 $(pjaxContainer).append(m);
163 163  
164   - $('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PositionsPublicFunctions]);
  164 + $('#edit_section_mobal').trigger('editSectionMobal_show', [SectionPWorldsBMap,GetAjaxData,EditSectionObj,PositionsPublicFunctions]);
165 165  
166 166 });
167 167 });
... ...
src/main/resources/static/pages/base/section/js/section-positions-reload.js
  View file @f72f897
... ... @@ -28,7 +28,7 @@
28 28 setTimeout(function(){
29 29  
30 30 /** 初始化地图 @return <mapB：地图对象> */
31   - var mapB = WorldsBMap.init();
  31 + var mapB = SectionPWorldsBMap.init();
32 32  
33 33 /** 初始化路段信息 @return <id：路段路由ID> */
34 34 PositionsPublicFunctions.initSectionInfo(id);
... ...
src/main/resources/static/pages/base/section/list.html
  View file @f72f897
... ... @@ -104,7 +104,11 @@
104 104 {{obj.line.name}}
105 105 </td>
106 106 <td>
107   - {{obj.directions}}
  107 + {{if obj.directions == '0'}}
  108 + 上行
  109 + {{else if obj.directions == '1'}}
  110 + 下行
  111 + {{/if}}
108 112 </td>
109 113 <td>
110 114 {{obj.section.sectionName}}
... ... @@ -119,7 +123,11 @@
119 123 {{obj.versions}}
120 124 </td>
121 125 <td>
122   - {{obj.destroy}}
  126 + {{if obj.destroy == 1}}
  127 + <span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
  128 + {{else if obj.destroy == 0}}
  129 + <span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
  130 + {{/if}}
123 131 </td>
124 132 <td>
125 133 <a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
... ...
src/main/resources/static/pages/base/section/positions.html
  View file @f72f897
1 1 <link href="/pages/base/section/css/positions.css" rel="stylesheet" type="text/css" />
2 2  
3   -<div id="bmap_basic"></div>
  3 +<div id="sectionPbmap_basic"></div>
4 4  
5 5 <div class="leftUtils">
6 6 <div class="btn-group" style="left: 100px;">
... ...
src/main/resources/static/pages/base/station/add.html
  View file @f72f897
... ... @@ -22,6 +22,12 @@
22 22 <span class="step-title"> 1 - 4 </span>
23 23 </span>
24 24 </div>
  25 +
  26 + <div class="actions">
  27 + <div class="btn-group btn-group-devided" data-toggle="buttons">
  28 + <a class="btn btn-circle default" href="/pages/base/station/list.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
  29 + </div>
  30 + </div>
25 31 </div>
26 32 <div class="portlet-body form">
27 33  
... ... @@ -120,7 +126,7 @@
120 126 <!-- 站点位置 -->
121 127 <div class="tab-pane" id="tab2">
122 128 <h3 class="block"> 站点位置 </h3>
123   - <div id="bmap_basic">
  129 + <div id="stationbmap_basic">
124 130  
125 131 <div class="leftUtils">
126 132 <div class="btn-group" style="left: 100px;">
... ...
src/main/resources/static/pages/base/station/css/addmap.css
  View file @f72f897
1   -#bmap_basic{
  1 +#stationbmap_basic{
2 2 min-width: 100%;
3 3 width: 100%;
4 4 margin-top: -28px;
... ...
src/main/resources/static/pages/base/station/css/positions.css
  View file @f72f897
1   -#bmap_basic{
  1 +#positionBmap_basic{
2 2 min-width: 100%;
3 3 width: calc(100% + 26px);
4 4 margin-top: -28px;
... ...
src/main/resources/static/pages/base/station/js/add-form-events.js
  View file @f72f897
... ... @@ -12,13 +12,13 @@ $(function(){
12 12  
13 13 $('#oppenDrawingManager').on('click',function() {
14 14  
15   - VmapWorlds.drawingManagerOpen();
  15 + StationPVmapWorlds.drawingManagerOpen();
16 16  
17 17 });
18 18  
19 19 $('#closeDrawingManager').on('click',function() {
20 20  
21   - VmapWorlds.drawingManagerClose();
  21 + StationPVmapWorlds.drawingManagerClose();
22 22  
23 23 });
24 24  
... ...
src/main/resources/static/pages/base/station/js/add-form-reload.js
  View file @f72f897
... ... @@ -25,7 +25,7 @@
25 25  
26 26 FormWizard.init();
27 27  
28   - var mapB = VmapWorlds.init();
  28 + var mapB = StationPVmapWorlds.init();
29 29  
30 30 PublicFunctions.getStationCode(function(stationCode) {
31 31  
... ...
src/main/resources/static/pages/base/station/js/add-form-wizard.js
  View file @f72f897
... ... @@ -178,8 +178,6 @@ var FormWizard = function() {
178 178 // 表单序列化
179 179 var params = form.serializeJSON();
180 180  
181   - console.log(params);
182   -
183 181 //保存站点
184 182 PublicFunctions.stationSave(params,function(data) {
185 183  
... ... @@ -324,26 +322,31 @@ var FormWizard = function() {
324 322  
325 323 $('#stationNameInput').val(stationNameV);
326 324  
327   - VmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
328   -
329   - if(p) {
330   -
331   - if(baseResValue == 0) {
332   -
333   - $('.leftUtils').hide();
334   -
335   - VmapWorlds.pointsCircle(p);
336   -
337   - }else if(baseResValue ==1) {
338   -
339   - $('.leftUtils').show();
340   -
341   - VmapWorlds.drawingManagerOpen();
342   -
343   - }
344   - }
345   -
346   - });
  325 + if(baseResValue == 0) {
  326 +
  327 + StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {
  328 +
  329 + if(p) {
  330 +
  331 + $('.leftUtils').hide();
  332 +
  333 + StationPVmapWorlds.pointsCircle(p);
  334 +
  335 + }
  336 +
  337 + });
  338 +
  339 +
  340 + }else if(baseResValue ==1) {
  341 +
  342 + StationPVmapWorlds.localSearchFromAdreesToPoint(stationNameV,function(p) {});
  343 +
  344 + $('.leftUtils').show();
  345 +
  346 + StationPVmapWorlds.drawingManagerOpen();
  347 +
  348 + }
  349 +
347 350 }
348 351  
349 352 /** 如果为最后一步显示提交按钮，隐藏下一步按钮,否则隐藏提交按钮，显示下一步按钮 */
... ... @@ -385,6 +388,8 @@ var FormWizard = function() {
385 388 /** 当一个导航标签被点击,返回错误的移动到该选项卡，并显示它的内容. */
386 389 onTabClick: function (tab, navigation, index, clickedIndex) {
387 390  
  391 + return false;
  392 +
388 393 success.hide();
389 394  
390 395 error.hide();
... ... @@ -414,7 +419,7 @@ var FormWizard = function() {
414 419  
415 420 if(index==2) {
416 421  
417   - VmapWorlds.clearMarkAndOverlays();
  422 + StationPVmapWorlds.clearMarkAndOverlays();
418 423  
419 424 }
420 425  
... ... @@ -434,7 +439,7 @@ var FormWizard = function() {
434 439  
435 440 error.hide();
436 441  
437   - VmapWorlds.clearMarkAndOverlays();
  442 + StationPVmapWorlds.clearMarkAndOverlays();
438 443  
439 444 /* mapB.clearOverlays();
440 445  
... ...
src/main/resources/static/pages/base/station/js/add-vmap-world.js
  View file @f72f897
1   -var VmapWorlds = function() {
  1 +var StationPVmapWorlds = function() {
2 2  
3 3 var mapB = '', circle = '', drawingManager = '',circle='',marker='';
4 4  
... ... @@ -13,7 +13,7 @@ var VmapWorlds = function() {
13 13 var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
14 14  
15 15 // 初始化百度地图
16   - mapB = new BMap.Map("bmap_basic");
  16 + mapB = new BMap.Map("stationbmap_basic");
17 17  
18 18 //中心点和缩放级别
19 19 mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
... ...
src/main/resources/static/pages/base/station/js/station-positions-events.js
  View file @f72f897
... ... @@ -3,8 +3,8 @@ $(function(){
3 3 // 返回
4 4 $('#backUp').on('click',function() {
5 5  
6   - // 获取返回元素并修改url地址
7   - $('#backUp').attr('href','list.html?');
  6 + // 返回list.html页面
  7 + loadPage('/pages/base/station/list.html');
8 8  
9 9 });
10 10  
... ...
src/main/resources/static/pages/base/station/js/station-positions-map.js
  View file @f72f897
... ... @@ -25,7 +25,7 @@ var StationPositionsWorldsBMap = function () {
25 25 var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
26 26  
27 27 // 初始化百度地图
28   - mapBValue = new BMap.Map("bmap_basic");
  28 + mapBValue = new BMap.Map("positionBmap_basic");
29 29  
30 30 //中心点和缩放级别
31 31 mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
... ...
src/main/resources/static/pages/base/station/list.html
  View file @f72f897
... ... @@ -117,7 +117,11 @@
117 117 {{obj.line.name}}
118 118 </td>
119 119 <td>
120   - {{obj.directions}}
  120 + {{if obj.directions == '0'}}
  121 + 上行
  122 + {{else if obj.directions == '1'}}
  123 + 下行
  124 + {{/if}}
121 125 </td>
122 126 <td>
123 127 {{obj.stationName}}
... ... @@ -128,14 +132,24 @@
128 132 <td>
129 133 {{obj.stationRouteCode}}
130 134 </td>
131   - <td>
132   - {{obj.stationMark}}
  135 + <td>
  136 + {{if obj.stationMark == 'B'}}
  137 + 起始站
  138 + {{else if obj.stationMark == 'Z'}}
  139 + 中途站
  140 + {{else if obj.stationMark== 'E'}}
  141 + 终点站
  142 + {{/if}}
133 143 </td>
134 144 <td>
135 145 {{obj.versions}}
136 146 </td>
137 147 <td>
138   - {{obj.destroy}}
  148 + {{if obj.destroy == 1}}
  149 + <span style="font-weight: bold; color: red; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">撤销</span>
  150 + {{else if obj.destroy == 0}}
  151 + <span style="font-weight: bold; color: #07824e; padding: 5px; background-color: #FFE4E1; margin: 5px; font-size: 9px;border-radius: 4px;">运营</span>
  152 + {{/if}}
139 153 </td>
140 154 <td>
141 155 <a href="positions.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 定位 </a>
... ...
src/main/resources/static/pages/base/station/positions.html
  View file @f72f897
1 1 <link href="/pages/base/station/css/positions.css" rel="stylesheet" type="text/css" />
2 2  
3 3 <!-- 地图容器 -->
4   -<div id="bmap_basic"></div>
  4 +<div id="positionBmap_basic"></div>
5 5  
6 6 <!-- 操作工具容器disabled -->
7 7 <div class="leftUtils">
... ...