站点详情展示行业编码字段

游瑞烽
1 parent 03dfab90
Showing 2 changed files with 11 additions and 4 deletions
src/main/resources/static/pages/base/station/list.html
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
@@ -34,14 +34,15 @@
 								<th width="3%">序号</th>
 								<th width="5%">线路编号</th>
 								<th width="8%">线路名称</th>
-								<th width="5%">线路方向</th>
+								<th width="4%">线路方向</th>
 								<th width="8%">站点路由名称</th>
 								<th width="4%">站点编码</th>
+								<th width="4%">行业编码</th>
 								<th width="4%">站点序号</th>
 								<th width="4%">站点类型</th>
 								<th width="6%">站点距离(km)</th>
 								<th width="6%">站点时长(min)</th>
-								<th width="4%">版本号</th>
+								<th width="3%">版本号</th>
 								<th width="4%">是否撤销</th>
 								<th width="8%">操作</th>
 							</tr>
@@ -68,6 +69,9 @@
 									 <input type="text" class="form-control form-filter input-sm" name="stationCode_eq">
 								</td>
 								<td>
+									 <input type="text" class="form-control form-filter input-sm" name="industryCode_eq">
+								</td>
+								<td>
 									<input type="text" class="form-control form-filter input-sm"  name="stationRouteCode_eq">
 								</td>
 								<td>
@@ -141,6 +145,9 @@
 				{{obj.stationCode}}
 			</td>
 			<td>
+				{{obj.industryCode}}
+			</td>
+			<td>
 				{{obj.stationRouteCode}}
 			</td>
 			<td>	
@@ -225,7 +225,7 @@ window.WorldsBMap = function () {
                     // 信息窗口宽度
                     width: (width < 240 ? 240 : width),
                     // 信息窗口高度
-                    height: shapes=="r" ?330:300,
+                    // height: shapes=="r" ?380:350,
                     // 信息窗位置偏移值。
                     offset: new BMap.Size(10,-20),
                     //设置不允许信窗发送短息
@@ -246,7 +246,7 @@ window.WorldsBMap = function () {
                 }
                 var htm = '<span style="color: #ff8355;font-size: 20px; overflow: hidden; white-space: nowrap; text-overflow:ellipsis;display: -webkit-box; -webkit-box-orient: vertical;">' + objStation.stationRouteName + '</span>' +
                     '<span class="help-block" >站点编码：' + objStation.stationCode + '</span>' +
-                    '<span class="help-block" >行业编号：' + objStation.industryCode + '</span>' +
+                    '<span class="help-block" >行业编号：' + (objStation.industryCode == null ? "":objStation.industryCode)+ '</span>' +
                     '<span class="help-block" >站点序号：' + objStation.stationRouteCode + '</span>' +
                     '<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
                     '<span class="help-block" >经度：&nbsp&nbsp' + BJwpoints[0] + '</span>' +