test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 场景跳转数据查询功能失效 

修复场景跳转数据查询功能失效的问题
This commit is contained in:
song.tianyang 2021-01-05 18:20:51 +08:00
parent 252f5f3c10
commit b402acfeda
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/controller/APITestController.java
View File

@ -341,8 +341,10 @@ public class APITestController {
public List<TaskInfoResult> runningTask(@PathVariable String projectID) { public List<TaskInfoResult> runningTask(@PathVariable String projectID) {
List<TaskInfoResult> resultList = scheduleService.findRunningTaskInfoByProjectID(projectID); List<TaskInfoResult> resultList = scheduleService.findRunningTaskInfoByProjectID(projectID);
int dataIndex = 1;
for (TaskInfoResult taskInfo : for (TaskInfoResult taskInfo :
resultList) { resultList) {
taskInfo.setIndex(dataIndex++);
Date nextExecutionTime = CronUtils.getNextTriggerTime(taskInfo.getRule()); Date nextExecutionTime = CronUtils.getNextTriggerTime(taskInfo.getRule());
if(nextExecutionTime!=null){ if(nextExecutionTime!=null){
taskInfo.setNextExecutionTime(nextExecutionTime.getTime()); taskInfo.setNextExecutionTime(nextExecutionTime.getTime());

2
frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
View File

@ -215,7 +215,7 @@ export default {
this.condition.executeStatus = null; this.condition.executeStatus = null;
this.isSelectThissWeekData(); this.isSelectThissWeekData();
switch (this.selectDataRange){ switch (this.selectDataRange){
case 'thisWeek': case 'thisWeekCount':
this.condition.selectThisWeedData = true; this.condition.selectThisWeedData = true;
break; break;
case 'unExecute': case 'unExecute':