update

潘钊
1 parent 6e21e4a2
Showing 7 changed files with 57 additions and 12 deletions
pom.xml
src/main/java/com/bsth/entity/sys/Module.java
src/main/java/com/bsth/repository/ModuleRepository.java
src/main/resources/static/pages/control/line/child_pages/child_task.html
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/data.js
src/main/resources/static/pages/control/line/js/rightMenu.js
@@ -18,6 +18,13 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		
+		<!-- <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency> -->
+        
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
@@ -18,11 +18,6 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "bsth_c_sys_module")
-@NamedEntityGraphs({
-    @NamedEntityGraph(name = "module_roles", attributeNodes = {
-            @NamedAttributeNode("roles")
-    })
-})
 public class Module {
 	@Id
@@ -53,7 +48,7 @@ public class Module {
 	 */
 	private String groupType;
-	@ManyToMany(mappedBy = "modules", fetch = FetchType.LAZY)
+	@ManyToMany(mappedBy = "modules")
 	private Set<Role> roles = new LinkedHashSet<>();
 	@Column(updatable = false,name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
@@ -21,7 +21,6 @@ public interface ModuleRepository extends BaseRepository&lt;Module, Integer&gt;{
 	@Query("select m from Module m where m.id in ?1")
 	Set<Module> findByIds(List<Integer> ids);
-	@EntityGraph(value = "carConfigInfo_xl_cl", type = EntityGraph.EntityGraphType.FETCH)
 	@Override
 	List<Module> findAll(Specification<Module> spec);
 }
@@ -240,6 +240,7 @@ $(function(){
 	var scheduleIdMap;
 	var _data; //data.js引用
+	var _alone; //alone.js 引用
 	//滚动时固定表头
 	$('.custom-table-panel').on('scroll', function(){
@@ -317,6 +318,7 @@ $(function(){
 	//线路下拉框
 	$('#childTaskDiv').on('init', function(e, ops ){
 		_data = ops._data;
+		_alone = ops._alone;
 		//要选中的班次
 		var schedul = ops.selected;
 		var lineData = [], lineName;
@@ -494,8 +496,14 @@ $(function(){
 		param.zdzName = searchStationName(route, param.zdzCode);
 		$post('/realSchedule', param, function(rs){
+			var sch = rs.t;
 			//前端缓存更新
-			scheduleLineMap[param.xlBm][param.lpName].push(rs.t);
+			scheduleLineMap[param.xlBm][param.lpName].push(sch);
+			_data.pushSchedule(sch);
+			//刷新表格
+			_alone.addScheduleToTable(sch);
+			//关闭弹出层
+			layer.closeAll();
 		});
 	});
@@ -62,6 +62,27 @@ var _alone = (function(){
 			$tr.replaceWith(newTr);
 			initRemarksPop();
 		},
+		//添加一个班次到表格
+		addScheduleToTable: function(schedule){
+			var upDown = schedule.xlDir==0?'up':'down';
+			//重新渲染表格
+			var table = $('#tab_line_' + schedule.xlBm).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
+			});
+			
+		},
 		//重新计算行号
 		calculateLineNo: calculateLineNo
 	}
@@ -28,6 +28,23 @@ var _data = (function(){
 	var carDeviceIdMapp = {};
 	var dataObject = {
+		//根据线路和上下行获取计划排班
+		findSchByLine: function(xlbm, upDown){
+			var array = [];
+			$.each(scheduleList, function(){
+				if(this.xlBm == xlbm
+						&& this.xlDir == upDown)
+					array.push(this);
+			});
+			
+			return array;
+		},
+		//添加一个班次
+		pushSchedule: function(sch){
+			scheduleList.push(sch);
+			schedules[sch.id] = sch;
+			lineLpMap[sch.xlBm][sch.lpName].push(sch);
+		},
 		getLines: function(){
 			return JSON.parse(storage.getItem('lineControlItems'));
 		},
@@ -177,11 +177,9 @@ var _menu = (function() {
 				  success: function(){
 					  dictionaryUtils.transformDom($('#childTaskDiv .nt-dictionary'));
 					  $('#childTaskDiv').trigger('init', {
-						  //data: _data.getLineLpMap(), 
 						  selected: schedul, 
-						  _data: _data
-						  //stationRoute: _data.getStationRouteByLine(schedul.xlBm),
-						 // lineInformation: _data.getLineInformation(schedul.xlBm)
+						  _data: _data,
+						  _alone: _alone
 					   });
 				  }
 				});