Commit 7fc92c20ec0a3b4a7ee18f2bfd5dfbf55184a838
1 parent
2a9542e1
1.
Showing
5 changed files
with
35 additions
and
35 deletions
src/main/resources/fatso/package.json
| 1 | -{ | |
| 2 | - "name": "fatso", | |
| 3 | - "version": "1.0.0", | |
| 4 | - "description": "子页面js检查、合并、压缩等处理", | |
| 5 | - "main": "start.js", | |
| 6 | - "scripts": { | |
| 7 | - "test": "echo \"Error: no test specified\" && exit 1" | |
| 8 | - }, | |
| 9 | - "author": "panzhaov5", | |
| 10 | - "license": "ISC", | |
| 11 | - "dependencies": { | |
| 12 | - "cheerio": "^0.20.0", | |
| 13 | - "clean-css": "^4.0.12", | |
| 14 | - "colors": "^1.1.2", | |
| 15 | - "eventproxy": "^0.3.4", | |
| 16 | - "uglify-js": "^2.6.2" | |
| 17 | - } | |
| 18 | -} | |
| 19 | 1 | \ No newline at end of file |
| 2 | +{ | |
| 3 | + "name": "fatso", | |
| 4 | + "version": "1.0.0", | |
| 5 | + "description": "子页面js检查、合并、压缩等处理", | |
| 6 | + "main": "start.js", | |
| 7 | + "scripts": { | |
| 8 | + "test": "echo \"Error: no test specified\" && exit 1" | |
| 9 | + }, | |
| 10 | + "author": "panzhaov5", | |
| 11 | + "license": "ISC", | |
| 12 | + "dependencies": { | |
| 13 | + "cheerio": "^0.20.0", | |
| 14 | + "clean-css": "^4.2.4", | |
| 15 | + "colors": "^1.1.2", | |
| 16 | + "eventproxy": "^0.3.4", | |
| 17 | + "uglify-js": "^2.6.2" | |
| 18 | + } | |
| 19 | +} | ... | ... |
src/main/resources/static/pages/base/stationroute/editsection_inout.html
| ... | ... | @@ -66,19 +66,19 @@ $('#edit_section_mobal').on('editSectionMobal_show', function(e, map_,ajaxd,p,fu |
| 66 | 66 | $(this).val(eval('section.' + this.id)); |
| 67 | 67 | }); |
| 68 | 68 | } |
| 69 | - let section = p.data; | |
| 70 | - let lineId = section.lineCode, version = section.versions, start = section.start, end = section.end; | |
| 69 | + var section = p.data; | |
| 70 | + var lineId = section.lineCode, version = section.versions, start = section.start, end = section.end; | |
| 71 | 71 | setSectionFormValue(section); |
| 72 | 72 | // 获取路段号元素,并添加下拉属性值 |
| 73 | 73 | ajaxd.getRouteByStartEnd(lineId,version,start, end,function(result) { |
| 74 | - let routes = result.data.routes,paramsD =new Array(); | |
| 74 | + var routes = result.data.routes,paramsD =new Array(); | |
| 75 | 75 | var eq_scetionRouteCode = section.sectionrouteCode; |
| 76 | 76 | paramsD.push({'id':'请选择...','text':'将此路段设置位第一个路段'}); |
| 77 | 77 | // 遍历 |
| 78 | 78 | $.each(routes, function(i, g){ |
| 79 | 79 | // 判断. |
| 80 | 80 | if(g.section.sectionName) { |
| 81 | - let ptions_v = g.sectionrouteCode; | |
| 81 | + var ptions_v = g.sectionrouteCode; | |
| 82 | 82 | if(eq_scetionRouteCode != ptions_v) { |
| 83 | 83 | // 添加拼音检索下拉框格式数据数组. |
| 84 | 84 | paramsD.push({'id':ptions_v, | ... | ... |
src/main/resources/static/pages/base/stationroute/js/stationroute-list-function.js
| ... | ... | @@ -118,7 +118,7 @@ var PublicFunctions = function () { |
| 118 | 118 | $('#inout_carpark_tree').show(); |
| 119 | 119 | $('#InoutCarparktreeMobal .table-toolbar').show(); |
| 120 | 120 | |
| 121 | - GetAjaxData.getRouteByStartEnd(id, version, start[0], end[0], (result1) => { | |
| 121 | + GetAjaxData.getRouteByStartEnd(id, version, start[0], end[0], function(result1) { | |
| 122 | 122 | var routes = result1.data.routes, rootNode; |
| 123 | 123 | WorldsBMap.clearMarkAndOverlays(); |
| 124 | 124 | var startPoint = mapData[start.join('_')], endPoint = mapData[end.join('_')], point, points; |
| ... | ... | @@ -144,7 +144,7 @@ var PublicFunctions = function () { |
| 144 | 144 | |
| 145 | 145 | rootNode = {id: -1, pId: null, name: '路段', text: '路段', icon: null, groupType: 2, container : 'pjax-container', enable : true, children: routes}; |
| 146 | 146 | if (routes.length > 0) { |
| 147 | - for (let i = 0,route;i < routes.length;i++) { | |
| 147 | + for (var i = 0,route;i < routes.length;i++) { | |
| 148 | 148 | route = routes[i]; |
| 149 | 149 | route.pId = 1; |
| 150 | 150 | route.name = route.section.sectionName; | ... | ... |
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
| ... | ... | @@ -31,7 +31,7 @@ window.WorldsBMap = function () { |
| 31 | 31 | sectionArray = [], stationArray = new Map(), |
| 32 | 32 | map_status = 0,drawingManager,topOverlay; |
| 33 | 33 | |
| 34 | - let currentSection = {}; | |
| 34 | + var currentSection = {}; | |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | * 编辑缓冲区 |
| ... | ... | @@ -1497,16 +1497,16 @@ window.WorldsBMap = function () { |
| 1497 | 1497 | * isMark 是否加站名 |
| 1498 | 1498 | */ |
| 1499 | 1499 | drawCircle: function (point, radius, stationName, isMark) { |
| 1500 | - let center = new BMap.Point(point.lng, point.lat); | |
| 1501 | - let circle = new BMap.Circle(center, radius ,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5}); | |
| 1500 | + var center = new BMap.Point(point.lng, point.lat); | |
| 1501 | + var circle = new BMap.Circle(center, radius ,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5}); | |
| 1502 | 1502 | mapBValue.addOverlay(circle); |
| 1503 | 1503 | if (isMark) { |
| 1504 | - let html = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -3px; top: -30px; overflow: hidden;">' | |
| 1504 | + var html = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -3px; top: -30px; overflow: hidden;">' | |
| 1505 | 1505 | + '<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">' |
| 1506 | 1506 | + '</div>' |
| 1507 | 1507 | + '<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 20px; top: -30px;">' + stationName + '</label>'; |
| 1508 | 1508 | |
| 1509 | - let myRichMarker = new BMapLib.RichMarker(html, center, { | |
| 1509 | + var myRichMarker = new BMapLib.RichMarker(html, center, { | |
| 1510 | 1510 | "title": stationName, |
| 1511 | 1511 | "anchor": new BMap.Size(-10, 8), |
| 1512 | 1512 | "enableDragging": true |
| ... | ... | @@ -1522,20 +1522,20 @@ window.WorldsBMap = function () { |
| 1522 | 1522 | * points 点数组 |
| 1523 | 1523 | */ |
| 1524 | 1524 | drawPolygon: function (points, stationName, isMark) { |
| 1525 | - let bdPoints = new Array(), i = 0, point; | |
| 1525 | + var bdPoints = new Array(), i = 0, point; | |
| 1526 | 1526 | for (i = 0;i < points.length;i++) { |
| 1527 | 1527 | point = points[i].split(' '); |
| 1528 | 1528 | bdPoints.push(new BMap.Point(point[0], point[1])); |
| 1529 | 1529 | } |
| 1530 | - let polygon = new BMap.Polygon(bdPoints), center = bdPoints[0]; | |
| 1530 | + var polygon = new BMap.Polygon(bdPoints), center = bdPoints[0]; | |
| 1531 | 1531 | mapBValue.addOverlay(polygon); |
| 1532 | 1532 | if (isMark) { |
| 1533 | - let html = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -3px; top: -30px; overflow: hidden;">' | |
| 1533 | + var html = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -3px; top: -30px; overflow: hidden;">' | |
| 1534 | 1534 | + '<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">' |
| 1535 | 1535 | + '</div>' |
| 1536 | 1536 | + '<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 20px; top: -30px;">' + stationName + '</label>'; |
| 1537 | 1537 | |
| 1538 | - let myRichMarker = new BMapLib.RichMarker(html, center, { | |
| 1538 | + var myRichMarker = new BMapLib.RichMarker(html, center, { | |
| 1539 | 1539 | "title": stationName, |
| 1540 | 1540 | "anchor": new BMap.Size(-10, 8), |
| 1541 | 1541 | "enableDragging": true |
| ... | ... | @@ -1547,7 +1547,7 @@ window.WorldsBMap = function () { |
| 1547 | 1547 | }, |
| 1548 | 1548 | |
| 1549 | 1549 | drawPolyLine: function (points, data, start, end) { |
| 1550 | - let bdPoints = new Array(), i = 0, point, polyline; | |
| 1550 | + var bdPoints = new Array(), i = 0, point, polyline; | |
| 1551 | 1551 | for (i = 0;i < points.length;i++) { |
| 1552 | 1552 | point = points[i].split(' '); |
| 1553 | 1553 | bdPoints.push(new BMap.Point(point[0], point[1])); | ... | ... |
src/main/resources/static/pages/base/stationroute/list.html
| ... | ... | @@ -116,7 +116,7 @@ |
| 116 | 116 | <li> |
| 117 | 117 | <a href="javascript:;" id="quoteDown"><i class="fa fa-long-arrow-down"></i> 引用下行路段</a> |
| 118 | 118 | </li> |
| 119 | - <!-- <li class="divider"> </li> | |
| 119 | + <!-- <li class="divider"> </li> --> | |
| 120 | 120 | <!-- <li> |
| 121 | 121 | <a href="javascript:;" id="editUplineTrend"><i class="fa fa-edit"></i> 编辑走向</a> |
| 122 | 122 | </li> --> | ... | ... |