潘钊 / bsth_control · Commits

Commit 2176b3b91e623958f65443d6a5fbacd71488c41b

Authored by 徐烜
1 parent f437e04e
build: skipped

1、路牌添加加油公里字段，修改相关页面 

2、修改弹出框css
Inline Side-by-side
Showing 17 changed files with 88 additions and 22 deletions
src/main/java/com/bsth/entity/schedule/GuideboardInfo.java
  View file @2176b3b
@@ -37,6 +37,9 @@ public class GuideboardInfo extends BEntity { @@ -37,6 +37,9 @@ public class GuideboardInfo extends BEntity {
37 @Column(nullable = false) 37 @Column(nullable = false)
38 private String lpType; 38 private String lpType;
39 39
  40 + /** 加油公里字段 */
  41 + private Double jygl;
  42 +
40 /** 是否删除（标记） */ 43 /** 是否删除（标记） */
41 @Column(nullable = false) 44 @Column(nullable = false)
42 private Boolean isCancel = false; 45 private Boolean isCancel = false;
@@ -116,4 +119,12 @@ public class GuideboardInfo extends BEntity { @@ -116,4 +119,12 @@ public class GuideboardInfo extends BEntity {
116 public void setIsCancel(Boolean isCancel) { 119 public void setIsCancel(Boolean isCancel) {
117 this.isCancel = isCancel; 120 this.isCancel = isCancel;
118 } 121 }
  122 +
  123 + public Double getJygl() {
  124 + return jygl;
  125 + }
  126 +
  127 + public void setJygl(Double jygl) {
  128 + this.jygl = jygl;
  129 + }
119 } 130 }
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/module.js
  View file @2176b3b
@@ -308,12 +308,12 @@ angular.module('ScheduleApp').controller( @@ -308,12 +308,12 @@ angular.module('ScheduleApp').controller(
308 // large方式弹出模态对话框 308 // large方式弹出模态对话框
309 var modalInstance = $uibModal.open({ 309 var modalInstance = $uibModal.open({
310 templateUrl: '/pages/scheduleApp/module/basicInfo/busInfoManage/orderOptionOpen.html', 310 templateUrl: '/pages/scheduleApp/module/basicInfo/busInfoManage/orderOptionOpen.html',
311 - size: "sm", 311 + // size: "sm",
312 animation: true, 312 animation: true,
313 backdrop: 'static', 313 backdrop: 'static',
314 resolve: { 314 resolve: {
315 }, 315 },
316 - windowClass: 'center-modal', 316 + windowClass: 'order-option-modal',
317 controller: "BusInfoManageListOrderOptionModalInstanceCtrl", 317 controller: "BusInfoManageListOrderOptionModalInstanceCtrl",
318 controllerAs: "$ctrl", 318 controllerAs: "$ctrl",
319 bindToController: true 319 bindToController: true
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/module.js
  View file @2176b3b
@@ -156,12 +156,12 @@ angular.module('ScheduleApp').controller( @@ -156,12 +156,12 @@ angular.module('ScheduleApp').controller(
156 // large方式弹出模态对话框 156 // large方式弹出模态对话框
157 var modalInstance = $uibModal.open({ 157 var modalInstance = $uibModal.open({
158 templateUrl: '/pages/scheduleApp/module/basicInfo/deviceInfoManage/orderOptionOpen.html', 158 templateUrl: '/pages/scheduleApp/module/basicInfo/deviceInfoManage/orderOptionOpen.html',
159 - size: "sm", 159 + // size: "sm",
160 animation: true, 160 animation: true,
161 backdrop: 'static', 161 backdrop: 'static',
162 resolve: { 162 resolve: {
163 }, 163 },
164 - windowClass: 'center-modal', 164 + windowClass: 'order-option-modal',
165 controller: "DeviceInfoManageListOrderOptionModalInstanceCtrl", 165 controller: "DeviceInfoManageListOrderOptionModalInstanceCtrl",
166 controllerAs: "$ctrl", 166 controllerAs: "$ctrl",
167 bindToController: true 167 bindToController: true
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/module.js
  View file @2176b3b
@@ -284,12 +284,12 @@ angular.module('ScheduleApp').controller( @@ -284,12 +284,12 @@ angular.module('ScheduleApp').controller(
284 // large方式弹出模态对话框 284 // large方式弹出模态对话框
285 var modalInstance = $uibModal.open({ 285 var modalInstance = $uibModal.open({
286 templateUrl: '/pages/scheduleApp/module/basicInfo/employeeInfoManage/orderOptionOpen.html', 286 templateUrl: '/pages/scheduleApp/module/basicInfo/employeeInfoManage/orderOptionOpen.html',
287 - size: "sm", 287 + // size: "sm",
288 animation: true, 288 animation: true,
289 backdrop: 'static', 289 backdrop: 'static',
290 resolve: { 290 resolve: {
291 }, 291 },
292 - windowClass: 'center-modal', 292 + windowClass: 'order-option-modal',
293 controller: "EmployeeInfoManageListOrderOptionModalInstanceCtrl", 293 controller: "EmployeeInfoManageListOrderOptionModalInstanceCtrl",
294 controllerAs: "$ctrl", 294 controllerAs: "$ctrl",
295 bindToController: true 295 bindToController: true
src/main/resources/static/pages/scheduleApp/module/common/main.css
  View file @2176b3b
@@ -19,6 +19,7 @@ form input.ng-valid.ng-dirty.ng-valid-required { @@ -19,6 +19,7 @@ form input.ng-valid.ng-dirty.ng-valid-required {
19 background-color: #78FA89; 19 background-color: #78FA89;
20 } 20 }
21 21
  22 +/** 居中弹出框（如：导入弹出框） */
22 .center-modal { 23 .center-modal {
23 position: fixed; 24 position: fixed;
24 top: 10%; 25 top: 10%;
@@ -29,6 +30,16 @@ form input.ng-valid.ng-dirty.ng-valid-required { @@ -29,6 +30,16 @@ form input.ng-valid.ng-dirty.ng-valid-required {
29 margin-left: -10%; 30 margin-left: -10%;
30 } 31 }
31 32
  33 +/* 排序选项弹出框 */
  34 +.order-option-modal .modal-dialog {
  35 + position: fixed;
  36 + top: 10%;
  37 + left: 30%;
  38 + z-index: 1050;
  39 + width: 40%;
  40 + height: 80%;
  41 +}
  42 +
32 .fixDiv { 43 .fixDiv {
33 min-height: 200px; 44 min-height: 200px;
34 min-width: 600px; 45 min-width: 600px;
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
  View file @2176b3b
@@ -259,12 +259,12 @@ angular.module('ScheduleApp').controller( @@ -259,12 +259,12 @@ angular.module('ScheduleApp').controller(
259 // large方式弹出模态对话框 259 // large方式弹出模态对话框
260 var modalInstance = $uibModal.open({ 260 var modalInstance = $uibModal.open({
261 templateUrl: '/pages/scheduleApp/module/core/busConfig/orderOptionOpen.html', 261 templateUrl: '/pages/scheduleApp/module/core/busConfig/orderOptionOpen.html',
262 - size: "sm", 262 + // size: "sm",
263 animation: true, 263 animation: true,
264 backdrop: 'static', 264 backdrop: 'static',
265 resolve: { 265 resolve: {
266 }, 266 },
267 - windowClass: 'center-modal', 267 + windowClass: 'order-option-modal',
268 controller: "BusConfigListOrderOptionModalInstanceCtrl", 268 controller: "BusConfigListOrderOptionModalInstanceCtrl",
269 controllerAs: "$ctrl", 269 controllerAs: "$ctrl",
270 bindToController: true 270 bindToController: true
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/module.js
  View file @2176b3b
@@ -264,12 +264,12 @@ angular.module('ScheduleApp').controller( @@ -264,12 +264,12 @@ angular.module('ScheduleApp').controller(
264 // large方式弹出模态对话框 264 // large方式弹出模态对话框
265 var modalInstance = $uibModal.open({ 265 var modalInstance = $uibModal.open({
266 templateUrl: '/pages/scheduleApp/module/core/employeeConfig/orderOptionOpen.html', 266 templateUrl: '/pages/scheduleApp/module/core/employeeConfig/orderOptionOpen.html',
267 - size: "sm", 267 + // size: "sm",
268 animation: true, 268 animation: true,
269 backdrop: 'static', 269 backdrop: 'static',
270 resolve: { 270 resolve: {
271 }, 271 },
272 - windowClass: 'center-modal', 272 + windowClass: 'order-option-modal',
273 controller: "EmployeeConfigListOrderOptionModalInstanceCtrl", 273 controller: "EmployeeConfigListOrderOptionModalInstanceCtrl",
274 controllerAs: "$ctrl", 274 controllerAs: "$ctrl",
275 bindToController: true 275 bindToController: true
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/detail.html
  View file @2176b3b
@@ -72,6 +72,14 @@ @@ -72,6 +72,14 @@
72 </div> 72 </div>
73 </div> 73 </div>
74 74
  75 + <div class="form-group has-success has-feedback">
  76 + <label class="col-md-2 control-label">加油公里：</label>
  77 + <div class="col-md-3">
  78 + <input type="text" class="form-control" name="lpType"
  79 + ng-model="ctrl.guideboardForDetail.jygl" readonly/>
  80 + </div>
  81 + </div>
  82 +
75 <!-- 其他form-group --> 83 <!-- 其他form-group -->
76 84
77 </div> 85 </div>
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/edit.html
  View file @2176b3b
@@ -99,6 +99,20 @@ @@ -99,6 +99,20 @@
99 </div> 99 </div>
100 </div> 100 </div>
101 101
  102 + <div class="form-group">
  103 + <label class="col-md-2 control-label">加油公里：</label>
  104 + <div class="col-md-3">
  105 + <input type="text" class="form-control" name="jygl"
  106 + ng-model="ctrl.guideboardManageForForm.jygl" ng-pattern="ctrl.float_regex"
  107 + />
  108 + </div>
  109 + <!-- 隐藏块，显示验证信息 -->
  110 + <div class="alert alert-danger well-sm" ng-show="myForm.jygl.$error.pattern">
  111 + 输入数字
  112 + </div>
  113 +
  114 + </div>
  115 +
102 <!-- 路牌类型暂时是普通路牌，默认填写了 --> 116 <!-- 路牌类型暂时是普通路牌，默认填写了 -->
103 117
104 118
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/form.html
  View file @2176b3b
@@ -99,6 +99,20 @@ @@ -99,6 +99,20 @@
99 </div> 99 </div>
100 </div> 100 </div>
101 101
  102 + <div class="form-group">
  103 + <label class="col-md-2 control-label">加油公里：</label>
  104 + <div class="col-md-3">
  105 + <input type="text" class="form-control" name="jygl"
  106 + ng-model="ctrl.guideboardManageForForm.jygl" ng-pattern="ctrl.float_regex"
  107 + />
  108 + </div>
  109 + <!-- 隐藏块，显示验证信息 -->
  110 + <div class="alert alert-danger well-sm" ng-show="myForm.jygl.$error.pattern">
  111 + 输入数字
  112 + </div>
  113 +
  114 + </div>
  115 +
102 <!-- 路牌类型暂时是普通路牌，默认填写了 --> 116 <!-- 路牌类型暂时是普通路牌，默认填写了 -->
103 117
104 118
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
  View file @2176b3b
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 <th style="width: 150px;">线路</th> 8 <th style="width: 150px;">线路</th>
9 <th style="width: 100px;">路牌编号</th> 9 <th style="width: 100px;">路牌编号</th>
10 <th >路牌名称</th> 10 <th >路牌名称</th>
  11 + <th style="width: 100px;">加油公里</th>
11 <th style="width: 100px;">路牌类型</th> 12 <th style="width: 100px;">路牌类型</th>
12 <th style="width: 80px;">状态</th> 13 <th style="width: 80px;">状态</th>
13 <th style="width: 20%">操作</th> 14 <th style="width: 20%">操作</th>
@@ -35,6 +36,7 @@ @@ -35,6 +36,7 @@
35 <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['lpName_like']" placeholder="请输入路牌名字..."/> 36 <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition()['lpName_like']" placeholder="请输入路牌名字..."/>
36 </td> 37 </td>
37 <td></td> 38 <td></td>
  39 + <td></td>
38 <td> 40 <td>
39 <label class="checkbox-inline"> 41 <label class="checkbox-inline">
40 <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>已作废 42 <input type="checkbox" ng-model="ctrl.searchCondition()['isCancel_eq']"/>已作废
@@ -86,6 +88,9 @@ @@ -86,6 +88,9 @@
86 <span ng-bind="info.lpName"></span> 88 <span ng-bind="info.lpName"></span>
87 </td> 89 </td>
88 <td> 90 <td>
  91 + <span ng-bind="info.jygl"></span>
  92 + </td>
  93 + <td>
89 <span ng-bind="info.lpType"></span> 94 <span ng-bind="info.lpType"></span>
90 </td> 95 </td>
91 <td> 96 <td>
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/module.js
  View file @2176b3b
@@ -265,12 +265,12 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -265,12 +265,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
265 // large方式弹出模态对话框 265 // large方式弹出模态对话框
266 var modalInstance = $uibModal.open({ 266 var modalInstance = $uibModal.open({
267 templateUrl: '/pages/scheduleApp/module/core/guideboardManage/orderOptionOpen.html', 267 templateUrl: '/pages/scheduleApp/module/core/guideboardManage/orderOptionOpen.html',
268 - size: "sm", 268 + // size: "lg",
269 animation: true, 269 animation: true,
270 backdrop: 'static', 270 backdrop: 'static',
271 resolve: { 271 resolve: {
272 }, 272 },
273 - windowClass: 'center-modal', 273 + windowClass: 'order-option-modal',
274 controller: "GuideboardManageListOrderOptionModalInstanceCtrl", 274 controller: "GuideboardManageListOrderOptionModalInstanceCtrl",
275 controllerAs: "$ctrl", 275 controllerAs: "$ctrl",
276 bindToController: true 276 bindToController: true
@@ -321,6 +321,9 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -321,6 +321,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
321 var self = this; 321 var self = this;
322 var Gb = service.getGbQueryClass(); 322 var Gb = service.getGbQueryClass();
323 323
  324 + // 小数
  325 + self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
  326 +
324 // 欲保存的表单信息，双向绑定 327 // 欲保存的表单信息，双向绑定
325 self.guideboardManageForForm = new Gb; 328 self.guideboardManageForForm = new Gb;
326 self.guideboardManageForForm.xl = {}; 329 self.guideboardManageForForm.xl = {};
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
  View file @2176b3b
@@ -156,12 +156,12 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -156,12 +156,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
156 // large方式弹出模态对话框 156 // large方式弹出模态对话框
157 var modalInstance = $uibModal.open({ 157 var modalInstance = $uibModal.open({
158 templateUrl: '/pages/scheduleApp/module/core/rerunManage/orderOptionOpen.html', 158 templateUrl: '/pages/scheduleApp/module/core/rerunManage/orderOptionOpen.html',
159 - size: "sm", 159 + // size: "sm",
160 animation: true, 160 animation: true,
161 backdrop: 'static', 161 backdrop: 'static',
162 resolve: { 162 resolve: {
163 }, 163 },
164 - windowClass: 'center-modal', 164 + windowClass: 'order-option-modal',
165 controller: "RerunManageListOrderOptionModalInstanceCtrl", 165 controller: "RerunManageListOrderOptionModalInstanceCtrl",
166 controllerAs: "$ctrl", 166 controllerAs: "$ctrl",
167 bindToController: true 167 bindToController: true
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/module.js
  View file @2176b3b
@@ -222,12 +222,12 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -222,12 +222,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
222 // large方式弹出模态对话框 222 // large方式弹出模态对话框
223 var modalInstance = $uibModal.open({ 223 var modalInstance = $uibModal.open({
224 templateUrl: '/pages/scheduleApp/module/core/schedulePlanManage/orderOptionOpen.html', 224 templateUrl: '/pages/scheduleApp/module/core/schedulePlanManage/orderOptionOpen.html',
225 - size: "sm", 225 + // size: "sm",
226 animation: true, 226 animation: true,
227 backdrop: 'static', 227 backdrop: 'static',
228 resolve: { 228 resolve: {
229 }, 229 },
230 - windowClass: 'center-modal', 230 + windowClass: 'order-option-modal',
231 controller: "SchedulePlanManageListOrderOptionModalInstanceCtrl", 231 controller: "SchedulePlanManageListOrderOptionModalInstanceCtrl",
232 controllerAs: "$ctrl", 232 controllerAs: "$ctrl",
233 bindToController: true 233 bindToController: true
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/module.js
  View file @2176b3b
@@ -277,12 +277,12 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -277,12 +277,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
277 // large方式弹出模态对话框 277 // large方式弹出模态对话框
278 var modalInstance = $uibModal.open({ 278 var modalInstance = $uibModal.open({
279 templateUrl: '/pages/scheduleApp/module/core/scheduleRuleManage/orderOptionOpen.html', 279 templateUrl: '/pages/scheduleApp/module/core/scheduleRuleManage/orderOptionOpen.html',
280 - size: "sm", 280 + // size: "sm",
281 animation: true, 281 animation: true,
282 backdrop: 'static', 282 backdrop: 'static',
283 resolve: { 283 resolve: {
284 }, 284 },
285 - windowClass: 'center-modal', 285 + windowClass: 'order-option-modal',
286 controller: "ScheduleRuleManageListOrderOptionModalInstanceCtrl", 286 controller: "ScheduleRuleManageListOrderOptionModalInstanceCtrl",
287 controllerAs: "$ctrl", 287 controllerAs: "$ctrl",
288 bindToController: true 288 bindToController: true
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/module.js
  View file @2176b3b
@@ -234,12 +234,12 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -234,12 +234,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
234 // large方式弹出模态对话框 234 // large方式弹出模态对话框
235 var modalInstance = $uibModal.open({ 235 var modalInstance = $uibModal.open({
236 templateUrl: '/pages/scheduleApp/module/core/ttInfoManage/orderOptionOpen.html', 236 templateUrl: '/pages/scheduleApp/module/core/ttInfoManage/orderOptionOpen.html',
237 - size: "sm", 237 + // size: "sm",
238 animation: true, 238 animation: true,
239 backdrop: 'static', 239 backdrop: 'static',
240 resolve: { 240 resolve: {
241 }, 241 },
242 - windowClass: 'center-modal', 242 + windowClass: 'order-option-modal',
243 controller: "TtInfoManageListOrderOptionModalInstanceCtrl", 243 controller: "TtInfoManageListOrderOptionModalInstanceCtrl",
244 controllerAs: "$ctrl", 244 controllerAs: "$ctrl",
245 bindToController: true 245 bindToController: true
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage2/module.js
  View file @2176b3b
@@ -234,12 +234,12 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -234,12 +234,12 @@ angular.module(&#39;ScheduleApp&#39;).controller(
234 // large方式弹出模态对话框 234 // large方式弹出模态对话框
235 var modalInstance = $uibModal.open({ 235 var modalInstance = $uibModal.open({
236 templateUrl: '/pages/scheduleApp/module/core/ttInfoManage2/orderOptionOpen.html', 236 templateUrl: '/pages/scheduleApp/module/core/ttInfoManage2/orderOptionOpen.html',
237 - size: "sm", 237 + // size: "sm",
238 animation: true, 238 animation: true,
239 backdrop: 'static', 239 backdrop: 'static',
240 resolve: { 240 resolve: {
241 }, 241 },
242 - windowClass: 'center-modal', 242 + windowClass: 'order-option-modal',
243 controller: "TtInfoManage2ListOrderOptionModalInstanceCtrl", 243 controller: "TtInfoManage2ListOrderOptionModalInstanceCtrl",
244 controllerAs: "$ctrl", 244 controllerAs: "$ctrl",
245 bindToController: true 245 bindToController: true