优化测试详情编辑页面
This commit is contained in:
chenjianxing
parent
b64fa89e0c
commit
bcc2b7ea90
|
|
@ -21,8 +21,8 @@
|
|||
</select>
|
||||
|
||||
<select id="getTestPlanTestCases" resultType="io.metersphere.dto.TestPlanCaseDTO">
|
||||
select t1.id as id, t1.plan_id as planId, t1.executor as executor, t1.status as status, t1.results as results, t1.remark remard, t1.create_time as createTime, t1.update_time updateTime,
|
||||
t2.id as caseId, t2.node_id as nodeId, t2.node_path as nodePath, t2.project_id as projectId, t2.name as name,
|
||||
select t1.id as id, t1.plan_id as planId, t1.executor as executor, t1.status as status, t1.results as results, t1.create_time as createTime, t1.update_time updateTime,
|
||||
t2.id as caseId, t2.node_id as nodeId, t2.node_path as nodePath, t2.project_id as projectId, t2.name as name, t2.remark remark, t2.steps steps,
|
||||
t2.type as type, t2.maintainer as maintainer, t2.priority as priority, t2.method as method, t2.prerequisite as prerequisite
|
||||
from test_plan_test_case as t1
|
||||
inner join test_case as t2 on
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
package io.metersphere.dto;
|
||||
|
||||
import io.metersphere.base.domain.TestCase;
|
||||
import io.metersphere.base.domain.TestCaseWithBLOBs;
|
||||
|
||||
public class TestPlanCaseDTO extends TestCase {
|
||||
public class TestPlanCaseDTO extends TestCaseWithBLOBs {
|
||||
|
||||
private String executor;
|
||||
private String status;
|
||||
private String results;
|
||||
private String remark;
|
||||
|
||||
public String getExecutor() {
|
||||
return executor;
|
||||
|
|
@ -32,12 +32,4 @@ public class TestPlanCaseDTO extends TestCase {
|
|||
public void setResults(String results) {
|
||||
this.results = results;
|
||||
}
|
||||
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,6 +86,16 @@
|
|||
let item = {};
|
||||
Object.assign(item, testCase);
|
||||
item.results = JSON.parse(item.results);
|
||||
item.steps = JSON.parse(item.steps);
|
||||
|
||||
item.steptResults = [];
|
||||
for (let i = 0; i < item.steps.length; i++){
|
||||
if(item.results[i]){
|
||||
item.steps[i].actualResult = item.results[i].actualResult;
|
||||
item.steps[i].executeResult = item.results[i].executeResult;
|
||||
}
|
||||
item.steptResults.push(item.steps[i]);
|
||||
}
|
||||
this.$refs.testPlanTestCaseEdit.testCase = item;
|
||||
this.$refs.testPlanTestCaseEdit.dialog = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -237,4 +237,8 @@
|
|||
margin-right: -9px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
.el-table {
|
||||
cursor:pointer;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
size="100%"
|
||||
ref="drawer">
|
||||
|
||||
<div>
|
||||
|
||||
<div class="case_container">
|
||||
<el-row >
|
||||
<el-col :span="4" :offset="1">
|
||||
<span class="cast_label">{{$t('test_track.priority')}}：</span>
|
||||
|
|
@ -35,6 +34,70 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :span="20" :offset="1">
|
||||
<el-table
|
||||
:data="testCase.steptResults"
|
||||
class="tb-edit"
|
||||
size="mini"
|
||||
height="200px"
|
||||
:default-sort = "{prop: 'num', order: 'ascending'}"
|
||||
highlight-current-row>
|
||||
<el-table-column :label="$t('test_track.number')" prop="num" min-width="5%"></el-table-column>
|
||||
<el-table-column :label="$t('test_track.step_desc')" prop="desc" min-width="29%">
|
||||
<template v-slot:default="scope">
|
||||
<span>{{scope.row.desc}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('test_track.expected_results')" prop="result" min-width="28%">
|
||||
<template v-slot:default="scope">
|
||||
<span>{{scope.row.result}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('test_track.actual_result')" min-width="29%">
|
||||
<template v-slot:default="scope">
|
||||
<el-input
|
||||
size="mini"
|
||||
type="textarea"
|
||||
:rows="2"
|
||||
v-model="scope.row.actualResult"
|
||||
:placeholder="$t('commons.input_content')"
|
||||
clearable></el-input>
|
||||
<span>{{scope.row.actualResult}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('test_track.step_result')" min-width="9%">
|
||||
<template v-slot:default="scope">
|
||||
<el-select
|
||||
v-model="scope.row.executeResult"
|
||||
size="mini">
|
||||
<el-option :label="$t('test_track.pass')" value="Pass"></el-option>
|
||||
<el-option :label="$t('test_track.failure')" value="Failure"></el-option>
|
||||
<el-option :label="$t('test_track.blocking')" value="Blocking"></el-option>
|
||||
<el-option :label="$t('test_track.skip')" value="Skip"></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row >
|
||||
<el-col :span="15" :offset="1">
|
||||
<div style="margin-bottom: 5px;">
|
||||
<span class="cast_label">{{$t('commons.remark')}}：</span>
|
||||
<span v-if="testCase.remark == null || testCase.remark == ''" style="color: darkgrey">{{$t('commons.not_filled')}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<el-input :rows="3"
|
||||
type="textarea"
|
||||
v-if="testCase.remark"
|
||||
disabled
|
||||
v-model="testCase.remark"></el-input>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col :offset="1" :span="2">
|
||||
<el-button type="success" round
|
||||
|
|
@ -58,57 +121,6 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-row>
|
||||
<el-col :span="20" :offset="1">
|
||||
<el-table
|
||||
:data="testCase.results"
|
||||
class="tb-edit"
|
||||
:default-sort = "{prop: 'num', order: 'ascending'}"
|
||||
highlight-current-row>
|
||||
<el-table-column :label="$t('test_track.number')" prop="num" min-width="8%"></el-table-column>
|
||||
<el-table-column :label="$t('test_track.step_desc')" prop="desc" min-width="30%">
|
||||
<template v-slot:default="scope">
|
||||
<span>{{scope.row.desc}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('test_track.expected_results')" prop="result" min-width="30%">
|
||||
<template v-slot:default="scope">
|
||||
<span>{{scope.row.result}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('test_track.actual_result')" min-width="30%">
|
||||
<template v-slot:default="scope">
|
||||
<el-input
|
||||
size="small"
|
||||
v-model="scope.row.actualResult"
|
||||
:placeholder="$t('commons.input_content')"
|
||||
clearable></el-input>
|
||||
<span>{{scope.row.actualResult}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('test_track.step_result')" min-width="15%">
|
||||
<template v-slot:default="scope">
|
||||
<el-select v-model="scope.row.stepResult" :placeholder="$t('test_track.select_execute_result')">
|
||||
<el-option :label="$t('test_track.pass')" value="Pass"></el-option>
|
||||
<el-option :label="$t('test_track.failure')" value="Failure"></el-option>
|
||||
<el-option :label="$t('test_track.blocking')" value="Blocking"></el-option>
|
||||
<el-option :label="$t('test_track.skip')" value="Skip"></el-option>
|
||||
</el-select>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row >
|
||||
<el-col :span="40" :offset="1">
|
||||
<span>{{$t('commons.remark')}}：</span>
|
||||
<span>{{testCase.remark}}</span>
|
||||
<span v-if="testCase.remark == null" style="color: gainsboro">{{$t('commons.not_filled')}}</span>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row type="flex" justify="end">
|
||||
<el-col :span="5">
|
||||
<div>
|
||||
|
|
@ -146,7 +158,14 @@
|
|||
let param = {};
|
||||
param.id = this.testCase.id;
|
||||
param.status = this.testCase.status;
|
||||
param.results = JSON.stringify(this.testCase.results);
|
||||
param.results = [];
|
||||
this.testCase.steptResults.forEach(item => {
|
||||
let result = {};
|
||||
result.actualResult = item.actualResult;
|
||||
result.executeResult = item.executeResult;
|
||||
param.results.push(result);
|
||||
});
|
||||
param.results = JSON.stringify(param.results);
|
||||
this.$post('/test/plan/case/edit', param, () => {
|
||||
this.$refs.drawer.closeDrawer();
|
||||
this.$message.success("保存成功！");
|
||||
|
|
@ -160,20 +179,22 @@
|
|||
<style scoped>
|
||||
|
||||
|
||||
.tb-edit .el-input {
|
||||
.tb-edit .el-textarea {
|
||||
display: none;
|
||||
color: black;
|
||||
}
|
||||
.tb-edit .current-row .el-input {
|
||||
.tb-edit .current-row .el-textarea {
|
||||
display: block;
|
||||
}
|
||||
.tb-edit .current-row .el-input+span {
|
||||
.tb-edit .current-row .el-textarea+span {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.el-row {
|
||||
margin-bottom: 3%;
|
||||
margin-bottom: 2%;
|
||||
}
|
||||
|
||||
.cast_label {
|
||||
color: dimgray;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue