fix(接口自动化,测试计划): 并行模式增加资源池选项。

This commit is contained in:
fit2-zhao 2021-06-02 14:49:52 +08:00 committed by fit2-zhao
parent a6ead63694
commit 43d293f2f5
2 changed files with 54 additions and 3 deletions

View File

@ -7,7 +7,7 @@
> >
<div> <div>
<span class="ms-mode-span">{{ $t("run_mode.title") }}</span> <span class="ms-mode-span">{{ $t("run_mode.title") }}</span>
<el-radio-group v-model="runConfig.mode"> <el-radio-group v-model="runConfig.mode" @change="changeMode">
<el-radio label="serial">{{ $t("run_mode.serial") }}</el-radio> <el-radio label="serial">{{ $t("run_mode.serial") }}</el-radio>
<el-radio label="parallel">{{ $t("run_mode.parallel") }}</el-radio> <el-radio label="parallel">{{ $t("run_mode.parallel") }}</el-radio>
</el-radio-group> </el-radio-group>
@ -39,8 +39,28 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="ms-mode-div" v-if="runConfig.mode === 'parallel'">
<el-row>
<el-col :span="6">
<span class="ms-mode-span">{{ $t("run_mode.other_config") }}</span>
</el-col>
<el-col :span="18">
<el-checkbox v-model="runConfig.runWithinResourcePool" style="padding-right: 10px;">
{{ $t('run_mode.run_with_resource_pool') }}
</el-checkbox>
<el-select :disabled="!runConfig.runWithinResourcePool" v-model="runConfig.resourcePoolId" size="mini">
<el-option
v-for="item in resourcePools"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-col>
</el-row>
</div>
<div class="ms-mode-div" v-if="runConfig.reportType === 'setReport' && runConfig.mode==='serial'"> <div class="ms-mode-div" v-if="runConfig.reportType === 'setReport' && runConfig.mode==='serial'">
<span class="ms-mode-span">{{ $t("run_mode.report_name") }}</span> <span class="ms-mode-span">{{ $t("run_mode.report_name") }}</span>
<el-input <el-input
@ -81,6 +101,10 @@ export default {
this.runModeVisible = true; this.runModeVisible = true;
this.getResourcePools(); this.getResourcePools();
}, },
changeMode() {
this.runConfig.runWithinResourcePool = false;
this.runConfig.resourcePoolId = null;
},
close() { close() {
this.runConfig = { this.runConfig = {
mode: "serial", mode: "serial",

View File

@ -7,7 +7,7 @@
> >
<div> <div>
<span class="ms-mode-span">{{ $t("run_mode.title") }}</span> <span class="ms-mode-span">{{ $t("run_mode.title") }}</span>
<el-radio-group v-model="runConfig.mode"> <el-radio-group v-model="runConfig.mode" @change="changeMode">
<el-radio label="serial">{{ $t("run_mode.serial") }}</el-radio> <el-radio label="serial">{{ $t("run_mode.serial") }}</el-radio>
<el-radio label="parallel">{{ $t("run_mode.parallel") }}</el-radio> <el-radio label="parallel">{{ $t("run_mode.parallel") }}</el-radio>
</el-radio-group> </el-radio-group>
@ -37,6 +37,28 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div class="ms-mode-div" v-if="runConfig.mode === 'parallel'">
<el-row>
<el-col :span="6">
<span class="ms-mode-span">{{ $t("run_mode.other_config") }}</span>
</el-col>
<el-col :span="18">
<div v-if="testType === 'API'">
<el-checkbox v-model="runConfig.runWithinResourcePool" style="padding-right: 10px;">
{{ $t('run_mode.run_with_resource_pool') }}
</el-checkbox>
<el-select :disabled="!runConfig.runWithinResourcePool" v-model="runConfig.resourcePoolId" size="mini">
<el-option
v-for="item in resourcePools"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</div>
</el-col>
</el-row>
</div>
<template v-slot:footer> <template v-slot:footer>
<ms-dialog-footer @cancel="close" @confirm="handleRunBatch"/> <ms-dialog-footer @cancel="close" @confirm="handleRunBatch"/>
</template> </template>
@ -69,6 +91,11 @@ export default {
this.testType = testType; this.testType = testType;
this.getResourcePools(); this.getResourcePools();
}, },
changeMode() {
this.runConfig.onSampleError = false;
this.runConfig.runWithinResourcePool = false;
this.runConfig.resourcePoolId = null;
},
close() { close() {
this.runConfig = { this.runConfig = {
mode: "serial", mode: "serial",