编辑测试修改

This commit is contained in:
Captain.B 2020-02-27 13:34:28 +08:00
parent cde78be5cb
commit d4f69fa4ca
10 changed files with 118 additions and 51 deletions

View File

@ -21,6 +21,9 @@
<if test="request.projectId != null">
AND project.id = #{request.projectId}
</if>
<if test="request.id != null">
AND load_test.id = #{request.id}
</if>
</where>
<if test="request.recent">
order by load_test.update_time desc

View File

@ -64,6 +64,11 @@ public class LoadTestController {
return loadTestService.edit(request, file);
}
@GetMapping("/get/{testId}")
public LoadTestDTO get(@PathVariable String testId) {
return loadTestService.get(testId);
}
@PostMapping("/delete")
public void delete(@RequestBody DeleteTestPlanRequest request) {
loadTestService.delete(request);

View File

@ -195,5 +195,15 @@ public class LoadTestService {
// 查询最近的测试计划
request.setRecent(true);
return extLoadTestMapper.list(request);
}
}
public LoadTestDTO get(String testId) {
QueryTestPlanRequest request = new QueryTestPlanRequest();
request.setId(testId);
List<LoadTestDTO> testDTOS = extLoadTestMapper.list(request);
if (!CollectionUtils.isEmpty(testDTOS)) {
return testDTOS.get(0);
}
return null;
}
}

View File

@ -4,7 +4,7 @@ import RouterSidebar from "./RouterSidebar";
import Setting from "../settings/Setting";
import Workspace from "../settings/Workspace";
import User from "../settings/User";
import CreateTestPlan from "../testPlan/CreateTestPlan";
import EditTestPlan from "../testPlan/EditTestPlan";
import AllTestPlan from "../testPlan/AllTestPlan";
import Organization from "../settings/Organization";
import OrganizationMember from "../settings/OrganizationMember";
@ -74,7 +74,14 @@ const router = new VueRouter({
path: "/createTest",
name: "createTest",
components: {
content: CreateTestPlan
content: EditTestPlan
}
},
{
path: "/editTest/:testId",
name: "editTest",
components: {
content: EditTestPlan
},
props: {
content: (route) => {

View File

@ -93,6 +93,7 @@
pageSize: 5,
total: 0,
loading: false,
testId: null,
}
},
watch: {
@ -140,8 +141,9 @@
},
handleEdit(testPlan) {
this.$router.push({
name: 'createTest',
path: '/editTest/' + testPlan.id,
params: {
testId: testPlan.id,
testPlanObj: testPlan
}
})

View File

@ -1,48 +1,52 @@
<template>
<div class="edit-testplan-container" v-loading="result.loading">
<el-row>
<el-col :span="10">
<el-input placeholder="请输入名称" v-model="testPlan.name" class="input-with-select">
<el-select v-model="testPlan.projectId" slot="prepend" placeholder="请选择项目">
<el-option
v-for="item in projects"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-input>
</el-col>
<el-button type="primary" plain @click="save">保存</el-button>
<el-button type="primary" plain @click="saveAndRun">保存并执行</el-button>
<el-button type="warning" plain @click="cancel">取消</el-button>
</el-row>
<div class="main-content">
<el-card>
<el-row>
<el-col :span="10">
<el-input placeholder="请输入名称" v-model="testPlan.name" class="input-with-select">
<el-select v-model="testPlan.projectId" slot="prepend" placeholder="请选择项目">
<el-option
v-for="item in projects"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-input>
</el-col>
<el-button type="primary" plain @click="save">保存</el-button>
<el-button type="primary" plain @click="saveAndRun">保存并执行</el-button>
<el-button type="warning" plain @click="cancel">取消</el-button>
</el-row>
<el-tabs v-model="active" type="border-card" :stretch="true">
<el-tab-pane label="基础配置">
<test-plan-basic-config :test-plan="testPlan"/>
</el-tab-pane>
<el-tab-pane label="压力配置">
<test-plan-pressure-config :test-plan="testPlan"/>
</el-tab-pane>
<el-tab-pane label="高级配置">
<test-plan-advanced-config/>
</el-tab-pane>
</el-tabs>
<el-tabs v-model="active" type="border-card" :stretch="true">
<el-tab-pane label="基础配置">
<ms-test-plan-basic-config :test-plan="testPlan"/>
</el-tab-pane>
<el-tab-pane label="压力配置">
<ms-test-plan-pressure-config :test-plan="testPlan"/>
</el-tab-pane>
<el-tab-pane label="高级配置">
<ms-test-plan-advanced-config/>
</el-tab-pane>
</el-tabs>
</el-card>
</div>
</div>
</template>
<script>
import TestPlanBasicConfig from './components/BasicConfig';
import TestPlanPressureConfig from './components/PressureConfig';
import TestPlanAdvancedConfig from './components/AdvancedConfig';
import MsTestPlanBasicConfig from './components/BasicConfig';
import MsTestPlanPressureConfig from './components/PressureConfig';
import MsTestPlanAdvancedConfig from './components/AdvancedConfig';
export default {
name: "CreateTestPlan",
name: "MsEditTestPlan",
components: {
TestPlanBasicConfig,
TestPlanPressureConfig,
TestPlanAdvancedConfig,
MsTestPlanBasicConfig,
MsTestPlanPressureConfig,
MsTestPlanAdvancedConfig,
},
props: ['testPlanObj'],
data() {
@ -70,10 +74,25 @@
}]
}
},
created() {
if (this.testPlanObj) {
this.testPlan = this.testPlanObj;
watch: {
'$route'(to) {
window.console.log(to);
let testId = to.path.split('/')[2]; // find testId
this.$get('/testplan/get/' + testId, response => {
this.testPlan = response.data;
});
}
},
created() {
let testId = this.$route.path.split('/')[2];
window.console.log(testId);
if (testId) {
this.$get('/testplan/get/' + testId, response => {
this.testPlan = response.data;
});
}
this.listProjects();
},
methods: {
@ -185,9 +204,19 @@
</script>
<style>
.edit-testplan-container .el-tabs__nav {
.edit-testplan-container {
float: none;
text-align: center;
padding: 15px;
width: 100%;
height: 100%;
box-sizing: border-box;
}
.main-content {
margin: 0 auto;
width: 100%;
max-width: 1200px;
}
.edit-testplan-container .el-select .el-input {

View File

@ -1,11 +1,11 @@
<template>
<el-menu>
<el-menu router menu-trigger="click" :default-active="$route.path">
<div class="recent-text">
<i class="el-icon-time"/>
最近的测试
</div>
<el-menu-item :key="recentTestPlan.id" v-for="recentTestPlan in recentTestPlans">
{{ recentTestPlan.name }}
<el-menu-item :key="t.id" v-for="t in recentTestPlans" :index="'/editTest/' + t.id">
{{ t.name }}
</el-menu-item>
</el-menu>
</template>

View File

@ -11,7 +11,7 @@
<script>
export default {
name: "TestPlanAdvancedConfig",
name: "MsTestPlanAdvancedConfig",
data() {
return {
}

View File

@ -56,7 +56,7 @@
import {Message} from "element-ui";
export default {
name: "TestPlanBasicConfig",
name: "MsTestPlanBasicConfig",
props: ["testPlan"],
data() {
return {
@ -73,8 +73,15 @@
this.getFileMetadata(this.testPlan)
}
},
watch: {
testPlan() {
this.getFileMetadata(this.testPlan);
}
},
methods: {
getFileMetadata(testPlan) {
this.fileList = [];//
this.tableData = [];//
this.result = this.$get(this.getFileMetadataPath + "/" + testPlan.id, response => {
let file = response.data;
@ -84,7 +91,6 @@
}
this.testPlan.file = file;
this.fileList.push({
id: file.id,
name: file.name

View File

@ -92,10 +92,10 @@
<script>
export default {
name: "TestPlanPressureConfig",
props: ["testPlan"],
name: "MsTestPlanPressureConfig",
data() {
return {
testPlan: {},
threadNumber: 2,
duration: 3,
rampUpTime: 12,
@ -107,6 +107,11 @@
this.testPlan.loadConfigurationObj = [];
this.convertProperty();
},
watch: {
testPlan() {
this.convertProperty();
}
},
methods: {
convertProperty() {
/// todo4jmeter ConcurrencyThreadGroup plugin