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

fix(性能测试): 取消默认的超时设置，使用jmeter默认的配置 

Closes #2723
This commit is contained in:
Captain.B 2021-05-12 13:16:31 +08:00 committed by 刘瑞斌
parent 3fc66408ac
commit b84c3cc725
1 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
frontend/src/business/components/performance/test/components/PerformanceAdvancedConfig.vue
View File

@ -81,7 +81,8 @@
<div>{{ $t('load_test.connect_timeout') }}</div> <div>{{ $t('load_test.connect_timeout') }}</div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input-number :disabled="readOnly" size="mini" v-model="timeout" :min="10" <el-input-number :disabled="readOnly" size="mini" v-model="timeout"
:min="0"
:max="100000"></el-input-number> :max="100000"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -95,7 +96,8 @@
<div>{{ $t('load_test.response_timeout') }}</div> <div>{{ $t('load_test.response_timeout') }}</div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input-number :disabled="readOnly" size="mini" v-model="responseTimeout"></el-input-number> <el-input-number :disabled="readOnly" size="mini" :min="0"
v-model="responseTimeout"></el-input-number>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
ms ms
@ -141,7 +143,8 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select v-model="granularity" :placeholder="$t('commons.please_select')" size="mini" clearable> <el-select v-model="granularity" :placeholder="$t('commons.please_select')" size="mini" clearable>
<el-option v-for="op in granularityData" :key="op.granularity" :label="op.granularity" :value="op.granularity"></el-option> <el-option v-for="op in granularityData" :key="op.granularity" :label="op.granularity"
:value="op.granularity"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -163,26 +166,26 @@
prop="name" prop="name"
label="名称"> label="名称">
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- align="center"--> <!-- align="center"-->
<!-- prop="environmentName"--> <!-- prop="environmentName"-->
<!-- label="所属环境">--> <!-- label="所属环境">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- align="center"--> <!-- align="center"-->
<!-- prop="authStatus"--> <!-- prop="authStatus"-->
<!-- label="认证状态">--> <!-- label="认证状态">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- align="center"--> <!-- align="center"-->
<!-- prop="monitorStatus"--> <!-- prop="monitorStatus"-->
<!-- label="监控状态">--> <!-- label="监控状态">-->
<el-table-column <el-table-column
align="center" align="center"
prop="ip" prop="ip"
label="IP"> label="IP">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
prop="port" prop="port"
label="Port"> label="Port">
@ -218,8 +221,8 @@ export default {
components: {EditMonitor, MsTableOperatorButton}, components: {EditMonitor, MsTableOperatorButton},
data() { data() {
return { return {
timeout: 60000, timeout: undefined,
responseTimeout: 60000, responseTimeout: undefined,
statusCode: [], statusCode: [],
domains: [], domains: [],
params: [], params: [],
@ -237,7 +240,7 @@ export default {
{start: 60001, end: 180000, granularity: 1800}, {start: 60001, end: 180000, granularity: 1800},
{start: 180001, end: 360000, granularity: 3600}, {start: 180001, end: 360000, granularity: 3600},
] ]
} };
}, },
props: { props: {
readOnly: { readOnly: {
@ -263,7 +266,7 @@ export default {
this.$get('/performance/get-advanced-config/' + this.testId, (response) => { this.$get('/performance/get-advanced-config/' + this.testId, (response) => {
if (response.data) { if (response.data) {
let data = JSON.parse(response.data); let data = JSON.parse(response.data);
this.timeout = data.timeout || 10; this.timeout = data.timeout;
this.responseTimeout = data.responseTimeout; this.responseTimeout = data.responseTimeout;
this.statusCode = data.statusCode || []; this.statusCode = data.statusCode || [];
this.statusCodeStr = this.statusCode.join(','); this.statusCodeStr = this.statusCode.join(',');
@ -293,7 +296,7 @@ export default {
} }
}, },
edit(row) { edit(row) {
row.edit = !row.edit row.edit = !row.edit;
}, },
del(row, dataName, index) { del(row, dataName, index) {
this[dataName].splice(index, 1); this[dataName].splice(index, 1);
@ -374,7 +377,7 @@ export default {
}, },
} }
} };
</script> </script>
<style scoped> <style scoped>