潘钊 / bsth_control · Commits

Commit 3e28457dffcae29e532055a72d2643a95dd0bb0f

Authored by 李强
1 parent 038dee30
build: skipped

李强

Inline Side-by-side
Showing 4 changed files with 70 additions and 25 deletions
src/main/resources/static/pages/base/section/js/add-form-wizard.js
  View file @3e28457
... ... @@ -46,9 +46,7 @@ var FormWizard = function() {
46 46  
47 47 // 必填项
48 48 required : true,
49   -
50   - // 最大长度
51   - maxlength: 20
  49 +
52 50 },
53 51  
54 52 // 终点
... ... @@ -56,9 +54,7 @@ var FormWizard = function() {
56 54  
57 55 // 必填项
58 56 required : true,
59   -
60   - // 最大长度
61   - maxlength: 20
  57 +
62 58 },
63 59  
64 60 // 线路名称
... ...
src/main/resources/static/pages/base/station/add.html
  View file @3e28457
... ... @@ -115,7 +115,7 @@
115 115 <div class="form-group">
116 116 <div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50">
117 117 <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　新增方式说明： </span></h5>
118   - <p><span class="help-block" style="color:#1bbc9b;"> a)系统生成：根据站点名称自动生成以150米为半径范围的圆.</span> </p>
  118 + <p><span class="help-block" style="color:#1bbc9b;"> a)系统生成：根据站点名称自动生成以100米为半径范围的圆.</span> </p>
119 119 <p><span class="help-block" style="color:#1bbc9b;"> b)手动添加：手动在地图上画出站点范围，然后双击鼠标右键保存.</span> </p>
120 120 <!-- <p><span class="help-block" style="color:#1bbc9b;"> c)选择引用：从系统中选择已有的站点进行引用.</span> </p> -->
121 121 </div>
... ...
src/main/resources/static/pages/base/station/js/add-form-wizard.js
  View file @3e28457
... ... @@ -47,8 +47,6 @@ var FormWizard = function() {
47 47 // 必填项
48 48 required : true,
49 49  
50   - // 最大长度
51   - maxlength: 20
52 50 },
53 51  
54 52 // 线路名称
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @3e28457
... ... @@ -267,15 +267,39 @@ var WorldsBMap = function () {
267 267 enableCloseOnClick : false
268 268 };
269 269  
  270 + var markTypeStr = '';
  271 +
  272 + if(objStation.stationRouteStationMark=='B') {
  273 +
  274 + markTypeStr='起点站';
  275 +
  276 + }else if(objStation.stationRouteStationMark=='Z') {
  277 +
  278 + markTypeStr ='中途站';
  279 +
  280 +
  281 + }else if(objStation.stationRouteStationMark=='E') {
  282 +
  283 + markTypeStr='终点站';
  284 +
  285 + }
  286 +
  287 + var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
  288 + '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
  289 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
  290 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
  291 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
  292 + '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
  293 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
  294 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
  295 + '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
  296 + '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
  297 + '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
  298 + 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
  299 + objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  300 +
270 301 // 创建信息窗口
271   - var infoWindow_target = new BMap.InfoWindow('<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
272   - '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
273   - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
274   - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
275   - '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
276   - '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
277   - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationVersions + '</span>' +
278   - '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ 'ddd' +'" >说明/描述：' + 'ddd' + '</span>' , opts_polygon);
  302 + var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
279 303 // 自定义标注物图片
280 304 var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
281 305  
... ... @@ -343,6 +367,9 @@ var WorldsBMap = function () {
343 367 // 画圆
344 368 pointsCircle : function(objStation) {
345 369  
  370 +
  371 + console.log(objStation);
  372 +
346 373 // 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
347 374 mapBValue.setZoom(16);
348 375  
... ... @@ -391,15 +418,39 @@ var WorldsBMap = function () {
391 418 enableAutoPan:false
392 419 };
393 420  
  421 + var markTypeStr = '';
  422 +
  423 + if(objStation.stationRouteStationMark=='B') {
  424 +
  425 + markTypeStr='起点站';
  426 +
  427 + }else if(objStation.stationRouteStationMark=='Z') {
  428 +
  429 + markTypeStr ='中途站';
  430 +
  431 +
  432 + }else if(objStation.stationRouteStationMark=='E') {
  433 +
  434 + markTypeStr='终点站';
  435 +
  436 + }
  437 +
  438 + var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
  439 + '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
  440 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
  441 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
  442 + '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
  443 + '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
  444 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
  445 + '<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
  446 + '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
  447 + '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
  448 + '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
  449 + 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
  450 + objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  451 +
394 452 // 创建信息窗口
395   - var infoWindow_target = new BMap.InfoWindow('<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
396   - '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
397   - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
398   - '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
399   - '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
400   - '<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
401   - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationVersions + '</span>' +
402   - '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ 'ddd' +'" >说明/描述：' + 'ddd' + '</span>' , opts);
  453 + var infoWindow_target = new BMap.InfoWindow(htm, opts);
403 454 // 自定义标注物图片
404 455 var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
405 456  
... ...