潘钊 / bsth_control · Commits

Commit 48ddd36f35d59c68851a2d33ea6e285187ff9c79

Authored by 王通
1 parent f31b5bfa
build: skipped

1.

Inline Side-by-side
Showing 9 changed files with 6 additions and 13 deletions
src/main/resources/static/pages/base/carpark/js/carpark-positions-function.js
  View file @48ddd36
... ... @@ -113,7 +113,7 @@ var PublicFunctions = function () {
113 113 '<span class="help-block" style="color:#DDD;font-size: 15px;">Radius:' + r[0].carParkRadius + '</span>' +
114 114 '<span class="help-block" style="color:#DDD;font-size: 15px;">Company:' + companyV + '</span>' +
115 115 '<span class="help-block" style="color:#DDD;font-size: 15px;">Branch Company:' + branchecomV+ '</span>' +
116   - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号:' + r[0].carParkVersions + '</span>' +
  116 + '<span class="help-block" style="color:#DDD;font-size: 15px;">Version number:' + r[0].carParkVersions + '</span>' +
117 117 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+ r[0].carParkDescriptions +'" >Description:' + r[0].carParkDescriptions + '</span>' ;
118 118 // 信息窗口参数属性
119 119 var opts = {
... ...
src/main/resources/static/pages/base/line/addstation.html
  View file @48ddd36
... ... @@ -87,7 +87,6 @@
87 87 </label>
88 88 <div class="col-md-6">
89 89 <select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
90   - <span class="help-block">说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
91 90 </div>
92 91 </div>
93 92 </div>
... ...
src/main/resources/static/pages/base/line/editstation.html
  View file @48ddd36
... ... @@ -88,7 +88,6 @@
88 88 </label>
89 89 <div class="col-md-6">
90 90 <select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
91   - <span class="help-block"> *说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
92 91 </div>
93 92 </div>
94 93 </div>
... ...
src/main/resources/static/pages/base/station/add.html
  View file @48ddd36
... ... @@ -185,7 +185,6 @@
185 185 </label>
186 186 <div class="col-md-6">
187 187 <select name="stationRouteCode" style="width:100%" class="form-control" id="stationrouteSelect"></select>
188   - <span class="help-block"> *说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
189 188 </div>
190 189 </div>
191 190 </div>
... ...
src/main/resources/static/pages/base/station/edit.html
  View file @48ddd36
... ... @@ -101,7 +101,6 @@
101 101 </label>
102 102 <div class="col-md-6">
103 103 <select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
104   - <span class="help-block">说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
105 104 </div>
106 105 </div>
107 106 </div>
... ...
src/main/resources/static/pages/base/station/list_edit.html
  View file @48ddd36
... ... @@ -115,13 +115,13 @@
115 115  
116 116 <!-- 表单分组组件 form-group START -->
117 117 <div class="form-group">
118   - <!-- 站点路由编码 -->
  118 + <!-- Station sequence number -->
119 119 <div class="col-md-6">
120 120 <label class="control-label col-md-5">
121   - <span class="required"> * </span>站点路由编码&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
  121 + <span class="required"> * </span>Station sequence number:
122 122 </label>
123 123 <div class="col-md-4">
124   - <input type="text" class="form-control" name="stationRouteId" id="stationRouteIdInput" placeholder="站点路由编码" readonly="readonly">
  124 + <input type="text" class="form-control" name="stationRouteId" id="stationRouteIdInput" placeholder="Station sequence number" readonly="readonly">
125 125 </div>
126 126 </div>
127 127  
... ... @@ -160,7 +160,6 @@
160 160 </label>
161 161 <div class="col-md-4">
162 162 <select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
163   - <span class="help-block">说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
164 163 </div>
165 164 </div>
166 165 </div>
... ...
src/main/resources/static/pages/base/stationroute/add.html
  View file @48ddd36
... ... @@ -98,7 +98,6 @@
98 98 </label>
99 99 <div class="col-md-6">
100 100 <select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
101   - <span class="help-block">说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
102 101 </div>
103 102 </div>
104 103 </div>
... ...
src/main/resources/static/pages/base/stationroute/edit.html
  View file @48ddd36
... ... @@ -79,7 +79,6 @@
79 79 </label>
80 80 <div class="col-md-6">
81 81 <select name="stationRouteCode" class="form-control" id="stationrouteSelect" style="width:100%"></select>
82   - <span class="help-block"> *说明:选择的站点将作为本站序号的参考，成为选择站点的下一站。 </span>
83 82 </div>
84 83 </div>
85 84 </div>
... ...
src/main/resources/static/pages/excep/js/outbound-map.js
  View file @48ddd36
... ... @@ -314,7 +314,7 @@ var WorldsBMap = function () {
314 314 '<span class="help-block" style="color:#DDD;font-size: 15px;">Time(previous to current):' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
315 315 '<span class="help-block" style="color:#DDD;font-size: 15px;">Distance(previous to current):' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
316 316 '<span class="help-block" style="color:#DDD;font-size: 15px;">Radius:' + objStation.stationRadius + '</span>' +
317   - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号:' + objStation.stationRouteVersions + '</span>' +
  317 + '<span class="help-block" style="color:#DDD;font-size: 15px;">Version number:' + objStation.stationRouteVersions + '</span>' +
318 318 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
319 319 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
320 320 objStation.stationRouteDescriptions +'" >Description:' + objStation.stationRouteDescriptions + '</span>' ;
... ... @@ -448,7 +448,7 @@ var WorldsBMap = function () {
448 448 '<span class="help-block" style="color:#DDD;font-size: 15px;">Time(previous to current):' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
449 449 '<span class="help-block" style="color:#DDD;font-size: 15px;">Distance(previous to current):' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
450 450 '<span class="help-block" style="color:#DDD;font-size: 15px;">Radius:' + objStation.stationRadius + '</span>' +
451   - '<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号:' + objStation.stationRouteVersions + '</span>' +
  451 + '<span class="help-block" style="color:#DDD;font-size: 15px;">Version number:' + objStation.stationRouteVersions + '</span>' +
452 452 '<span class="help-block" style="width: 100%;font-size: 15px;;color:#DDD;'+
453 453 'overflow: hidden; white-space: nowrap; text-overflow: ellipsis; " title="'+
454 454 objStation.stationRouteDescriptions +'" >Description:' + objStation.stationRouteDescriptions + '</span>' ;
... ...