潘钊 / bsth_control · Commits

Commit e90ff7d6ad8a4a311faa50be52ec2189adacf1b8

Authored by 徐烜
1 parent fce30c31

PSM-12

Inline Side-by-side
Showing 29 changed files with 236 additions and 222 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlan.java
  View file @e90ff7d
... ... @@ -32,6 +32,7 @@ public class SchedulePlan {
32 32 @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
33 33 private Line xl;
34 34 /** 关联的时刻表/模版 */
  35 + // TODO：这个字段之后就不用了
35 36 @ManyToOne(optional = false, cascade = CascadeType.DETACH, fetch = FetchType.LAZY)
36 37 private TTInfo ttInfo;
37 38 /** TODO：关联的排班规则（这里暂时改成可以不关联规则，直接生成排班） */
... ...
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
  View file @e90ff7d
... ... @@ -12,6 +12,7 @@ import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
12 12 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
13 13 import com.bsth.service.schedule.rules.strategy.IStrategy;
14 14 import com.google.common.collect.Multimap;
  15 +import org.apache.commons.lang3.StringUtils;
15 16 import org.joda.time.DateTime;
16 17 import org.kie.api.KieBase;
17 18 import org.kie.api.runtime.KieSession;
... ... @@ -64,7 +65,7 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long>
64 65 // 创建session，内部配置的是stateful
65 66 KieSession session = kieBase.newKieSession();
66 67 // 设置gloable对象，在drl中通过别名使用
67   -// session.setGlobal("scheduleResult", scheduleResults_output);
  68 + session.setGlobal("scheduleResult", scheduleResults_output);
68 69  
69 70 // 载入数据
70 71 session.insert(scheduleCalcuParam_input);
... ... @@ -93,6 +94,7 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long>
93 94 Map<Long, EmployeeConfigInfo> employeeConfigMaps = strategy.getEmployeeConfigMaps(xl.getId()); // 人员配置对应的人员信息
94 95  
95 96 // 3-2、循环规则输出
  97 + Map<Long, String> ttInfoMap = new HashMap<>(); // 时刻表映射，id和名字
96 98 List<SchedulePlanInfo> schedulePlanInfos = new ArrayList<>();
97 99 for (ScheduleResult_output scheduleResult_output : scheduleResults_output.getResults()) {
98 100 // 车辆配置对应的车辆
... ... @@ -115,9 +117,13 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl&lt;SchedulePlan, Long&gt;
115 117 employeeConfigInfoList,
116 118 schedulePlan);
117 119 schedulePlanInfos.add(schedulePlanInfo);
  120 + ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
118 121 }
119 122 }
120 123  
  124 + schedulePlan.setTtInfoId(StringUtils.join(ttInfoMap.keySet(), ","));
  125 + schedulePlan.setTtInfoNames(StringUtils.join(ttInfoMap.values(), ","));
  126 +
121 127 // 3-2、保存生成的排班和明细
122 128 schedulePlan.getSchedulePlanInfoList().addAll(schedulePlanInfos); // 关联的排班明细信息
123 129 return super.save(schedulePlan);
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/list.html
  View file @e90ff7d
... ... @@ -4,9 +4,9 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 5%;">序号</th>
8   - <th >车辆编号</th>
9   - <th >内部编号</th>
  7 + <th style="width: 50px;">序号</th>
  8 + <th style="width: 130px;">车辆编号</th>
  9 + <th style="width: 130px;">内部编号</th>
10 10 <th >设备编号</th>
11 11 <th >车牌号</th>
12 12 <th style="width: 15%;">所在公司</th>
... ... @@ -17,16 +17,14 @@
17 17 <tr role="row" class="filter">
18 18 <td></td>
19 19 <td>
20   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carCode_like"/>
  20 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carCode_like" placeholder="输入车辆编号..."/>
21 21 </td>
22 22 <td>
23   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().insideCode_like"/>
  23 + <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().insideCode_like" placeholder="输入内部编号..."/>
24 24 </td>
25 25 <td>
26   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().equipmentCode_like"/>
27 26 </td>
28 27 <td>
29   - <input type="text" class="form-control form-filter input-sm" ng-model="ctrl.searchCondition().carPlate_like"/>
30 28 </td>
31 29 <td>
32 30 <div>
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/edit.html
  View file @e90ff7d
... ... @@ -42,7 +42,7 @@
42 42 cmaps="{'xl': 'id', 'xlName': 'name', 'xlBm': 'lineCode'}"
43 43 dcname="xl"
44 44 icname="id"
45   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  45 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
46 46 iterobjname="item"
47 47 iterobjexp="item.name"
48 48 searchph="请输拼音..."
... ... @@ -147,7 +147,7 @@
147 147 ng-model="ctrl.deviceInfoForSave.qyrq" readonly
148 148 remote-Validation
149 149 remotevtype="cde1"
150   - remotevparam="{{ {'qyrq': ctrl.deviceInfoForSave.qyrq} | json}}"/>
  150 + remotevparam="{{ {'qyrq': ctrl.deviceInfoForSave.qyrq, 'xl': ctrl.deviceInfoForSave.xl, 'cl': ctrl.deviceInfoForSave.cl} | json}}"/>
151 151 <span class="input-group-btn">
152 152 <button type="button" class="btn btn-default" ng-click="ctrl.qyrq_open()">
153 153 <i class="glyphicon glyphicon-calendar"></i>
... ... @@ -159,6 +159,9 @@
159 159 <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
160 160 启用日期必须选择
161 161 </div>
  162 + <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
  163 + 启用日期必须比历史的启用日期大
  164 + </div>
162 165 </div>
163 166  
164 167 <!-- 其他form-group -->
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
  View file @e90ff7d
... ... @@ -42,7 +42,7 @@
42 42 cmaps="{'xl': 'id', 'xlName': 'name', 'xlBm': 'lineCode'}"
43 43 dcname="xl"
44 44 icname="id"
45   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  45 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
46 46 iterobjname="item"
47 47 iterobjexp="item.name"
48 48 searchph="请输拼音..."
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/index.html
  View file @e90ff7d
... ... @@ -32,21 +32,21 @@
32 32 添加设备信息
33 33 </a>
34 34  
35   - <div class="btn-group">
36   - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37   - <i class="fa fa-share"></i>
38   - <span>数据工具</span>
39   - <i class="fa fa-angle-down"></i>
40   - </a>
41   - <ul class="dropdown-menu pull-right">
42   - <li>
43   - <a href="javascript:" class="tool-action">
44   - <i class="fa fa-file-excel-o"></i>
45   - 导出excel
46   - </a>
47   - </li>
48   - </ul>
49   - </div>
  35 + <!--<div class="btn-group">-->
  36 + <!--<a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">-->
  37 + <!--<i class="fa fa-share"></i>-->
  38 + <!--<span>数据工具</span>-->
  39 + <!--<i class="fa fa-angle-down"></i>-->
  40 + <!--</a>-->
  41 + <!--<ul class="dropdown-menu pull-right">-->
  42 + <!--<li>-->
  43 + <!--<a href="javascript:" class="tool-action">-->
  44 + <!--<i class="fa fa-file-excel-o"></i>-->
  45 + <!--导出excel-->
  46 + <!--</a>-->
  47 + <!--</li>-->
  48 + <!--</ul>-->
  49 + <!--</div>-->
50 50 </div>
51 51 </div>
52 52  
... ...
src/main/resources/static/pages/scheduleApp/module/basicInfo/employeeInfoManage/list.html
  View file @e90ff7d
... ... @@ -4,9 +4,9 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 5%;">序号</th>
8   - <th >姓名</th>
9   - <th >工号</th>
  7 + <th style="width: 50px;">序号</th>
  8 + <th style="width: 130px;">姓名</th>
  9 + <th style="width: 130px;">工号</th>
10 10 <th style="width: 5%;">性别</th>
11 11 <th style="width: 15%;">所在公司</th>
12 12 <th >分公司</th>
... ... @@ -17,10 +17,10 @@
17 17 <td>
18 18 </td>
19 19 <td>
20   - <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like"/>
  20 + <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().personnelName_like" placeholder="输入姓名..."/>
21 21 </td>
22 22 <td>
23   - <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like"/>
  23 + <input type="text" class="form-control input-sm" ng-model="ctrl.searchCondition().jobCode_like" placeholder="输入工号..."/>
24 24 </td>
25 25 <td>
26 26 </td>
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/edit.html
  View file @e90ff7d
... ... @@ -43,17 +43,18 @@
43 43 <div class="form-group has-success has-feedback">
44 44 <label class="col-md-2 control-label">线路*：</label>
45 45 <div class="col-md-3">
46   - <sa-Select3 model="ctrl.busConfigForSave"
47   - name="xl"
48   - placeholder="请输拼音..."
49   - dcvalue="{{ctrl.busConfigForSave.xl.id}}"
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.busConfigForSave"
  48 + cmaps="{'xl.id': 'id'}"
50 49 dcname="xl.id"
51 50 icname="id"
52   - icnames="name"
53   - datatype="xl"
54   - mlp="true"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
55 56 required >
56   - </sa-Select3>
  57 + </sa-Select5>
57 58 </div>
58 59 <!-- 隐藏块，显示验证信息 -->
59 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/form.html
  View file @e90ff7d
... ... @@ -43,19 +43,18 @@
43 43 <div class="form-group has-success has-feedback">
44 44 <label class="col-md-2 control-label">线路*：</label>
45 45 <div class="col-md-3">
46   - <sa-Select3 model="ctrl.busConfigForSave"
47   - name="xl"
48   - placeholder="请输拼音..."
49   - dcvalue="{{ctrl.busConfigForSave.xl.id}}"
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.busConfigForSave"
  48 + cmaps="{'xl.id': 'id'}"
50 49 dcname="xl.id"
51 50 icname="id"
52   - dcname2="xl.company"
53   - icname2="company"
54   - icnames="name"
55   - datatype="xl"
56   - mlp="true"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
57 56 required >
58   - </sa-Select3>
  57 + </sa-Select5>
59 58 </div>
60 59 <!-- 隐藏块，显示验证信息 -->
61 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/index.html
  View file @e90ff7d
... ... @@ -45,19 +45,19 @@
45 45 导入excel
46 46 </a>
47 47 </li>
48   - <li>
49   - <a href="javascript:" class="tool-action">
50   - <i class="fa fa-file-excel-o"></i>
51   - 导出excel
52   - </a>
53   - </li>
54   - <li class="divider"></li>
55   - <li>
56   - <a href="javascript:" class="tool-action">
57   - <i class="fa fa-download"></i>
58   - excel模版
59   - </a>
60   - </li>
  48 + <!--<li>-->
  49 + <!--<a href="javascript:" class="tool-action">-->
  50 + <!--<i class="fa fa-file-excel-o"></i>-->
  51 + <!--导出excel-->
  52 + <!--</a>-->
  53 + <!--</li>-->
  54 + <!--<li class="divider"></li>-->
  55 + <!--<li>-->
  56 + <!--<a href="javascript:" class="tool-action">-->
  57 + <!--<i class="fa fa-download"></i>-->
  58 + <!--excel模版-->
  59 + <!--</a>-->
  60 + <!--</li>-->
61 61 </ul>
62 62 </div>
63 63 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/busConfig/list.html
  View file @e90ff7d
... ... @@ -4,11 +4,11 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 5%;">序号</th>
8   - <th style="width: 15%;">线路</th>
9   - <th >内部编号</th>
10   - <th >启用日期</th>
11   - <th >终止日期</th>
  7 + <th style="width: 50px;">序号</th>
  8 + <th style="width: 150px;">线路</th>
  9 + <th style="width: 150px;">内部编号</th>
  10 + <th style="width: 150px;">启用日期</th>
  11 + <th style="width: 150px;">终止日期</th>
12 12 <th >停车点</th>
13 13 <th style="width: 21%">操作</th>
14 14 </tr>
... ... @@ -58,10 +58,10 @@
58 58 <span ng-bind="info.cl.insideCode"></span>
59 59 </td>
60 60 <td>
61   - <span ng-bind="info.qyrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  61 + <span ng-bind="info.qyrq | date: 'yyyy-MM-dd'"></span>
62 62 </td>
63 63 <td>
64   - <span ng-bind="info.zzrq | date: 'yyyy-MM-dd HH:mm:ss'"></span>
  64 + <span ng-bind="info.zzrq | date: 'yyyy-MM-dd'"></span>
65 65 </td>
66 66 <td>
67 67 <span ng-bind="info.tcd"></span>
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
  View file @e90ff7d
... ... @@ -43,17 +43,18 @@
43 43 <div class="form-group has-success has-feedback">
44 44 <label class="col-md-2 control-label">线路*：</label>
45 45 <div class="col-md-3">
46   - <sa-Select3 model="ctrl.employeeConfigForSave"
47   - name="xl"
48   - placeholder="请输拼音..."
49   - dcvalue="{{ctrl.employeeConfigForSave.xl.id}}"
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.employeeConfigForSave"
  48 + cmaps="{'xl.id' : 'id'}"
50 49 dcname="xl.id"
51 50 icname="id"
52   - icnames="name"
53   - datatype="xl"
54   - mlp="true"
  51 + dsparams="{{ {type: 'ajax', param:{'type': 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
55 56 required >
56   - </sa-Select3>
  57 + </sa-Select5>
57 58 </div>
58 59 <!-- 隐藏块，显示验证信息 -->
59 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/employeeConfig.js
  View file @e90ff7d
... ... @@ -279,6 +279,10 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;EmployeeConfigFormCtrl&#39;, [&#39;EmployeeCon
279 279 self.employeeConfigForSave[key] = result[key];
280 280 }
281 281  
  282 + if (!self.employeeConfigForSave.spy) {
  283 + self.employeeConfigForSave.spy = {};
  284 + }
  285 +
282 286 },
283 287 function(result) {
284 288 alert("出错啦！");
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html
  View file @e90ff7d
... ... @@ -43,19 +43,18 @@
43 43 <div class="form-group has-success has-feedback">
44 44 <label class="col-md-2 control-label">线路*：</label>
45 45 <div class="col-md-3">
46   - <sa-Select3 model="ctrl.employeeConfigForSave"
47   - name="xl"
48   - placeholder="请输拼音..."
49   - dcvalue="{{ctrl.employeeConfigForSave.xl.id}}"
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.employeeConfigForSave"
  48 + cmaps="{'xl.id' : 'id'}"
50 49 dcname="xl.id"
51 50 icname="id"
52   - dcname2="xl.company"
53   - icname2="company"
54   - icnames="name"
55   - datatype="xl"
56   - mlp="true"
  51 + dsparams="{{ {type: 'ajax', param:{'type': 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
57 56 required >
58   - </sa-Select3>
  57 + </sa-Select5>
59 58 </div>
60 59 <!-- 隐藏块，显示验证信息 -->
61 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/index.html
  View file @e90ff7d
... ... @@ -45,19 +45,19 @@
45 45 导入excel
46 46 </a>
47 47 </li>
48   - <li>
49   - <a href="javascript:" class="tool-action">
50   - <i class="fa fa-file-excel-o"></i>
51   - 导出excel
52   - </a>
53   - </li>
54   - <li class="divider"></li>
55   - <li>
56   - <a href="javascript:" class="tool-action">
57   - <i class="fa fa-download"></i>
58   - excel模版
59   - </a>
60   - </li>
  48 + <!--<li>-->
  49 + <!--<a href="javascript:" class="tool-action">-->
  50 + <!--<i class="fa fa-file-excel-o"></i>-->
  51 + <!--导出excel-->
  52 + <!--</a>-->
  53 + <!--</li>-->
  54 + <!--<li class="divider"></li>-->
  55 + <!--<li>-->
  56 + <!--<a href="javascript:" class="tool-action">-->
  57 + <!--<i class="fa fa-download"></i>-->
  58 + <!--excel模版-->
  59 + <!--</a>-->
  60 + <!--</li>-->
61 61 </ul>
62 62 </div>
63 63 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/list.html
  View file @e90ff7d
... ... @@ -4,9 +4,9 @@
4 4 <table class="fixTable table table-striped table-bordered table-hover table-checkable order-column">
5 5 <thead>
6 6 <tr role="row" class="heading">
7   - <th style="width: 5%;">序号</th>
8   - <th style="width: 15%;">线路</th>
9   - <th style="width: 10%;">搭班编码</th>
  7 + <th style="width: 50px;">序号</th>
  8 + <th style="width: 150px;">线路</th>
  9 + <th style="width: 80px;">搭班编码</th>
10 10 <th >驾驶员工号</th>
11 11 <th style="width: 15%;">驾驶员</th>
12 12 <th >售票员工号</th>
... ...
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/index.html
  View file @e90ff7d
... ... @@ -45,19 +45,19 @@
45 45 导入excel
46 46 </a>
47 47 </li>
48   - <li>
49   - <a href="javascript:" class="tool-action">
50   - <i class="fa fa-file-excel-o"></i>
51   - 导出excel
52   - </a>
53   - </li>
54   - <li class="divider"></li>
55   - <li>
56   - <a href="javascript:" class="tool-action">
57   - <i class="fa fa-download"></i>
58   - excel模版
59   - </a>
60   - </li>
  48 + <!--<li>-->
  49 + <!--<a href="javascript:" class="tool-action">-->
  50 + <!--<i class="fa fa-file-excel-o"></i>-->
  51 + <!--导出excel-->
  52 + <!--</a>-->
  53 + <!--</li>-->
  54 + <!--<li class="divider"></li>-->
  55 + <!--<li>-->
  56 + <!--<a href="javascript:" class="tool-action">-->
  57 + <!--<i class="fa fa-download"></i>-->
  58 + <!--excel模版-->
  59 + <!--</a>-->
  60 + <!--</li>-->
61 61 </ul>
62 62 </div>
63 63 </div>
... ...
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/list.html
  View file @e90ff7d
... ... @@ -60,7 +60,7 @@
60 60 <td>
61 61 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
62 62 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
63   - <a ui-sref="guideboardManage_detail({id : info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
  63 + <a ui-sref="guideboardManage_detail({id : info.id})" class="btn btn-info btn-sm"> 详细 </a>
64 64 <!--<a ui-sref="#" class="btn default blue-stripe btn-sm"> 修改 </a>-->
65 65 </td>
66 66 </tr>
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/edit.html
  View file @e90ff7d
... ... @@ -48,7 +48,7 @@
48 48 cmaps="{'rerunXl.id' : 'id'}"
49 49 dcname="rerunXl.id"
50 50 icname="id"
51   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
52 52 iterobjname="item"
53 53 iterobjexp="item.name"
54 54 searchph="请输拼音..."
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/form.html
  View file @e90ff7d
... ... @@ -48,7 +48,7 @@
48 48 cmaps="{'rerunXl.id' : 'id'}"
49 49 dcname="rerunXl.id"
50 50 icname="id"
51   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
52 52 iterobjname="item"
53 53 iterobjexp="item.name"
54 54 searchph="请输拼音..."
... ...
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/index.html
  View file @e90ff7d
... ... @@ -32,34 +32,34 @@
32 32 添加套跑
33 33 </a>
34 34  
35   - <div class="btn-group">
36   - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37   - <i class="fa fa-share"></i>
38   - <span>数据工具</span>
39   - <i class="fa fa-angle-down"></i>
40   - </a>
41   - <ul class="dropdown-menu pull-right">
42   - <li>
43   - <a href="javascript:" class="tool-action">
44   - <i class="fa fa-file-excel-o"></i>
45   - 导入excel
46   - </a>
47   - </li>
48   - <li>
49   - <a href="javascript:" class="tool-action">
50   - <i class="fa fa-file-excel-o"></i>
51   - 导出excel
52   - </a>
53   - </li>
54   - <li class="divider"></li>
55   - <li>
56   - <a href="javascript:" class="tool-action">
57   - <i class="fa fa-refresh"></i>
58   - 刷行数据
59   - </a>
60   - </li>
61   - </ul>
62   - </div>
  35 + <!--<div class="btn-group">-->
  36 + <!--<a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">-->
  37 + <!--<i class="fa fa-share"></i>-->
  38 + <!--<span>数据工具</span>-->
  39 + <!--<i class="fa fa-angle-down"></i>-->
  40 + <!--</a>-->
  41 + <!--<ul class="dropdown-menu pull-right">-->
  42 + <!--<li>-->
  43 + <!--<a href="javascript:" class="tool-action">-->
  44 + <!--<i class="fa fa-file-excel-o"></i>-->
  45 + <!--导入excel-->
  46 + <!--</a>-->
  47 + <!--</li>-->
  48 + <!--<li>-->
  49 + <!--<a href="javascript:" class="tool-action">-->
  50 + <!--<i class="fa fa-file-excel-o"></i>-->
  51 + <!--导出excel-->
  52 + <!--</a>-->
  53 + <!--</li>-->
  54 + <!--<li class="divider"></li>-->
  55 + <!--<li>-->
  56 + <!--<a href="javascript:" class="tool-action">-->
  57 + <!--<i class="fa fa-refresh"></i>-->
  58 + <!--刷行数据-->
  59 + <!--</a>-->
  60 + <!--</li>-->
  61 + <!--</ul>-->
  62 + <!--</div>-->
63 63 </div>
64 64 </div>
65 65  
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/index_report.html
  View file @e90ff7d
... ... @@ -26,30 +26,30 @@
26 26 <i class="fa fa-database font-dark"></i>
27 27 <span class="caption-subject bold uppercase">排班计划</span>
28 28 </div>
29   - <div class="actions">
30   - <div class="btn-group">
31   - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
32   - <i class="fa fa-share"></i>
33   - <span>数据工具</span>
34   - <i class="fa fa-angle-down"></i>
35   - </a>
36   - <ul class="dropdown-menu pull-right">
37   - <li>
38   - <a href="javascript:" class="tool-action">
39   - <i class="fa fa-file-excel-o"></i>
40   - 导出excel
41   - </a>
42   - </li>
43   - <li class="divider"></li>
44   - <li>
45   - <a href="javascript:" class="tool-action">
46   - <i class="fa fa-refresh"></i>
47   - 刷行数据
48   - </a>
49   - </li>
50   - </ul>
51   - </div>
52   - </div>
  29 + <!--<div class="actions">-->
  30 + <!--<div class="btn-group">-->
  31 + <!--<a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">-->
  32 + <!--<i class="fa fa-share"></i>-->
  33 + <!--<span>数据工具</span>-->
  34 + <!--<i class="fa fa-angle-down"></i>-->
  35 + <!--</a>-->
  36 + <!--<ul class="dropdown-menu pull-right">-->
  37 + <!--<li>-->
  38 + <!--<a href="javascript:" class="tool-action">-->
  39 + <!--<i class="fa fa-file-excel-o"></i>-->
  40 + <!--导出excel-->
  41 + <!--</a>-->
  42 + <!--</li>-->
  43 + <!--<li class="divider"></li>-->
  44 + <!--<li>-->
  45 + <!--<a href="javascript:" class="tool-action">-->
  46 + <!--<i class="fa fa-refresh"></i>-->
  47 + <!--刷行数据-->
  48 + <!--</a>-->
  49 + <!--</li>-->
  50 + <!--</ul>-->
  51 + <!--</div>-->
  52 + <!--</div>-->
53 53 </div>
54 54  
55 55 <div class="portlet-body">
... ...
src/main/resources/static/pages/scheduleApp/module/core/schedulePlanManage/list.html
  View file @e90ff7d
... ... @@ -78,7 +78,7 @@
78 78 <span ng-bind="info.xl.name"></span>
79 79 </td>
80 80 <td>
81   - <span ng-bind="info.ttInfo.name"></span>
  81 + <span ng-bind="info.ttInfoNames"></span>
82 82 </td>
83 83 <td>
84 84 <span ng-bind="info.scheduleFromTime | date: 'yyyy-MM-dd '"></span>
... ... @@ -92,7 +92,7 @@
92 92 <td>
93 93 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
94 94 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
95   - <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfo.name, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
  95 + <a ui-sref="schedulePlanInfoManage({spid : info.id, xlname : info.xl.name, ttname : info.ttInfoNames, stime : info.scheduleFromTime, etime : info.scheduleToTime})"
96 96 class="btn btn-info btn-sm"> 明细 </a>
97 97 <a ng-click="ctrl.deletePlan(info.id)"
98 98 class="btn btn-danger btn-sm"> 删除 </a>
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/edit.html
  View file @e90ff7d
... ... @@ -43,17 +43,18 @@
43 43 <div class="form-group has-success has-feedback">
44 44 <label class="col-md-2 control-label">线路*：</label>
45 45 <div class="col-md-3">
46   - <sa-Select3 model="ctrl.scheduleRuleManageForSave"
47   - name="xl"
48   - placeholder="请输拼音..."
49   - dcvalue="{{ctrl.scheduleRuleManageForSave.xl.id}}"
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.scheduleRuleManageForSave"
  48 + cmaps="{'xl.id' : 'id'}"
50 49 dcname="xl.id"
51 50 icname="id"
52   - icnames="name"
53   - datatype="xl"
54   - mlp="true"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
55 56 required >
56   - </sa-Select3>
  57 + </sa-Select5>
57 58 </div>
58 59 <!-- 隐藏块，显示验证信息 -->
59 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
  View file @e90ff7d
... ... @@ -43,17 +43,18 @@
43 43 <div class="form-group has-success has-feedback">
44 44 <label class="col-md-2 control-label">线路*：</label>
45 45 <div class="col-md-3">
46   - <sa-Select3 model="ctrl.scheduleRuleManageForSave"
47   - name="xl"
48   - placeholder="请输拼音..."
49   - dcvalue="{{ctrl.scheduleRuleManageForSave.xl.id}}"
  46 + <sa-Select5 name="xl"
  47 + model="ctrl.scheduleRuleManageForSave"
  48 + cmaps="{'xl.id' : 'id'}"
50 49 dcname="xl.id"
51 50 icname="id"
52   - icnames="name"
53   - datatype="xl"
54   - mlp="true"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
  52 + iterobjname="item"
  53 + iterobjexp="item.name"
  54 + searchph="请输拼音..."
  55 + searchexp="this.name"
55 56 required >
56   - </sa-Select3>
  57 + </sa-Select5>
57 58 </div>
58 59 <!-- 隐藏块，显示验证信息 -->
59 60 <div class="alert alert-danger well-sm" ng-show="myForm.xl.$error.required">
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/index.html
  View file @e90ff7d
... ... @@ -32,34 +32,34 @@
32 32 添加规则
33 33 </a>
34 34  
35   - <div class="btn-group">
36   - <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
37   - <i class="fa fa-share"></i>
38   - <span>数据工具</span>
39   - <i class="fa fa-angle-down"></i>
40   - </a>
41   - <ul class="dropdown-menu pull-right">
42   - <li>
43   - <a href="javascript:" class="tool-action">
44   - <i class="fa fa-file-excel-o"></i>
45   - 规则类型
46   - </a>
47   - </li>
48   - <li>
49   - <a href="javascript:" class="tool-action">
50   - <i class="fa fa-file-excel-o"></i>
51   - 导出excel
52   - </a>
53   - </li>
54   - <li class="divider"></li>
55   - <li>
56   - <a href="javascript:" class="tool-action">
57   - <i class="fa fa-refresh"></i>
58   - 刷行数据
59   - </a>
60   - </li>
61   - </ul>
62   - </div>
  35 + <!--<div class="btn-group">-->
  36 + <!--<a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">-->
  37 + <!--<i class="fa fa-share"></i>-->
  38 + <!--<span>数据工具</span>-->
  39 + <!--<i class="fa fa-angle-down"></i>-->
  40 + <!--</a>-->
  41 + <!--<ul class="dropdown-menu pull-right">-->
  42 + <!--<li>-->
  43 + <!--<a href="javascript:" class="tool-action">-->
  44 + <!--<i class="fa fa-file-excel-o"></i>-->
  45 + <!--规则类型-->
  46 + <!--</a>-->
  47 + <!--</li>-->
  48 + <!--<li>-->
  49 + <!--<a href="javascript:" class="tool-action">-->
  50 + <!--<i class="fa fa-file-excel-o"></i>-->
  51 + <!--导出excel-->
  52 + <!--</a>-->
  53 + <!--</li>-->
  54 + <!--<li class="divider"></li>-->
  55 + <!--<li>-->
  56 + <!--<a href="javascript:" class="tool-action">-->
  57 + <!--<i class="fa fa-refresh"></i>-->
  58 + <!--刷行数据-->
  59 + <!--</a>-->
  60 + <!--</li>-->
  61 + <!--</ul>-->
  62 + <!--</div>-->
63 63 </div>
64 64 </div>
65 65  
... ...
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/list.html
  View file @e90ff7d
... ... @@ -83,9 +83,9 @@
83 83 <td>
84 84 <!--<a href="details.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 详细 </a>-->
85 85 <!--<a href="edit.html?lineId={{obj.id}}" class="btn default blue-stripe btn-sm"> 修改 </a>-->
86   - <a ui-sref="scheduleRuleManage_detail({id : info.id})" class="btn default blue-stripe btn-sm"> 详细 </a>
87   - <a ui-sref="scheduleRuleManage_edit({id : info.id})" class="btn default blue-stripe btn-sm"> 修改 </a>
88   - <a ng-click="ctrl.deleteRule(info.id)" class="btn default blue-stripe btn-sm"> 删除 </a>
  86 + <a ui-sref="scheduleRuleManage_detail({id : info.id})" class="btn btn-info btn-sm"> 详细 </a>
  87 + <a ui-sref="scheduleRuleManage_edit({id : info.id})" class="btn btn-info btn-sm"> 修改 </a>
  88 + <a ng-click="ctrl.deleteRule(info.id)" class="btn btn-danger btn-sm"> 删除 </a>
89 89 </td>
90 90 </tr>
91 91 </tbody>
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/edit.html
  View file @e90ff7d
... ... @@ -48,7 +48,7 @@
48 48 cmaps="{'xl.id' : 'id'}"
49 49 dcname="xl.id"
50 50 icname="id"
51   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
52 52 iterobjname="item"
53 53 iterobjexp="item.name"
54 54 searchph="请输拼音..."
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/form.html
  View file @e90ff7d
... ... @@ -48,7 +48,7 @@
48 48 cmaps="{'xl.id' : 'id'}"
49 49 dcname="xl.id"
50 50 icname="id"
51   - dsparams="{{ {type: 'ajax', param:{type: 'all'}, atype:'xl' } | json }}"
  51 + dsparams="{{ {type: 'ajax', param:{type: 'all', 'destroy_eq': 0}, atype:'xl' } | json }}"
52 52 iterobjname="item"
53 53 iterobjexp="item.name"
54 54 searchph="请输拼音..."
... ...