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

Merge branch 'v1.1' of https://github.com/metersphere/server into v1.1

This commit is contained in:
chenjianxing 2020-07-21 00:48:24 +08:00
parent c052d1ea95 29b1aabe0b
commit a52e45cc20
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/business/components/performance/test/EditPerformanceTestPlan.vue
View File

@ -126,8 +126,8 @@
importAPITest() { importAPITest() {
let apiTest = this.$store.state.api.test; let apiTest = this.$store.state.api.test;
if (apiTest && apiTest.name) { if (apiTest && apiTest.name) {
this.testPlan.projectId = apiTest.projectId; this.$set(this.testPlan, "projectId", apiTest.projectId);
this.testPlan.name = apiTest.name; this.$set(this.testPlan, "name", apiTest.name);
let blob = new Blob([apiTest.jmx.xml], {type: "application/octet-stream"}); let blob = new Blob([apiTest.jmx.xml], {type: "application/octet-stream"});
let file = new File([blob], apiTest.jmx.name); let file = new File([blob], apiTest.jmx.name);
this.$refs.basicConfig.beforeUpload(file); this.$refs.basicConfig.beforeUpload(file);

2
frontend/src/business/components/track/plan/view/comonents/test/PerformanceTestDetail.vue
View File

@ -103,7 +103,7 @@
} }
}, },
runTest() { runTest() {
this.result = this.$post(this.runPath, {id: this.test.id}, (response) => { this.result = this.$post(this.runPath, {id: this.test.id, triggerMode: 'MANUAL'}, (response) => {
this.$success(this.$t('load_test.is_running')); this.$success(this.$t('load_test.is_running'));
this.$emit('runTest', response.data); this.$emit('runTest', response.data);
}); });