潘钊 / bsth_control · Commits

Commit b2e8ea5bb6f0eccaa1865f20933e35ed0fb28e21

Authored by 游瑞烽
1 parent 03dfab90

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

Inline Side-by-side
Showing 2 changed files with 11 additions and 4 deletions
src/main/resources/static/pages/base/station/list.html
  View file @b2e8ea5
... ... @@ -34,14 +34,15 @@
34 34 <th width="3%">序号</th>
35 35 <th width="5%">线路编号</th>
36 36 <th width="8%">线路名称</th>
37   - <th width="5%">线路方向</th>
  37 + <th width="4%">线路方向</th>
38 38 <th width="8%">站点路由名称</th>
39 39 <th width="4%">站点编码</th>
  40 + <th width="4%">行业编码</th>
40 41 <th width="4%">站点序号</th>
41 42 <th width="4%">站点类型</th>
42 43 <th width="6%">站点距离(km)</th>
43 44 <th width="6%">站点时长(min)</th>
44   - <th width="4%">版本号</th>
  45 + <th width="3%">版本号</th>
45 46 <th width="4%">是否撤销</th>
46 47 <th width="8%">操作</th>
47 48 </tr>
... ... @@ -68,6 +69,9 @@
68 69 <input type="text" class="form-control form-filter input-sm" name="stationCode_eq">
69 70 </td>
70 71 <td>
  72 + <input type="text" class="form-control form-filter input-sm" name="industryCode_eq">
  73 + </td>
  74 + <td>
71 75 <input type="text" class="form-control form-filter input-sm" name="stationRouteCode_eq">
72 76 </td>
73 77 <td>
... ... @@ -141,6 +145,9 @@
141 145 {{obj.stationCode}}
142 146 </td>
143 147 <td>
  148 + {{obj.industryCode}}
  149 + </td>
  150 + <td>
144 151 {{obj.stationRouteCode}}
145 152 </td>
146 153 <td>
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-map.js
  View file @b2e8ea5
... ... @@ -225,7 +225,7 @@ window.WorldsBMap = function () {
225 225 // 信息窗口宽度
226 226 width: (width < 240 ? 240 : width),
227 227 // 信息窗口高度
228   - height: shapes=="r" ?330:300,
  228 + // height: shapes=="r" ?380:350,
229 229 // 信息窗位置偏移值。
230 230 offset: new BMap.Size(10,-20),
231 231 //设置不允许信窗发送短息
... ... @@ -246,7 +246,7 @@ window.WorldsBMap = function () {
246 246 }
247 247 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>' +
248 248 '<span class="help-block" >站点编码：' + objStation.stationCode + '</span>' +
249   - '<span class="help-block" >行业编号：' + objStation.industryCode + '</span>' +
  249 + '<span class="help-block" >行业编号：' + (objStation.industryCode == null ? "":objStation.industryCode)+ '</span>' +
250 250 '<span class="help-block" >站点序号：' + objStation.stationRouteCode + '</span>' +
251 251 '<span class="help-block" >站点类型：' + markTypeStr + '</span>' +
252 252 '<span class="help-block" >经度：&nbsp&nbsp' + BJwpoints[0] + '</span>' +
... ...