Commit 096158f67f02d616fadf6b5bfc8fd796be3e8ecd

Authored by 徐烜
1 parent de5c458a

浦东公交计划调度功能优化

1、排班计划明细中修改班次可以修改计划里程和行驶时间
2、修改DroolsSchedulePlan,貌似本地生成排班计划明细没有createDate和updateDate,在代码中强制添加一下
src/main/java/com/bsth/service/schedule/impl/plan/DroolsSchedulePlan.java
... ... @@ -326,6 +326,8 @@ public class DroolsSchedulePlan {
326 326 schedulePlan.setScheduleToTime(this.to);
327 327 schedulePlan.setCreateBy(this.schedulePlan.getCreateBy());
328 328 schedulePlan.setUpdateBy(this.schedulePlan.getUpdateBy());
  329 + schedulePlan.setCreateDate(this.schedulePlan.getCreateDate());
  330 + schedulePlan.setUpdateDate(this.schedulePlan.getUpdateDate());
329 331  
330 332 // 1-1、构造drools规则输入数据,输出数据
331 333 PlanCalcuParam_input planCalcuParam_input = new PlanCalcuParam_input(
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/edit.html
... ... @@ -152,6 +152,39 @@
152 152 </div>
153 153  
154 154 <div class="form-group has-success has-feedback">
  155 + <label class="col-md-2 control-label">计划里程*:</label>
  156 + <div class="col-md-3">
  157 + <input type="text" class="form-control" name="jhlc"
  158 + ng-model="ctrl.schedulePlanInfoForSave.jhlc" required ng-pattern="ctrl.float_regex"
  159 + />
  160 + </div>
  161 + <!-- 隐藏块,显示验证信息 -->
  162 + <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.required">
  163 + 计划里程必须填写
  164 + </div>
  165 + <div class="alert alert-danger well-sm" ng-show="myForm.jhlc.$error.pattern">
  166 + 输入数字
  167 + </div>
  168 +
  169 + </div>
  170 + <div class="form-group has-success has-feedback">
  171 + <label class="col-md-2 control-label">班次历时*:</label>
  172 + <div class="col-md-3">
  173 + <input type="text" class="form-control" name="bcsj"
  174 + ng-model="ctrl.schedulePlanInfoForSave.bcsj" required ng-pattern="ctrl.number_regex"
  175 + />
  176 + </div>
  177 + <!-- 隐藏块,显示验证信息 -->
  178 + <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.required">
  179 + 班次时间必须填写
  180 + </div>
  181 + <div class="alert alert-danger well-sm" ng-show="myForm.bcsj.$error.pattern">
  182 + 输入整数
  183 + </div>
  184 +
  185 + </div>
  186 +
  187 + <div class="form-group has-success has-feedback">
155 188 <label class="col-md-2 control-label">车辆*:</label>
156 189 <div class="col-md-4">
157 190 <sa-Select5 name="cl"
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/info/module.js
... ... @@ -230,6 +230,11 @@ angular.module(&quot;ScheduleApp&quot;).controller(
230 230 $state.go("schedulePlanInfoManage", $stateParams);
231 231 };
232 232  
  233 + // 整数
  234 + self.number_regex = /^-?\d+$/;
  235 + // 小数
  236 + self.float_regex = /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/;
  237 +
233 238 // 线路版本描述
234 239 self.title_tip = "版本加载中...";
235 240  
... ...