潘钊 / bsth_control · Commits

Commit c6cdf717618121071fecc4db3f3a256a5ca1f94e

Authored by 徐烜
1 parent 23f52cc8
build: skipped

Update

Inline Side-by-side
Showing 4 changed files with 383 additions and 0 deletions
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
  View file @c6cdf71
@@ -58,6 +58,26 @@ public class CarConfigInfo extends BEntity implements Serializable { @@ -58,6 +58,26 @@ public class CarConfigInfo extends BEntity implements Serializable {
58 @Column(nullable = false) 58 @Column(nullable = false)
59 private Boolean isCancel = false; 59 private Boolean isCancel = false;
60 60
  61 + //-------------- 车辆配置的停车场及相关信息 ------------//
  62 + /** 车辆配置-CheLiangPeiZhi 字典，ZW(早晚)，FS(复驶)，BSY(不使用) */
  63 + private String pzType;
  64 + /** 上行出场里程 */
  65 + private Double upOutLc;
  66 + /** 上行出场时间 */
  67 + private Double upOutSj;
  68 + /** 下行出场里程 */
  69 + private Double downOutLc;
  70 + /** 下行出场时间 */
  71 + private Double downOutSj;
  72 + /** 上行进场里程 */
  73 + private Double upInLc;
  74 + /** 上行进场时间 */
  75 + private Double upInSj;
  76 + /** 下行进场里程 */
  77 + private Double downInLc;
  78 + /** 下行进场时间 */
  79 + private Double downInSj;
  80 +
61 public CarConfigInfo() {} 81 public CarConfigInfo() {}
62 public CarConfigInfo(Object id, Object xlid, Object xlname, Object clid) { 82 public CarConfigInfo(Object id, Object xlid, Object xlname, Object clid) {
63 if (id != null) { 83 if (id != null) {
@@ -156,4 +176,76 @@ public class CarConfigInfo extends BEntity implements Serializable { @@ -156,4 +176,76 @@ public class CarConfigInfo extends BEntity implements Serializable {
156 public void setIsCancel(Boolean isCancel) { 176 public void setIsCancel(Boolean isCancel) {
157 this.isCancel = isCancel; 177 this.isCancel = isCancel;
158 } 178 }
  179 +
  180 + public String getPzType() {
  181 + return pzType;
  182 + }
  183 +
  184 + public void setPzType(String pzType) {
  185 + this.pzType = pzType;
  186 + }
  187 +
  188 + public Double getUpOutLc() {
  189 + return upOutLc;
  190 + }
  191 +
  192 + public void setUpOutLc(Double upOutLc) {
  193 + this.upOutLc = upOutLc;
  194 + }
  195 +
  196 + public Double getUpOutSj() {
  197 + return upOutSj;
  198 + }
  199 +
  200 + public void setUpOutSj(Double upOutSj) {
  201 + this.upOutSj = upOutSj;
  202 + }
  203 +
  204 + public Double getDownOutLc() {
  205 + return downOutLc;
  206 + }
  207 +
  208 + public void setDownOutLc(Double downOutLc) {
  209 + this.downOutLc = downOutLc;
  210 + }
  211 +
  212 + public Double getDownOutSj() {
  213 + return downOutSj;
  214 + }
  215 +
  216 + public void setDownOutSj(Double downOutSj) {
  217 + this.downOutSj = downOutSj;
  218 + }
  219 +
  220 + public Double getUpInLc() {
  221 + return upInLc;
  222 + }
  223 +
  224 + public void setUpInLc(Double upInLc) {
  225 + this.upInLc = upInLc;
  226 + }
  227 +
  228 + public Double getUpInSj() {
  229 + return upInSj;
  230 + }
  231 +
  232 + public void setUpInSj(Double upInSj) {
  233 + this.upInSj = upInSj;
  234 + }
  235 +
  236 + public Double getDownInLc() {
  237 + return downInLc;
  238 + }
  239 +
  240 + public void setDownInLc(Double downInLc) {
  241 + this.downInLc = downInLc;
  242 + }
  243 +
  244 + public Double getDownInSj() {
  245 + return downInSj;
  246 + }
  247 +
  248 + public void setDownInSj(Double downInSj) {
  249 + this.downInSj = downInSj;
  250 + }
159 } 251 }
src/main/resources/static/pages/scheduleApp/module/core/busConfig/edit.html
  View file @c6cdf71
@@ -154,6 +154,149 @@ @@ -154,6 +154,149 @@
154 </div> 154 </div>
155 </div> 155 </div>
156 156
  157 + <div class="form-group has-success has-feedback">
  158 + <label class="col-md-2 control-label">配置类型*：</label>
  159 + <div class="col-md-3">
  160 + <sa-Radiogroup model="ctrl.busConfigForSave.pzType" dicgroup="CheLiangPeiZhi" name="pzType"></sa-Radiogroup>
  161 + </div>
  162 + </div>
  163 +
  164 + <div class="form-group has-success has-feedback"
  165 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  166 + <label class="col-md-2 control-label">上行出场里程*：</label>
  167 + <div class="col-md-3">
  168 + <input type="text" class="form-control" name="upOutLc"
  169 + ng-model="ctrl.busConfigForSave.upOutLc" required ng-pattern="ctrl.float_regex"
  170 + />
  171 + </div>
  172 + <!-- 隐藏块，显示验证信息 -->
  173 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutLc.$error.required">
  174 + 上行出场里程必须填写
  175 + </div>
  176 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutLc.$error.pattern">
  177 + 输入数字
  178 + </div>
  179 + </div>
  180 +
  181 + <div class="form-group has-success has-feedback"
  182 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  183 + <label class="col-md-2 control-label">上行出场时间*：</label>
  184 + <div class="col-md-3">
  185 + <input type="text" class="form-control" name="upOutSj"
  186 + ng-model="ctrl.busConfigForSave.upOutSj" required ng-pattern="ctrl.number_regex"
  187 + />
  188 + </div>
  189 + <!-- 隐藏块，显示验证信息 -->
  190 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutSj.$error.required">
  191 + 上行出场时间必须填写
  192 + </div>
  193 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutSj.$error.pattern">
  194 + 输入整数
  195 + </div>
  196 + </div>
  197 +
  198 + <div class="form-group has-success has-feedback"
  199 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  200 + <label class="col-md-2 control-label">下行出场里程*：</label>
  201 + <div class="col-md-3">
  202 + <input type="text" class="form-control" name="downOutLc"
  203 + ng-model="ctrl.busConfigForSave.downOutLc" required ng-pattern="ctrl.float_regex"
  204 + />
  205 + </div>
  206 + <!-- 隐藏块，显示验证信息 -->
  207 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutLc.$error.required">
  208 + 下行出场里程必须填写
  209 + </div>
  210 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutLc.$error.pattern">
  211 + 输入数字
  212 + </div>
  213 + </div>
  214 +
  215 + <div class="form-group has-success has-feedback"
  216 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  217 + <label class="col-md-2 control-label">下行出场时间*：</label>
  218 + <div class="col-md-3">
  219 + <input type="text" class="form-control" name="downOutSj"
  220 + ng-model="ctrl.busConfigForSave.downOutSj" required ng-pattern="ctrl.number_regex"
  221 + />
  222 + </div>
  223 + <!-- 隐藏块，显示验证信息 -->
  224 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutSj.$error.required">
  225 + 下行出场时间必须填写
  226 + </div>
  227 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutSj.$error.pattern">
  228 + 输入整数
  229 + </div>
  230 + </div>
  231 +
  232 + <div class="form-group has-success has-feedback"
  233 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  234 + <label class="col-md-2 control-label">上行进场里程*：</label>
  235 + <div class="col-md-3">
  236 + <input type="text" class="form-control" name="upInLc"
  237 + ng-model="ctrl.busConfigForSave.upInLc" required ng-pattern="ctrl.float_regex"
  238 + />
  239 + </div>
  240 + <!-- 隐藏块，显示验证信息 -->
  241 + <div class="alert alert-danger well-sm" ng-show="myForm.upInLc.$error.required">
  242 + 上行进场里程必须填写
  243 + </div>
  244 + <div class="alert alert-danger well-sm" ng-show="myForm.upInLc.$error.pattern">
  245 + 输入数字
  246 + </div>
  247 + </div>
  248 +
  249 + <div class="form-group has-success has-feedback"
  250 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  251 + <label class="col-md-2 control-label">上行进场时间*：</label>
  252 + <div class="col-md-3">
  253 + <input type="text" class="form-control" name="upInSj"
  254 + ng-model="ctrl.busConfigForSave.upInSj" required ng-pattern="ctrl.number_regex"
  255 + />
  256 + </div>
  257 + <!-- 隐藏块，显示验证信息 -->
  258 + <div class="alert alert-danger well-sm" ng-show="myForm.upInSj.$error.required">
  259 + 上行进场时间必须填写
  260 + </div>
  261 + <div class="alert alert-danger well-sm" ng-show="myForm.upInSj.$error.pattern">
  262 + 输入整数
  263 + </div>
  264 + </div>
  265 +
  266 + <div class="form-group has-success has-feedback"
  267 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  268 + <label class="col-md-2 control-label">下行进场里程*：</label>
  269 + <div class="col-md-3">
  270 + <input type="text" class="form-control" name="downInLc"
  271 + ng-model="ctrl.busConfigForSave.downInLc" required ng-pattern="ctrl.float_regex"
  272 + />
  273 + </div>
  274 + <!-- 隐藏块，显示验证信息 -->
  275 + <div class="alert alert-danger well-sm" ng-show="myForm.downInLc.$error.required">
  276 + 下行进场里程必须填写
  277 + </div>
  278 + <div class="alert alert-danger well-sm" ng-show="myForm.downInLc.$error.pattern">
  279 + 输入数字
  280 + </div>
  281 + </div>
  282 +
  283 + <div class="form-group has-success has-feedback"
  284 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  285 + <label class="col-md-2 control-label">下行进场时间*：</label>
  286 + <div class="col-md-3">
  287 + <input type="text" class="form-control" name="downInSj"
  288 + ng-model="ctrl.busConfigForSave.downInSj" required ng-pattern="ctrl.number_regex"
  289 + />
  290 + </div>
  291 + <!-- 隐藏块，显示验证信息 -->
  292 + <div class="alert alert-danger well-sm" ng-show="myForm.downInSj.$error.required">
  293 + 下行进场时间必须填写
  294 + </div>
  295 + <div class="alert alert-danger well-sm" ng-show="myForm.downInSj.$error.pattern">
  296 + 输入整数
  297 + </div>
  298 + </div>
  299 +
157 300
158 <!-- 其他form-group --> 301 <!-- 其他form-group -->
159 302
src/main/resources/static/pages/scheduleApp/module/core/busConfig/form.html
  View file @c6cdf71
@@ -154,6 +154,149 @@ @@ -154,6 +154,149 @@
154 </div> 154 </div>
155 </div> 155 </div>
156 156
  157 + <div class="form-group has-success has-feedback">
  158 + <label class="col-md-2 control-label">配置类型*：</label>
  159 + <div class="col-md-3">
  160 + <sa-Radiogroup model="ctrl.busConfigForSave.pzType" dicgroup="CheLiangPeiZhi" name="pzType"></sa-Radiogroup>
  161 + </div>
  162 + </div>
  163 +
  164 + <div class="form-group has-success has-feedback"
  165 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  166 + <label class="col-md-2 control-label">上行出场里程*：</label>
  167 + <div class="col-md-3">
  168 + <input type="text" class="form-control" name="upOutLc"
  169 + ng-model="ctrl.busConfigForSave.upOutLc" required ng-pattern="ctrl.float_regex"
  170 + />
  171 + </div>
  172 + <!-- 隐藏块，显示验证信息 -->
  173 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutLc.$error.required">
  174 + 上行出场里程必须填写
  175 + </div>
  176 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutLc.$error.pattern">
  177 + 输入数字
  178 + </div>
  179 + </div>
  180 +
  181 + <div class="form-group has-success has-feedback"
  182 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  183 + <label class="col-md-2 control-label">上行出场时间*：</label>
  184 + <div class="col-md-3">
  185 + <input type="text" class="form-control" name="upOutSj"
  186 + ng-model="ctrl.busConfigForSave.upOutSj" required ng-pattern="ctrl.number_regex"
  187 + />
  188 + </div>
  189 + <!-- 隐藏块，显示验证信息 -->
  190 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutSj.$error.required">
  191 + 上行出场时间必须填写
  192 + </div>
  193 + <div class="alert alert-danger well-sm" ng-show="myForm.upOutSj.$error.pattern">
  194 + 输入整数
  195 + </div>
  196 + </div>
  197 +
  198 + <div class="form-group has-success has-feedback"
  199 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  200 + <label class="col-md-2 control-label">下行出场里程*：</label>
  201 + <div class="col-md-3">
  202 + <input type="text" class="form-control" name="downOutLc"
  203 + ng-model="ctrl.busConfigForSave.downOutLc" required ng-pattern="ctrl.float_regex"
  204 + />
  205 + </div>
  206 + <!-- 隐藏块，显示验证信息 -->
  207 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutLc.$error.required">
  208 + 下行出场里程必须填写
  209 + </div>
  210 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutLc.$error.pattern">
  211 + 输入数字
  212 + </div>
  213 + </div>
  214 +
  215 + <div class="form-group has-success has-feedback"
  216 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  217 + <label class="col-md-2 control-label">下行出场时间*：</label>
  218 + <div class="col-md-3">
  219 + <input type="text" class="form-control" name="downOutSj"
  220 + ng-model="ctrl.busConfigForSave.downOutSj" required ng-pattern="ctrl.number_regex"
  221 + />
  222 + </div>
  223 + <!-- 隐藏块，显示验证信息 -->
  224 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutSj.$error.required">
  225 + 下行出场时间必须填写
  226 + </div>
  227 + <div class="alert alert-danger well-sm" ng-show="myForm.downOutSj.$error.pattern">
  228 + 输入整数
  229 + </div>
  230 + </div>
  231 +
  232 + <div class="form-group has-success has-feedback"
  233 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  234 + <label class="col-md-2 control-label">上行进场里程*：</label>
  235 + <div class="col-md-3">
  236 + <input type="text" class="form-control" name="upInLc"
  237 + ng-model="ctrl.busConfigForSave.upInLc" required ng-pattern="ctrl.float_regex"
  238 + />
  239 + </div>
  240 + <!-- 隐藏块，显示验证信息 -->
  241 + <div class="alert alert-danger well-sm" ng-show="myForm.upInLc.$error.required">
  242 + 上行进场里程必须填写
  243 + </div>
  244 + <div class="alert alert-danger well-sm" ng-show="myForm.upInLc.$error.pattern">
  245 + 输入数字
  246 + </div>
  247 + </div>
  248 +
  249 + <div class="form-group has-success has-feedback"
  250 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  251 + <label class="col-md-2 control-label">上行进场时间*：</label>
  252 + <div class="col-md-3">
  253 + <input type="text" class="form-control" name="upInSj"
  254 + ng-model="ctrl.busConfigForSave.upInSj" required ng-pattern="ctrl.number_regex"
  255 + />
  256 + </div>
  257 + <!-- 隐藏块，显示验证信息 -->
  258 + <div class="alert alert-danger well-sm" ng-show="myForm.upInSj.$error.required">
  259 + 上行进场时间必须填写
  260 + </div>
  261 + <div class="alert alert-danger well-sm" ng-show="myForm.upInSj.$error.pattern">
  262 + 输入整数
  263 + </div>
  264 + </div>
  265 +
  266 + <div class="form-group has-success has-feedback"
  267 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  268 + <label class="col-md-2 control-label">下行进场里程*：</label>
  269 + <div class="col-md-3">
  270 + <input type="text" class="form-control" name="downInLc"
  271 + ng-model="ctrl.busConfigForSave.downInLc" required ng-pattern="ctrl.float_regex"
  272 + />
  273 + </div>
  274 + <!-- 隐藏块，显示验证信息 -->
  275 + <div class="alert alert-danger well-sm" ng-show="myForm.downInLc.$error.required">
  276 + 下行进场里程必须填写
  277 + </div>
  278 + <div class="alert alert-danger well-sm" ng-show="myForm.downInLc.$error.pattern">
  279 + 输入数字
  280 + </div>
  281 + </div>
  282 +
  283 + <div class="form-group has-success has-feedback"
  284 + ng-if="ctrl.busConfigForSave.pzType == 'ZW' || ctrl.busConfigForSave.pzType == 'FS'">
  285 + <label class="col-md-2 control-label">下行进场时间*：</label>
  286 + <div class="col-md-3">
  287 + <input type="text" class="form-control" name="downInSj"
  288 + ng-model="ctrl.busConfigForSave.downInSj" required ng-pattern="ctrl.number_regex"
  289 + />
  290 + </div>
  291 + <!-- 隐藏块，显示验证信息 -->
  292 + <div class="alert alert-danger well-sm" ng-show="myForm.downInSj.$error.required">
  293 + 下行进场时间必须填写
  294 + </div>
  295 + <div class="alert alert-danger well-sm" ng-show="myForm.downInSj.$error.pattern">
  296 + 输入整数
  297 + </div>
  298 + </div>
  299 +
157 300
158 <!-- 其他form-group --> 301 <!-- 其他form-group -->
159 302
src/main/resources/static/pages/scheduleApp/module/core/busConfig/module.js
  View file @c6cdf71
@@ -228,6 +228,11 @@ angular.module(&#39;ScheduleApp&#39;).controller( @@ -228,6 +228,11 @@ angular.module(&#39;ScheduleApp&#39;).controller(
228 self.zzrqOpen = true; 228 self.zzrqOpen = true;
229 }; 229 };
230 230
  231 + // 整数正则表达式
  232 + self.number_regex = /^-?\d+$/;
  233 + // 小数正则表达式
  234 + self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
  235 +
231 // 欲保存的busInfo信息，绑定 236 // 欲保存的busInfo信息，绑定
232 self.busConfigForSave = new BusConfig; 237 self.busConfigForSave = new BusConfig;
233 self.busConfigForSave.xl = {}; 238 self.busConfigForSave.xl = {};