瀏覽代碼

任务列表页交互优化,更换执行器分组时自动刷新任务列表,新建任务时默认定位在当前执行器位置;

xuxueli 8 年之前
父節點
當前提交
e9566fcbbf

+ 1 - 0
doc/XXL-JOB官方文档.md 查看文件

904
 - 5、调度中心,DAO层代码精简优化并且新增测试用例覆盖;
904
 - 5、调度中心,DAO层代码精简优化并且新增测试用例覆盖;
905
 - 6、调度中心API服务改为自研RPC形式,统一底层通讯模型;
905
 - 6、调度中心API服务改为自研RPC形式,统一底层通讯模型;
906
 - 7、新增调度中心API服务测试Demo,方便在调度中心API扩展和测试;
906
 - 7、新增调度中心API服务测试Demo,方便在调度中心API扩展和测试;
907
+- 8、任务列表页交互优化,更换执行器分组时自动刷新任务列表,新建任务时默认定位在当前执行器位置;
907
 
908
 
908
 #### TODO LIST
909
 #### TODO LIST
909
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;
910
 - 1、任务权限管理:执行器为粒度分配权限,核心操作校验权限;

+ 3 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java 查看文件

33
 	private XxlJobService xxlJobService;
33
 	private XxlJobService xxlJobService;
34
 	
34
 	
35
 	@RequestMapping
35
 	@RequestMapping
36
-	public String index(Model model) {
36
+	public String index(Model model, @RequestParam(required = false, defaultValue = "-1") int jobGroup) {
37
 
37
 
38
 		// 枚举-字典
38
 		// 枚举-字典
39
 		model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());	// 路由策略-列表
39
 		model.addAttribute("ExecutorRouteStrategyEnum", ExecutorRouteStrategyEnum.values());	// 路由策略-列表
44
 		// 任务组
44
 		// 任务组
45
 		List<XxlJobGroup> jobGroupList =  xxlJobGroupDao.findAll();
45
 		List<XxlJobGroup> jobGroupList =  xxlJobGroupDao.findAll();
46
 		model.addAttribute("JobGroupList", jobGroupList);
46
 		model.addAttribute("JobGroupList", jobGroupList);
47
+		model.addAttribute("jobGroup", jobGroup);
48
+
47
 		return "jobinfo/jobinfo.index";
49
 		return "jobinfo/jobinfo.index";
48
 	}
50
 	}
49
 	
51
 	

+ 2 - 2
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl 查看文件

37
 	                	<span class="input-group-addon">执行器</span>
37
 	                	<span class="input-group-addon">执行器</span>
38
                 		<select class="form-control" id="jobGroup" >
38
                 		<select class="form-control" id="jobGroup" >
39
                 			<#list JobGroupList as group>
39
                 			<#list JobGroupList as group>
40
-                				<option value="${group.id}" >${group.title}</option>
40
+                				<option value="${group.id}" <#if jobGroup==group.id>selected</#if> >${group.title}</option>
41
                 			</#list>
41
                 			</#list>
42
 	                  	</select>
42
 	                  	</select>
43
 	              	</div>
43
 	              	</div>
110
 						<div class="col-sm-4">
110
 						<div class="col-sm-4">
111
 							<select class="form-control" name="jobGroup" >
111
 							<select class="form-control" name="jobGroup" >
112
 		            			<#list JobGroupList as group>
112
 		            			<#list JobGroupList as group>
113
-		            				<option value="${group.id}" >${group.title}</option>
113
+		            				<option value="${group.id}" <#if jobGroup==group.id>selected</#if> >${group.title}</option>
114
 		            			</#list>
114
 		            			</#list>
115
 		                  	</select>
115
 		                  	</select>
116
 						</div>
116
 						</div>

+ 7 - 0
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js 查看文件

167
 		jobTable.fnDraw();
167
 		jobTable.fnDraw();
168
 	});
168
 	});
169
 	
169
 	
170
+	// jobGroup change
171
+	$('#jobGroup').on('change', function(){
172
+        //reload
173
+        var jobGroup = $('#jobGroup').val();
174
+        window.location.href = base_url + "/jobinfo?jobGroup=" + jobGroup;
175
+    });
176
+	
170
 	// job operate
177
 	// job operate
171
 	$("#job_list").on('click', '.job_operate',function() {
178
 	$("#job_list").on('click', '.job_operate',function() {
172
 		var typeName;
179
 		var typeName;