潘钊 / bsth_control · Commits

Commit 1b849a09a7633425cb7d83212b65bae6ce2594bb

Authored by 徐烜
2 parents 5ac5c763 e90ff7d6
build: skipped

Merge branch 'PSM-12' into minhang

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