调人调车

潘钊
1 parent 45b6d31f
Showing 14 changed files with 420 additions and 546 deletions
src/main/java/com/bsth/entity/realcontrol/ChildTaskPlan.java
src/main/java/com/bsth/repository/realcontrol/ChildTaskPlanRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/vehicle/common/CommonMapped.java
src/main/java/com/bsth/vehicle/common/CommonRefreshThread.java
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/child_pages/js/child_task.js
src/main/resources/static/pages/control/line/child_pages/temporary_add.html
src/main/resources/static/pages/control/line/child_pages/vehicAndper_adjust.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/temps/child_task_case_tp.html
 package com.bsth.entity.realcontrol;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.NamedAttributeNode;
+import javax.persistence.NamedEntityGraph;
+import javax.persistence.NamedEntityGraphs;
 import javax.persistence.Table;
 /**
@@ -16,6 +20,11 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "bsth_c_s_child_task")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "childTaskPlan_schedule", attributeNodes = {
+            @NamedAttributeNode("schedule")
+    })
+})
 public class ChildTaskPlan {
 	@Id
@@ -37,11 +46,21 @@ public class ChildTaskPlan {
 	 * 起点
 	 */
 	private String startStation;
-
+	
+	/**
+	 * 起点站名称
+	 */
+	private String startStationName;
+	
 	/**
 	 * 终点
 	 */
 	private String endStation;
+	
+	/**
+	 * 终点站名称
+	 */
+	private String endStationName;
 	/**
 	 * 里程类型
@@ -76,7 +95,7 @@ public class ChildTaskPlan {
 	/**
 	 * 主排班计划
 	 */
-	@ManyToOne
+	@ManyToOne(fetch = FetchType.LAZY)
 	private ScheduleRealInfo schedule;
 	private String remarks;
@@ -184,4 +203,21 @@ public class ChildTaskPlan {
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
 	}
+
+	public String getStartStationName() {
+		return startStationName;
+	}
+
+	public void setStartStationName(String startStationName) {
+		this.startStationName = startStationName;
+	}
+
+	public String getEndStationName() {
+		return endStationName;
+	}
+
+	public void setEndStationName(String endStationName) {
+		this.endStationName = endStationName;
+	}
+	
 }
 package com.bsth.repository.realcontrol;
+import java.util.List;
+
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.stereotype.Repository;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -8,4 +12,7 @@ import com.bsth.repository.BaseRepository;
 @Repository
 public interface ChildTaskPlanRepository extends BaseRepository<ChildTaskPlan, Long>{
+	@EntityGraph(value = "childTaskPlan_schedule", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    List<ChildTaskPlan> findAll(Specification<ChildTaskPlan> spec);
 }
@@ -2,6 +2,10 @@ package com.bsth.repository.realcontrol;
 import java.util.List;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
@@ -14,5 +18,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query("select s from ScheduleRealInfo s where s.xlBm in ?1")
 	List<ScheduleRealInfo> findByLines(List<String> lines);
-	
+	@EntityGraph(value = "scheduleRealInfo_childTasks", type = EntityGraph.EntityGraphType.FETCH)
+    @Override
+    Page<ScheduleRealInfo> findAll(Specification<ScheduleRealInfo> spec, Pageable pageable);
 }
 package com.bsth.service.realcontrol.impl;
+import java.util.Map;
+
 import org.springframework.stereotype.Service;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ChildTaskPlanService;
+import com.bsth.vehicle.common.CommonMapped;
 @Service
 public class ChildTaskPlanServiceImpl extends BaseServiceImpl<ChildTaskPlan, Long> implements ChildTaskPlanService{
+	@Override
+	public Map<String, Object> save(ChildTaskPlan t) {
+		//保存起终点名称
+		Map<String, String> map = CommonMapped.stationCodeMap;
+		
+		t.setStartStationName(map.get(t.getStartStation()));
+		t.setEndStationName(map.get(t.getEndStation()));
+		return super.save(t);
+	}
+	
 }
@@ -35,7 +35,7 @@ public class CommonMapped {
 	public static Map<String , String> vehicCompanyMap;
 	/**
-	 * 站点和编码对照
+	 * 站点编码和名称对照，包括停车场
 	 *（K: 站点编码 ，V：站点名称）
 	 */
 	public static Map<String, String> stationCodeMap;
@@ -9,8 +9,10 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import com.bsth.entity.CarPark;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Station;
+import com.bsth.repository.CarParkRepository;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.StationRepository;
 import com.google.common.collect.BiMap;
@@ -33,6 +35,9 @@ public class CommonRefreshThread extends Thread{
 	@Autowired
 	StationRepository stationRepository;
+	@Autowired
+	CarParkRepository carParkRepository;
+	
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
@@ -74,12 +79,19 @@ public class CommonRefreshThread extends Thread{
 	public void initStationCodeMap(){
 		Map<String, String> newMap = new HashMap<>();
 		Iterator<Station> iterator = stationRepository.findAll().iterator();
-		
+		//站点
 		Station station;
 		while(iterator.hasNext()){
 			station = iterator.next();
 			newMap.put(station.getStationCod(), station.getStationName());
 		}
+		//停车场
+		Iterator<CarPark> iterator2 = carParkRepository.findAll().iterator();
+		CarPark carPark;
+		while(iterator2.hasNext()){
+			carPark = iterator2.next();
+			newMap.put(carPark.getParkCode(), carPark.getParkName());
+		}
 		CommonMapped.stationCodeMap = newMap;
 	}
@@ -77,78 +77,8 @@
 		 </div>
 		 </div>
 		 <div class="custom-table-body" style="min-width: 800px;">
-			<table class="table table-bordered table-advance" >
+			<table class="table table-bordered table-advance subTable table-striped" >
 				<tbody>
-					<tr>
-						<td width="6%">1</td>
-						<td width="11%"></td>
-						<td width="16%"></td>
-						<td width="16%"></td>
-						<td width="10%"></td>
-						<td width="10%"></td>
-						<td width="7%"></td>
-						<td width="11%"></td>
-					</tr>
-					<tr>
-						<td width="6%">2</td>
-						<td width="11%"></td>
-						<td width="16%"></td>
-						<td width="16%"></td>
-						<td width="10%"></td>
-						<td width="10%"></td>
-						<td width="7%"></td>
-						<td width="11%"></td>
-					</tr>
-					<tr>
-						<td width="6%">3</td>
-						<td width="11%"></td>
-						<td width="16%"></td>
-						<td width="16%"></td>
-						<td width="10%"></td>
-						<td width="10%"></td>
-						<td width="7%"></td>
-						<td width="11%"></td>
-					</tr>
-					<tr>
-						<td width="6%">4</td>
-						<td width="11%"></td>
-						<td width="16%"></td>
-						<td width="16%"></td>
-						<td width="10%"></td>
-						<td width="10%"></td>
-						<td width="7%"></td>
-						<td width="11%"></td>
-					</tr>
-					<tr>
-						<td width="6%">5</td>
-						<td width="11%"></td>
-						<td width="16%"></td>
-						<td width="16%"></td>
-						<td width="10%"></td>
-						<td width="10%"></td>
-						<td width="7%"></td>
-						<td width="11%"></td>
-					</tr>
-					<tr>
-						<td width="6%">6</td>
-						<td width="11%"></td>
-						<td width="16%"></td>
-						<td width="16%"></td>
-						<td width="10%"></td>
-						<td width="10%"></td>
-						<td width="7%"></td>
-						<td width="11%"></td>
-					</tr>
-					<tr>
-						<td width="6%">7</td>
-						<td width="11%"></td>
-						<td width="16%"></td>
-						<td width="16%"></td>
-						<td width="10%"></td>
-						<td width="10%"></td>
-						<td width="7%"></td>
-						<td width="11%"></td>
-					</tr>
 				</tbody>
 			</table>
 			</div>
@@ -228,6 +158,10 @@ var parkSelect2Data = createParkSelect2Data(),
 var stationRoute;
 //标准信息
 var lineInformation;
+
+var $mainTab = $('.custom-table-body table.mainTable');
+
+var $subTab = $('.custom-table-body table.subTable');
 $(function(){
 	//var storage = window.localStorage;
 	var lineCodeMaps;
@@ -249,11 +183,9 @@ $(function(){
 		$header.css('top', top);
 	});
-	var $table = $('.custom-table-body table');
-	
 	//主任务点击事件
 	$('#childTaskDiv').on('click', '.mainTable tr', function(){
-		$table.find('tr._active').removeClass('_active');
+		$mainTab.find('tr._active').removeClass('_active');
 		$(this).addClass('_active');
 		//显示班次详细
@@ -265,6 +197,8 @@ $(function(){
 		var id = $(this).data('id');
 		childTaskBtn(scheduleIdMap[id].bcType);
+		
+		refreshChildTasks();
 	});
 	//子任务按钮
@@ -394,8 +328,21 @@ $(function(){
 		var htmlStr = template('child_task_main_table_temp', {list: schArray});
 		$('#childTaskDiv .mainTable tbody').html(htmlStr);
+		
+		//清空子任务列表
+		resetSubTanle();
+	}
+	
+	function resetSubTanle(){
+		$subTab.find('tbody').html('<tr><td class="no_check_main_task" colspan=8></td></tr>');
 	}
+	//删除子任务 
+	$('#childTaskDiv').on('click','.child_task_delete', function(){
+		var id = $(this).data('id');
+		removeConfirm('确定删除子任务？', '/childTask/' + id, refreshChildTasks);
+	});
+	
 	$('.childTaskBtns .custom-btn').on('click', function(){
 		var schedul = scheduleIdMap[$('.mainTable tr._active').data('id')];
@@ -523,4 +470,18 @@ $(function(){
 		}
 	}
 });
+
+//刷新子任务表格
+function refreshChildTasks(){
+	//主任务id
+	var id = $mainTab.find('tr._active').data('id');
+	
+	$.get('/childTask/all', {'schedule.id_eq': id}, function(rs){
+		var htmlStr = template('child_task_sub_table_temp', {list: rs});
+		
+		dictionaryUtils.transformDom(
+			$subTab.find('tbody').html(htmlStr).find('.nt-dictionary')
+		);
+	});
+}
 </script>
@@ -184,6 +184,9 @@ var childTaskCase = {
 		}
 		//相关选项事件绑定
 		function bindEvent(taskItem){
+			//字典下拉框
+			dictionaryUtils.transformDom($('.nt-dictionary', taskItem));
+			
 			var $reason = taskItem.find('.destroy-reason-wrap');
 			//里程类型下拉框
 			var mileageTypeSel = $('select[name=mileageType]', taskItem);
@@ -194,10 +197,10 @@ var childTaskCase = {
 			}).on('ifChanged', function(){
 				if(this.checked){
 					$reason.show();
-					mileageTypeSel.val('营运').attr('readonly', 'readonly');
+					mileageTypeSel.val('service').attr('readonly', 'readonly');
 					//隐藏结束时间
 					hideInput($('input[name=endDate]', taskItem));
-					changeBadge('烂班', taskItem);
+					changeBadge('destory', taskItem);
 				}
 				else{
 					mileageTypeSel.removeAttr('readonly').change();
@@ -211,17 +214,16 @@ var childTaskCase = {
 			$reason.find('select').on('change', function(){
 				globalRem.val(globalRem.val() + $(this).val() + '，');
 			});
+			
 			//里程类型
 			mileageTypeSel.on('change', function(){
 				//如果已烂班
 				if($('.icheck', taskItem)[0].checked)
 					return;
+				
 				changeBadge($(this).val(), taskItem);
 			});
-			//任务类型字典下拉框
-			dictionaryUtils.transformDom($('.nt-dictionary', taskItem));
-			
 			$('select[name=type2]', taskItem).on('change', function(){
 				var t = $(this).val();
@@ -280,13 +282,18 @@ var childTaskCase = {
 				,no = $('.no', badge)
 				,remClaszz = 'yinyun kongshi destroy', clazz;
-			if(t == '营运')
+			if(t == 'service'){
+				t = '营运'
 				clazz = 'yinyun';
-			else if(t == '空驶')
+			}
+			else if(t == 'empty'){
+				t = '空驶'
 				clazz = 'kongshi';
-			else if(t == '烂班')
+			}
+			else if(t == 'destory'){
+				t = '烂班';
 				clazz = 'destroy';
-			
+			}
 			$(badge).find('.text').remove();
 			if(!t){
 				clazz = 'yinyun';
@@ -332,6 +339,8 @@ function childTaskSubmit(fs, layerIndex){
 		layer.msg('子任务添加成功');
 		setTimeout(function(){
 			layer.close(layerIndex);
+			//刷新子任务列表
+			refreshChildTasks();
 		}, 700);
 	});
 }
-<!-- 临加班次 -->
-<div id="temporaryAddDiv">
-	<form action="#" class="form-horizontal form-custom">
-		<div class="form-body">
-			<div class="form-custom-row">
-				<div class="item" style="margin-top: 0">
-					<span class="item-label" style="width: 40px;">线路: </span> 
-					<select name="line" class="form-control lineSelect"></select>
-				</div>
-				&nbsp;&nbsp;
-				<div class="item" style="margin-top: 0">
-					<span class="item-label" style="width: 40px;">路牌: </span> 
-					<select name="foo" class="form-control LPSelect">
-					</select>
-					<i class="fa fa-plus add-icon" title="新增路牌"></i>
-				</div>
-			</div>
-		</div>
-	</form>
-
-	<div class="row" style="margin: 0">
-		<div class="col-md-12 ">
-			<div class="custom-table-title">班次</div>
-			<div class="custom-table-panel">
-				<div style="height: 36px; position: relative;">
-					<div class="custom-table-header">
-						<table class="table table-bordered table-advance">
-							<thead>
-								<tr>
-									<th width="7%">序号</th>
-									<th width="9%">开始时间</th>
-									<th width="9%">结束时间</th>
-									<th width="13%">起点</th>
-									<th width="13%">终点</th>
-									<th width="7%">里程</th>
-									<th width="10%">车辆</th>
-									<th width="9%">驾驶员</th>
-									<th width="9%">售票员</th>
-								</tr>
-							</thead>
-						</table>
-					</div>
-				</div>
-
-				<div class="custom-table-body">
-					<table class="table table-bordered table-advance">
-						<tbody>
-							<tr>
-								<td width="7%">1</td>
-								<td width="9%">05:00</td>
-								<td width="9%">05:00</td>
-								<td width="13%">长岛路东陆路</td>
-								<td width="13%">陆家嘴地铁站</td>
-								<td width="7%">22</td>
-								<td width="10%">W2B-091</td>
-								<td width="9%">张全强</td>
-								<td width="9%"></td>
-							</tr>
-							<tr>
-								<td>2</td>
-								<td>06:00</td>
-								<td>07:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>3</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>4</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>5</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>6</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>7</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>8</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>9</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>10</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>11</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>12</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>13</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>14</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-							<tr>
-								<td>15</td>
-								<td>05:00</td>
-								<td>05:00</td>
-								<td>长岛路东陆路</td>
-								<td>陆家嘴地铁站</td>
-								<td>22</td>
-								<td>W2B-091</td>
-								<td>张全强</td>
-								<td></td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-			</div>
-		</div>
-	</div>
-
-
-	<div class="temporary-box">
-		<hr>
-		<div class="row">
-			<div class="col-md-4">
-				<span class="custom-label">班次类型： </span> <select
-					class="form-control">
-					<option class="正常">正常</option>
-					<option class="进场">进场</option>
-					<option class="出场">出场</option>
-				</select>
-			</div>
-			<div class="col-md-4"></div>
-			<div class="col-md-4">
-				<span class="custom-label">上下行：</span> <select class="form-control">
-					<option class="上行">上行</option>
-					<option class="下行">下行</option>
-				</select>
-			</div>
-		</div>
-
-		<div class="row">
-			<div class="col-md-4">
-				<span class="custom-label">序号： </span> <input value="4"
-					class="form-control">
-			</div>
-			<div class="col-md-4">
-				<span class="custom-label">开始时间： </span> <input value="09:16"
-					class="form-control">
-			</div>
-			<div class="col-md-4">
-				<span class="custom-label">结束时间：</span> <input value="09:54"
-					class="form-control">
-			</div>
-		</div>
-
-		<div class="row">
-			<div class="col-md-4">
-				<span class="custom-label">起点： </span> <select class="form-control">
-					<option class="陆家嘴地铁站">陆家嘴地铁站</option>
-				</select>
-			</div>
-			<div class="col-md-4">
-				<span class="custom-label">终点： </span> <select class="form-control">
-					<option class="陆家嘴地铁站">陆家嘴地铁站</option>
-				</select>
-			</div>
-			<div class="col-md-4">
-				<span class="custom-label">里程：</span> <input value="13.66"
-					class="form-control">
-			</div>
-		</div>
-		<hr>
-		<div class="row" style="margin-top: 0;">
-			<div class="col-md-4">
-				<span class="custom-label">车辆： </span> <input value="W2B-098"
-					class="form-control">
-			</div>
-			<div class="col-md-4">
-				<span class="custom-label">驾驶员： </span> <input value="015583/凌羽雄"
-					class="form-control">
-			</div>
-			<div class="col-md-4">
-				<span class="custom-label">售票员： </span> <input value=""
-					class="form-control">
-			</div>
-		</div>
-	</div>
-
-</div>
-
-<hr>
-<div class="form-custom-footer" style="margin-top: 15px;">
-	<button type="button" class="btn blue-madison confirm">
-		<i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定
-	</button>
-	<button type="button" class="btn layui-layer-close">取消</button>
-</div>
-
-<script>
-(function() {
-	//停靠表头
-	var width = $('.custom-table-body').width();
-	$('.custom-table-header').css('position', 'fixed').css('width', width);
-	
-	var storage = window.localStorage;
-	var lineItems = JSON.parse(storage.getItem('lineControlItems'));
-	
-	//线路下拉框
-	var lineData = [];
-	$.each(lineItems, function(){
-		lineData.push({id: this.lineCode, text: this.name});
-	});
-	
-	var lineSelect = $('#temporaryAddDiv .lineSelect');
-	var lpSelect = $('#temporaryAddDiv .LPSelect');
-	initPinYinSelect2(lineSelect, lineData);
-	
-	$('#temporaryAddDiv').on('init', function(e, ops){
-		var data = ops.data
-		, lineData = [], lineName;
-	
-		for(var lineCode in data ){
-			lineName = lineMap[lineCode];
-			lineData.push({id: lineCode, text: lineName});
-		}
-	});
-})();
-</script>
 \ No newline at end of file
@@ -4,10 +4,14 @@
 		<div class="form-body">
 			<div class="form-custom-row">
 				<div class="item full" >
-					<span class="item-label" style="width: 80px;">执行路牌: </span>
-					<select class="form-control" style="width: calc(100% - 90px);">
-						<option value="青9">青9</option>
-					</select>
+					<div style="display: inline-block;">
+						<span class="item-label" style="width: 80px;">线路: </span>
+						<select class="form-control lineSelect" style="width: 180px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">执行路牌: </span>
+						<select class="form-control lpSelect" style="width: 140px;"></select>
+					</div>
 				</div>
 			</div>
@@ -31,89 +35,9 @@
 							</div>
 						</div>
-						<div class="custom-table-body">
-							<table class="table table-bordered table-advance">
+						<div class="custom-table-body" >
+							<table class="table table-bordered table-advance" >
 								<tbody>
-									<tr>
-									<td width="20%">
-										<input type="checkbox"> 15:54
-									</td>
-									<td width="20%">Q4A-006</td>
-									<td width="30%">011434/周明</td>
-									<td width="30%">903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
-								<tr>
-									<td>
-										<input type="checkbox"> 15:54
-									</td>
-									<td>Q4A-006</td>
-									<td>011434/周明</td>
-									<td>903383/潘扣来</td>
-								</tr>
 								</tbody>
 							</table>
 						</div>
@@ -170,11 +94,128 @@
 		</div>
 	</form>
 </div>
+<script id="pers_adjust_table_temp" type="text/html">
+{{each list as item i}}
+{{if item != null}}
+<tr data-id={{item.id}}>
+	<td width="20%">
+		<input type="checkbox" class="icheck"> {{item.fcsj}}
+	</td>
+	<td width="20%">{{item.clZbh}}</td>
+	<td width="30%">{{item.jGh}}/{{item.jName}}</td>
+	<td width="30%">{{item.sGh}}/{{item.sName}}</td>
+</tr>
+{{/if}}
+{{/each}}
+</script>
 <script>
 (function() {
+	var _data, _alone, scheduleLineMap, scheduleIdMap;
+	
 	//停靠表头
-	var width = $('.custom-table-body').width();
-	$('.custom-table-header').css('position', 'fixed').css('width', width);
-
+	/* var width = $('.custom-table-body').width();
+	$('.custom-table-header').css('position', 'fixed').css('width', width); */
+	//滚动时固定表头
+	$('.custom-table-panel').on('scroll', function(){
+		var top = $(this).scrollTop()
+		,$header = $(this).find('.custom-table-header');
+		$header.css('top', top);
+	});
+	
+	var wrap = '#vehicleAndPersionAdjustDiv';
+	var lineSelect = $('.lineSelect', wrap);
+	var lpSelect = $('.lpSelect', wrap);
+	
+	//班次选中事件
+	$(wrap).on('ifChanged', '.icheck', function(){
+		var $tr = $(this).parents('tr');
+		if(this.checked)
+			$tr.addClass('adjust_tr_active');
+		else
+			$tr.removeClass('adjust_tr_active');
+	});
+	
+	//初始化
+	$(wrap).on('init', function(e, ops ){
+		_data = ops._data;
+		_alone = ops._alone;
+		var schedul = ops.selected;
+		//线路 ——> 路牌 ——> 班次映射
+		scheduleLineMap = _data.getLineLpMap();
+		//线路下拉框数据
+		lineCodeMaps = _data.getLineIds();
+		var lineData = [], lineName;
+		for(var lineCode in scheduleLineMap){
+			lineName = lineCodeMaps[lineCode];
+			lineData.push({id: lineCode, text: lineName});
+		}
+		
+		initPinYinSelect2(lineSelect, lineData, function(){
+			//绑定change事件
+			lineSelect.on('change', changeLine);
+			//初始选中的线路
+			lineSelect.val(schedul.xlBm).trigger("change");
+			
+		   setTimeout(function(){
+				//选中路牌
+				lpSelect.val(schedul.lpName).trigger("change");
+				
+				//选中班次
+				var $tr = $('table tr[data-id='+schedul.id+']', wrap);
+				$tr.find('input').iCheck('check');
+				//滚动条
+				var cont = $('.custom-table-panel');
+			  	cont.animate({
+					scrollTop: $tr.offset().top - cont.offset().top + $tr.scrollTop() - 36 * 4
+			  	}, 500);
+			  	
+			}, 100);
+		});
+		
+		lpSelect.on('change', refreshMainList);
+		
+		function changeLine(){
+			var lineCode = lineSelect.val();
+			//设置路牌数据
+			var data = [];
+			for(var lp in scheduleLineMap[lineCode]){
+				data.push({id: lp, text: lp});
+			}
+			if(data.length > 0){
+				initPinYinSelect2(lpSelect.html(''), data, function(){
+					refreshMainList();
+				});
+			}
+			//人员下拉框
+			//carAndPersInit(lineCode);
+		}
+		
+		/**
+		 *	刷新主任务列表
+		 */
+		function refreshMainList(){
+			var lineCode = lineSelect.val()
+				,lp = lpSelect.val()
+				,scheduls = scheduleLineMap[lineCode][lp];
+			//保留当前列表班次的映射
+			scheduleIdMap = {};
+			$.each(scheduls, function(){
+				scheduleIdMap[this.id] = this;
+			});
+			
+			var schArray = [];
+			$.each(scheduls, function(){
+				schArray[this.fcno - 1] = this;
+			});
+			
+			var htmlStr = template('pers_adjust_table_temp', {list: schArray});
+			$('table tbody', wrap).html(htmlStr);
+			
+			 $('.icheck', wrap).iCheck({
+				 checkboxClass: 'icheckbox_flat-blue',
+				 increaseArea: '20%'
+			 });
+		}
+	});
 })();
 </script>
@@ -1355,10 +1355,12 @@ height: 400px;
 	height: 36px;
 	width: 100%;
 	position: absolute;
+	z-index: 99;
 }
 .custom-table-panel table{
 	margin-bottom: 0 !important;
+	table-layout: fixed;
 }
 .custom-table-header table tr th,
@@ -1747,4 +1749,99 @@ tr.empty._active {
 .custom-box-body .select2-container--bootstrap{
 	display: inline-block;
-}
 \ No newline at end of file
+}
+
+.child_task_badge:BEFORE{
+	padding: 2px 5px;
+    font-size: 12px;
+     float: right;
+}
+
+.child_task_badge.service_0:BEFORE{
+	content: '营';
+    background: #4796cc;
+    color: white;
+}
+
+.child_task_badge.empty_0:BEFORE{
+	content: '空';
+    background: #9f9f9f;
+    color: white;
+}
+
+.child_task_badge.service_1:BEFORE,
+.child_task_badge.empty_1:BEFORE{
+	content: '烂';
+    background: red;
+    color: white;
+}
+
+.no_check_main_task:BEFORE{
+	content: '请先选择主任务...';
+	font-size: 12px;
+	margin-left: 200px;
+}
+
+td.empty_text{
+    font-size: 12px;
+    text-indent: 160px;
+}
+
+.popover{
+	z-index: 99999999;	
+}
+
+a.no_and_removeLink {
+    color: #4a4aff;
+    text-decoration: underline;
+}
+
+.subTable .dropdown{
+	display: inline-block;
+}
+
+.subTable .dropdown-menu > li > a{
+	padding: 6px 9px;
+}
+
+.subTable .dropdown-menu{
+	left: -7px !important;
+	width: 65px;
+	box-shadow: 0 8px 17px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19);
+	min-width: 65px;
+	border: none;
+}
+
+.subTable .dropdown .dropdown-menu:before
+{
+     border-bottom: 8px solid #ff8686;
+     left: 4px;
+}
+
+.subTable .dropdown .dropdown-menu:after{
+	 border-bottom: 8px solid #ff8686;
+	 left: 5px;
+}
+
+.subTable .dropdown li.child_task_delete{
+	background: #ff8686;
+	font-size: 12px;
+}
+
+.subTable .dropdown-menu > li.child_task_delete > a,
+.subTable .dropdown-menu > li.child_task_delete > a > i{
+	color: white;
+}
+
+.subTable .dropdown-menu > li.child_task_delete:hover > a{
+	background: linear-gradient(to bottom, #ff8585 0%, #ee4646 100px);
+	color: white;
+}
+
+#vehicleAndPersionAdjustDiv table tr td{
+	transition: all .3s ease;
+}
+
+tr.adjust_tr_active td{
+	border-bottom: 1px solid #3598dc !important;
+}
@@ -65,23 +65,21 @@ var _alone = (function(){
 		//添加一个班次到表格
 		addScheduleToTable: function(schedule){
 			var upDown = schedule.xlDir==0?'up':'down';
+			var tab = $('#tab_line_' + schedule.xlBm);
 			//重新渲染表格
-			var table = $('#tab_line_' + schedule.xlBm).find('.pb-table[data-type='+upDown+']');
+			var table = tab.find('.pb-table[data-type='+upDown+']');
 			//获取班次信息
 			var schArray = _data.findSchByLine(schedule.xlBm, schedule.xlDir);
 			calculateLineNo(
 					table.find('tbody').html(template('alone_plan_table_temp', {list: schArray}))[0]
 			);
-			var currTr = table.find('tr[data-id='+schedule.id+']');
-			console.log(currTr);
-			//重新设置滚动条，
-			table.find('._body').slimscroll({
-					height: 'calc(100% - 80px)',
-					alwaysVisible: true,
-					start: currTr
-			});
+			//定位到新添加的班次
+			var currTr = table.find('tr[data-id='+schedule.id+']')
+				,top = parseInt(currTr.find('td[name=lineNo]').text()) * 37;
+			currTr.addClass('animated flash');
+			currTr.parents('._body').slimScroll({ scrollTo: top + 'px' });
 		},
 		//重新计算行号
 		calculateLineNo: calculateLineNo
@@ -48,7 +48,6 @@ var _menu = (function() {
 			  type: 1,
 			  area: ['630px', '545px'],
 			  maxmin: true,
-			  skin:'layui-layer-molv',
 			  content: template('outgo_adjust_body_temp', schedul),
 			  shift: 5,
 			  title: '待发调整',
@@ -74,7 +73,6 @@ var _menu = (function() {
 			  type: 1,
 			  area: ['370px', '645px'],
 			  maxmin: true,
-			  skin:'layui-layer-molv',
 			  content: template('plan_destroy_body_temp', data),
 			  shift: 5,
 			  title: '计划烂班设置',
@@ -154,7 +152,6 @@ var _menu = (function() {
 			  type: 1,
 			  area: ['350px', '455px'],
 			  maxmin: true,
-			  skin:'layui-layer-molv',
 			  content: template('real_outgo_adjust_body_temp', {}),
 			  shift: 5,
 			  title: '实发调整',
@@ -185,35 +182,22 @@ var _menu = (function() {
 				});
 			});
 		},
-		//临加班次
-		temporaryAdd: function(schedul){
-			$.get('/pages/control/line/child_pages/temporary_add.html', function(content){
-				layer.open({
-				  type: 1,
-				  area: ['930px', '785px'],
-				  maxmin: true,
-				  skin:'layui-layer-molv',
-				  content: content,
-				  shift: 5,
-				  title: '临加/抽增',
-				  success: function(){
-					  $('#temporaryAddDiv').trigger('init', {data: _data.getLineLpMap(), selected: schedul});
-				  }
-				});
-			});
-		},
 		//调整人车
-		vehicAndPerAdjust: function(){
+		vehicAndPerAdjust: function(schedul){
 			$.get('/pages/control/line/child_pages/vehicAndper_adjust.html', function(content){
 				layer.open({
 				  type: 1,
 				  area: ['730px', '655px'],
 				  maxmin: true,
-				  skin:'layui-layer-molv',
 				  content: content,
 				  shift: 5,
-				  title: '调整85路车辆/人员',
+				  title: '调整车辆/人员',
 				  success: function(){
+					  $('#vehicleAndPersionAdjustDiv').trigger('init', {
+						  selected: schedul, 
+						  _data: _data,
+						  _alone: _alone
+					   });
 				  }
 				});
 			});
 <!-- 子任务，临加班次模板文件 -->
+<!-- 主任务表格模板 -->
 <script id="child_task_main_table_temp" type="text/html">
 {{each list as item i}}
 {{if item == null}}
@@ -29,6 +30,42 @@
 {{/each}}
 </script>
+<!-- 子任务表格模板 -->
+<script id="child_task_sub_table_temp" type="text/html">
+{{each list as item i}}
+<tr>
+	<td width="6%">
+		<div class="dropdown">
+		  <a class="no_and_removeLink" href="javascript:;" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+		    {{i + 1}}
+		  </a>
+		  <ul class="dropdown-menu" aria-labelledby="dLabel">
+			<li class="child_task_delete" data-id="{{item.id}}">
+				<a href="javascript:;"><i class="fa fa-remove"></i> 删除</a>
+			</li>
+		  </ul>
+		</div>
+		<span class="child_task_badge {{item.mileageType}}_{{item.destroy?1:0}}"></span>
+	</td>
+	<td width="11%"><span class="nt-dictionary" data-group="ChildTaskType">{{item.type2}}</span></td>
+	<td width="16%">{{item.startStationName}}</td>
+	<td width="16%">{{item.endStationName}}</td>
+	<td width="10%">{{item.startDate}}</td>
+	<td width="10%">{{item.endDate}}</td>
+	<td width="7%">{{item.mileage}}</td>
+	<td width="11%">
+		{{item.remarks}}
+	</td>
+</tr>
+{{/each}}
+
+{{if list.length == 0}}
+<tr>
+	<td colspan=8 class="empty_text">该班次没有子任务信息...</td>
+</tr>
+{{/if}}
+</script>
+
 <!-- 进场子任务 -->
 <script id="child_task_inpark_process_temp" type="text/html">
 <div class="custom-anim-modal wrap" id="inParkProcess">
@@ -40,6 +77,7 @@
 	<form>
 		<input type="hidden" value="{{schedul.id}}" name="schedule.id">
 		<input type="hidden" value="正常" name="type1">
+		<input type="hidden" value="service" name="mileageType">
 		<a class="task-item-close"></a>
 		<div class="child-task-title">正常营运</div>
 		<div class="row">
@@ -81,6 +119,7 @@
 	<form>
 		<input type="hidden" value="{{schedul.id}}" name="schedule.id">
 		<input type="hidden" value="正常" name="type1">
+		<input type="hidden" value="empty" name="mileageType">
 		<a class="task-item-close"></a>
 		<div class="child-task-title">空驶进场</div>
@@ -122,6 +161,7 @@
 		<input type="hidden" value="{{schedul.id}}" name="schedule.id">
 		<input type="hidden" value="正常" name="type1">
 		<input type="hidden" value="1" name="destroy">
+		<input type="hidden" value="service" name="mileageType">
 		<a class="task-item-close"></a>
 		<div class="child-task-title">烂班公里</div>
@@ -144,7 +184,7 @@
 		<div class="row">
 			<div class="col-md-4">
 				<span class="custom-label">烂班里程：</span>
-				<input class="form-control" name="mileage" value="" type="number" disabled>
+				<input class="form-control" name="mileage" value="" type="number" readonly>
 			</div>
 			<div class="col-md-4">
 				<span class="custom-label">开始时间： </span>
@@ -204,6 +244,7 @@
 	<form>
 		<input type="hidden" value="{{schedul.id}}" name="schedule.id">
 		<input type="hidden" value="正常" name="type1">
+		<input type="hidden" value="service" name="mileageType">
 		<a class="task-item-close"></a>
 		<div class="child-task-title">正常营运</div>
@@ -230,11 +271,11 @@
 		<div class="row">
 			<div class="col-md-4">
 				<span class="custom-label">营运里程：</span>
-				<input class="form-control" name="mileage" value="{{schedul.jhlc}}" disabled>
+				<input class="form-control" name="mileage" value="{{schedul.jhlc}}" readonly>
 			</div>
 			<div class="col-md-4">
 				<span class="custom-label">开始时间： </span>
-				<input class="form-control" value="{{schedul.fcsj}}" name="startDate" type="time" disabled>
+				<input class="form-control" value="{{schedul.fcsj}}" name="startDate" type="time" readonly>
 			</div>
 			<div class="col-md-4">
 				<span class="custom-label">结束时间： </span>
@@ -248,6 +289,7 @@
 	<form>
 		<input type="hidden" value="{{schedul.id}}" name="schedule.id">
 		<input type="hidden" value="正常" name="type1">
+		<input type="hidden" value="empty" name="mileageType">
 		<a class="task-item-close"></a>
 		<div class="child-task-title">空驶出场</div>
@@ -359,11 +401,7 @@
 <div class="row">
 	<div class="col-md-4">
 		<span class="custom-label">里程类型：</span>
-		<select class="form-control" name="mileageType" required=1>
-			<option value="">请选择...</option>
-			<option value="营运">营运</option>
-			<option value="空驶">空驶</option>
-		</select>
+		<select class="form-control nt-dictionary" required=1 name="mileageType" data-group="MileageType" ></select>
 	</div>
 	<div class="col-md-4">
 		<span class="custom-label">里程：</span>