潘钊 / bsth_control · Commits

Commit 5721921e8b25909f330a43ec955e63b5b45c92d7

Authored by 游瑞烽
1 parent b2e8ea5b
build: skipped

行业编码字段显示问题

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
src/main/resources/static/pages/base/line/js/map.js
  View file @5721921
... ... @@ -559,7 +559,7 @@ var WorldsBMapLine = function () {
559 559 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
560 560 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
561 561 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
562   - '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + objStation.industryCode + '</span>' +
  562 + '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode == null ? "":objStation.industryCode) + '</span>' +
563 563 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
564 564 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
565 565 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
... ... @@ -568,7 +568,7 @@ var WorldsBMapLine = function () {
568 568 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
569 569 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
570 570 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
571   - objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  571 + objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions == null ? "":objStation.stationRouteDescriptions)+ '</span>' ;
572 572  
573 573 // 创建信息窗口
574 574 var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
... ... @@ -668,7 +668,7 @@ var WorldsBMapLine = function () {
668 668 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
669 669 '<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' +
670 670 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
671   - '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + objStation.industryCode + '</span>' +
  671 + '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode == null ? "":objStation.industryCode)+ '</span>' +
672 672 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
673 673 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
674 674 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
... ... @@ -678,7 +678,7 @@ var WorldsBMapLine = function () {
678 678 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
679 679 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
680 680 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
681   - objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
  681 + objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions == null ? "":objStation.stationRouteDescriptions) + '</span>' ;
682 682  
683 683 // 创建信息窗口
684 684 var infoWindow_target = new BMap.InfoWindow(htm, opts);
... ...
src/main/resources/static/pages/base/station/js/station-positions-function.js
  View file @5721921
... ... @@ -28,7 +28,7 @@ var PositionsPublicFunctions = function () {
28 28 var htm = '<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
29 29 '<span style="color:#DDD;font-size: 15px;">站点名称：' + r[0].zdmc + '</span>' +
30 30 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + r[0].stationCode + '</span>' +
31   - '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + r[0].industryCode + '</span>' +
  31 + '<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (r[0].industryCode == null ? "":r[0].industryCode) + '</span>' +
32 32 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + r[0].stationRouteCode + '</span>' +
33 33 '<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
34 34 '<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + r[0].stationJwpoints + '</span>' +
... ... @@ -38,7 +38,7 @@ var PositionsPublicFunctions = function () {
38 38 '<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp;&nbsp;：' + r[0].stationRouteVersions + '</span>' +
39 39 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
40 40 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
41   - r[0].stationRouteDescriptions +'" >说明/描述：' + r[0].stationRouteDescriptions + '</span>' ;
  41 + r[0].stationRouteDescriptions +'" >说明/描述：' + (r[0].stationRouteDescriptions == null ? "":r[0].stationRouteDescriptions) + '</span>' ;
42 42 // 信息窗口参数属性
43 43 var opts = {
44 44 // 信息窗口宽度
... ...