潘钊 / bsth_control · Commits

Commit f7699dc0738c62338590d0aca068281fb3bebdaa

Authored by 娄高锋
2 parents eb21128f 411554d0
build: skipped

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into minhang

Inline Side-by-side
Showing 4 changed files with 43 additions and 25 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
  View file @f7699dc
... ... @@ -100,4 +100,9 @@ public class anomalyCheckController {
100 100 public void reCalcLpSch(){
101 101 dayOfSchedule._test_reCalcLpSch();
102 102 }
  103 +
  104 + @RequestMapping(value = "/findSchByLpName")
  105 + public List<ScheduleRealInfo> findSchByLpName(String lpName){
  106 + return dayOfSchedule.getLpScheduleMap().get(lpName);
  107 + }
103 108 }
... ...
src/main/resources/static/pages/base/timesmodel/add.html
  View file @f7699dc
1   -<style>
2   -.form-control:focus {
3   - border-color: #53ced9;
4   -}
5   -.tagsDiv {
6   - border: 1px solid #c2cad8;
7   - margin-left: 15px;
8   - padding: 4px 15px 4px 15px;
9   - width: 50%;
10   -}
  1 +<style>
  2 +.form-control:focus {
  3 + border-color: #53ced9;
  4 +}
  5 +.tagsDiv {
  6 + border: 1px solid #c2cad8;
  7 + margin-left: 15px;
  8 + padding: 4px 15px 4px 15px;
  9 + width: 50%;
  10 +}
11 11 </style>
12 12 <!-- 片段标题 START -->
13 13 <div class="page-head">
... ... @@ -20,6 +20,10 @@
20 20 <ul class="page-breadcrumb breadcrumb">
21 21 <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
22 22 <li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
  23 + <li>
  24 + <a href="/#/ttInfoManage">时刻表管理</a>
  25 + <i class="fa fa-circle"></i>
  26 + </li>
23 27 <li><span class="active">时刻表明细制作建模</span></li>
24 28 </ul>
25 29 <!-- 线路信息导航栏组件 END -->
... ... @@ -32,9 +36,9 @@
32 36 </span>
33 37 </div>
34 38  
35   - <div class="actions">
36   - <div class="btn-group btn-group-devided" data-toggle="buttons">
37   - <a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
  39 + <div class="actions">
  40 + <div class="btn-group btn-group-devided" data-toggle="buttons">
  41 + <a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
38 42 </div>
39 43 <div class="btn-group btn-group-devided" data-toggle="buttons">
40 44 <a class="btn btn-circle default" href="/pages/base/timesmodel/index.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
... ... @@ -172,7 +176,7 @@
172 176 </form>
173 177 <!-- END FORM-->
174 178 </div>
175   -</div>
  179 +</div>
176 180 <script src="/pages/base/timesmodel/js/add-form-wizard.js"></script>
177   -<script src="/pages/base/timesmodel/js/add-form-reload.js"></script>
  181 +<script src="/pages/base/timesmodel/js/add-form-reload.js"></script>
178 182 <script src="/pages/base/timesmodel/js/tagsinput.js"></script>
179 183 \ No newline at end of file
... ...
src/main/resources/static/pages/base/timesmodel/gantt.html
  View file @f7699dc
... ... @@ -13,6 +13,10 @@
13 13 <ul class="page-breadcrumb breadcrumb">
14 14 <li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
15 15 <li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
  16 + <li>
  17 + <a href="/#/ttInfoManage">时刻表管理</a>
  18 + <i class="fa fa-circle"></i>
  19 + </li>
16 20 <li><span class="active">时刻表明细模型</span></li>
17 21 </ul>
18 22 <!-- 线路信息导航栏组件 END -->
... ...
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
  View file @f7699dc
... ... @@ -824,10 +824,12 @@ var BaseFun = function() {
824 824 var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
825 825 // return {'json':tempA,'bxrcgs':null};
826 826 // 第七步 确定吃饭时间.
827   - baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
  827 + if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
  828 + baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
  829 + }
828 830 baseF.resizeByPitStopTime(cara , tempA , dataMap);
829 831 baseF.updfcno01(tempA,0);
830   - // return {'json':tempA,'bxrcgs':null};
  832 + //return {'json':tempA,'bxrcgs':null};
831 833 // 确定进出场、早晚例保时间.并返回班次数组集合
832 834 return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
833 835 },
... ... @@ -862,22 +864,25 @@ var BaseFun = function() {
862 864 var canCf = new Array(), countTzsj = 0, isLast = new Array();
863 865 for(var b = 0 ; b<bcArray.length;b++) {
864 866 var bcddsj = baseF.getDateTime(bcArray[b].ARRIVALTIME);
865   - if(bcddsj<=jssj) {
  867 + //if(bcddsj<=jssj) {
  868 + // countTzsj += bcArray[b].STOPTIME;
  869 + // canCf.push(bcArray[b]);
  870 + //}
  871 + if(bcddsj>= kssj && bcddsj<=jssj) { // NEW，使用开始时间，结束时间限定可以吃饭的班次
866 872 countTzsj += bcArray[b].STOPTIME;
867 873 canCf.push(bcArray[b]);
868 874 }
869   - /*if(bcddsj>= kssj && bcddsj<=jssj) {
870   - countTzsj += bcArray[b].STOPTIME;
871   - canCf.push(bcArray[b]);
872   - }
873   - if(bcddsj < kssj)
874   - isLast.push(bcArray[b]);*/
  875 + //if(bcddsj < kssj)
  876 + // isLast.push(bcArray[b]);
875 877 }
876 878 if(canCf.length>0) {
877 879 console.log('countTzsj:' + countTzsj + 'length:' + canCf.length);
878 880 var fxDm = baseF.dirDmToIndex(canCf[canCf.length-1].xlDir);
  881 + if (map.cfdd == "allYes") { // NEW，如果选择的吃饭地点是所有，则使用班次的方向作为吃饭班次的方向
  882 + cfddDm = fxDm;
  883 + }
879 884 // console.log(countTzsj , canCf[canCf.length-1].fcsj);
880   - if(cfddDm == fxDm && canCf.length>2) {
  885 + if(canCf.length>2) {
881 886 var tzdx = canCf[canCf.length-2].STOPTIME - dataMap.zwcArr[cfIndex];
882 887 canCf[canCf.length-2].STOPTIME = tzdx >= 0 ? tzdx : 0;
883 888 var obj = baseF.getbcObj(
... ...