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:
fit2-zhao 2020-12-25 11:16:35 +08:00
parent caa7a5d4d7
commit 312b028ade
5 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
View File

@ -96,6 +96,8 @@ public class ApiScenarioReportService {
report.setId(test.getId());
report.setProjectId(test.getProjectId());
report.setName(test.getName());
report.setScenarioName(test.getScenarioName());
report.setScenarioId(test.getScenarioId());
report.setTriggerMode(test.getTriggerMode());
report.setDescription(test.getDescription());
report.setCreateTime(System.currentTimeMillis());
@ -103,7 +105,7 @@ public class ApiScenarioReportService {
report.setStatus(test.getStatus());
report.setUserId(test.getUserId());
report.setExecuteType(test.getExecuteType());
apiScenarioReportMapper.updateByPrimaryKey(report);
apiScenarioReportMapper.updateByPrimaryKeySelective(report);
return report;
}

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

@ -1,7 +1,7 @@
<template>
<el-dialog class="api-relevance" :title="'接口导入'"
:visible.sync="dialogVisible"
width="60%"
width="70%"
:close-on-click-modal="false"
top="50px">

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

@ -1,7 +1,7 @@
<template>
<el-dialog class="api-relevance" :title="'场景导入'"
:visible.sync="dialogVisible"
width="60%"
width="70%"
:close-on-click-modal="false"
top="50px">

5
frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceApiList.vue
View File

@ -164,9 +164,7 @@
this.initTable();
},
},
computed: {
},
computed: {},
methods: {
isApiListEnableChange(data) {
this.$emit('isApiListEnableChange', data);
@ -185,6 +183,7 @@
if (this.currentProtocol != null) {
this.condition.protocol = this.currentProtocol;
}
this.condition.projectId = getCurrentProjectID();
this.result = this.$post("/api/definition/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
this.total = response.data.itemCount;
this.tableData = response.data.listObject;

1
frontend/src/business/components/api/automation/scenario/api/ScenarioRelevanceCaseList.vue
View File

@ -161,7 +161,6 @@
this.condition.protocol = this.currentProtocol;
}
this.condition.projectId = getCurrentProjectID();
this.result = this.$post("/api/testcase/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
this.total = response.data.itemCount;
this.tableData = response.data.listObject;