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

娄高锋
2 parents eb21128f 411554d0
Showing 4 changed files with 43 additions and 25 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
@@ -100,4 +100,9 @@ public class anomalyCheckController {
     public void reCalcLpSch(){
         dayOfSchedule._test_reCalcLpSch();
     }
+
+    @RequestMapping(value = "/findSchByLpName")
+    public List<ScheduleRealInfo> findSchByLpName(String lpName){
+        return dayOfSchedule.getLpScheduleMap().get(lpName);
+    }
 }
-<style>
-.form-control:focus {
-    border-color: #53ced9;
-}
-.tagsDiv {
-    border: 1px solid #c2cad8;
-    margin-left: 15px;
-    padding: 4px 15px 4px 15px;
-    width: 50%;
-}
+<style>
+.form-control:focus {
+    border-color: #53ced9;
+}
+.tagsDiv {
+    border: 1px solid #c2cad8;
+    margin-left: 15px;
+    padding: 4px 15px 4px 15px;
+    width: 50%;
+}
 </style>
 <!-- 片段标题 START -->
 <div class="page-head">
@@ -20,6 +20,10 @@
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
+    <li>
+        <a href="/#/ttInfoManage">时刻表管理</a>
+        <i class="fa fa-circle"></i>
+    </li>
 	<li><span class="active">时刻表明细制作建模</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
@@ -32,9 +36,9 @@
 			</span>
 		</div>
-		<div class="actions">
-			<div class="btn-group btn-group-devided" data-toggle="buttons">
-				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
+		<div class="actions">
+			<div class="btn-group btn-group-devided" data-toggle="buttons">
+				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
 			</div>
 			<div class="btn-group btn-group-devided" data-toggle="buttons">
 				<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 @@
         </form>
 		<!-- END FORM-->
 	</div>
-</div>
+</div>
 <script src="/pages/base/timesmodel/js/add-form-wizard.js"></script>
-<script src="/pages/base/timesmodel/js/add-form-reload.js"></script>
+<script src="/pages/base/timesmodel/js/add-form-reload.js"></script>
 <script src="/pages/base/timesmodel/js/tagsinput.js"></script>
 \ No newline at end of file
@@ -13,6 +13,10 @@
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">运营计划管理</span> <i class="fa fa-circle"></i></li>
+    <li>
+        <a href="/#/ttInfoManage">时刻表管理</a>
+        <i class="fa fa-circle"></i>
+    </li>
 	<li><span class="active">时刻表明细模型</span></li>
 </ul>
 <!-- 线路信息导航栏组件 END -->
@@ -824,10 +824,12 @@ var BaseFun = function() {
 				var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
 				// return {'json':tempA,'bxrcgs':null};
 				// 第七步 确定吃饭时间.
-				baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
+                if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
+                    baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
+                }
 				baseF.resizeByPitStopTime(cara , tempA , dataMap);
 				baseF.updfcno01(tempA,0);
-				// return {'json':tempA,'bxrcgs':null};
+                //return {'json':tempA,'bxrcgs':null};
 				// 确定进出场、早晚例保时间.并返回班次数组集合
 				return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
 			},
@@ -862,22 +864,25 @@ var BaseFun = function() {
 				var canCf = new Array(), countTzsj = 0, isLast = new Array();
 				for(var b = 0 ; b<bcArray.length;b++) {
 					var bcddsj = baseF.getDateTime(bcArray[b].ARRIVALTIME);
-					if(bcddsj<=jssj) {
+					//if(bcddsj<=jssj) {
+					//	countTzsj += bcArray[b].STOPTIME;
+					//	canCf.push(bcArray[b]);
+					//}
+					if(bcddsj>= kssj && bcddsj<=jssj) { // NEW，使用开始时间，结束时间限定可以吃饭的班次
 						countTzsj += bcArray[b].STOPTIME;
 						canCf.push(bcArray[b]);
 					}
-					/*if(bcddsj>= kssj && bcddsj<=jssj) {
-						countTzsj += bcArray[b].STOPTIME;
-						canCf.push(bcArray[b]);
-					}
-					if(bcddsj < kssj)
-						isLast.push(bcArray[b]);*/
+					//if(bcddsj < kssj)
+					//	isLast.push(bcArray[b]);
 				}
 				if(canCf.length>0) {
 					console.log('countTzsj:' + countTzsj + 'length:' + canCf.length);
 					var fxDm = baseF.dirDmToIndex(canCf[canCf.length-1].xlDir);
+                    if (map.cfdd == "allYes") { // NEW，如果选择的吃饭地点是所有，则使用班次的方向作为吃饭班次的方向
+                        cfddDm = fxDm;
+                    }
 					// console.log(countTzsj , canCf[canCf.length-1].fcsj);
-					if(cfddDm == fxDm && canCf.length>2) {
+					if(canCf.length>2) {
 						var tzdx = canCf[canCf.length-2].STOPTIME - dataMap.zwcArr[cfIndex];
 						canCf[canCf.length-2].STOPTIME = tzdx >= 0 ? tzdx : 0;
 						var obj = baseF.getbcObj(