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

refactor: 执行测试之后跳转到报告查看页面

This commit is contained in:
Captain.B 2020-07-27 11:11:31 +08:00
parent 3841ff55d8
commit 62fa6fd9c6
9 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frontend/src/business/components/performance/report/PerformanceReportView.vue
View File

@ -14,11 +14,11 @@
</el-breadcrumb>
</el-row>
<el-row class="ms-report-view-btns">
<el-button :disabled="isReadOnly || status !== 'Running'" type="primary" plain size="mini"
<el-button :disabled="isReadOnly || report.status !== 'Running'" type="primary" plain size="mini"
@click="stopTest(reportId)">
{{$t('report.test_stop_now')}}
</el-button>
<el-button :disabled="isReadOnly || status !== 'Completed'" type="success" plain size="mini"
<el-button :disabled="isReadOnly || report.status !== 'Completed'" type="success" plain size="mini"
@click="rerun(testId)">
{{$t('report.test_execute_again')}}
</el-button>
@ -156,7 +156,7 @@
this.$warning(this.$t('report.generation_error'));
break;
case 'Starting':
this.$warning(this.$t('report.start_status'));
this.$alert(this.$t('report.start_status'));
break;
case 'Reporting':
case 'Running':
@ -190,26 +190,32 @@
cancelButtonText: this.$t('commons.cancel'),
type: 'warning'
}).then(() => {
this.result = this.$post('/performance/run', {id: testId, triggerMode: 'MANUAL'}, () => {
this.$success(this.$t('load_test.is_running'))
this.$router.push({path: '/performance/report/all'})
this.result = this.$post('/performance/run', {id: testId, triggerMode: 'MANUAL'}, (response) => {
this.reportId = response.data;
this.$router.push({path: '/performance/report/view/' + this.reportId})
// 注册 socket
this.initWebSocket();
})
}).catch(() => {
});
},
onOpen() {
window.console.log("open WebSocket");
window.console.log("socket opening.");
},
onError(e) {
window.console.error(e)
},
onMessage(e) {
this.$set(this.report, "refresh", e.data); // 触发刷新
this.$set(this.report, "status", 'Running');
this.initReportTimeInfo();
window.console.log('receive a message:', e.data);
},
onClose(e) {
this.$set(this.report, "refresh", e.data); // 触发刷新
this.$set(this.report, "refresh", Math.random()); // 触发刷新
this.$set(this.report, "status", 'Completed');
this.initReportTimeInfo();
window.console.log("socket closed.");
}
},
created() {

3
frontend/src/business/components/performance/report/components/ErrorLog.vue
View File

@ -153,6 +153,9 @@
watch: {
report: {
handler(val) {
if (!val.status || !val.id) {
return;
}
let status = val.status;
this.id = val.id;
if (status === "Completed" || status === "Running") {

3
frontend/src/business/components/performance/report/components/LogDetails.vue
View File

@ -80,6 +80,9 @@
watch: {
report: {
handler(val) {
if (!val.status || !val.id) {
return;
}
let status = val.status;
this.id = val.id;
if (status === "Completed" || status === "Running") {

3
frontend/src/business/components/performance/report/components/RequestStatistics.vue
View File

@ -162,6 +162,9 @@
watch: {
report: {
handler(val){
if (!val.status || !val.id) {
return;
}
let status = val.status;
this.id = val.id;
if (status === "Completed" || status === "Running") {

3
frontend/src/business/components/performance/report/components/TestOverview.vue
View File

@ -325,6 +325,9 @@
watch: {
report: {
handler(val) {
if (!val.status || !val.id) {
return;
}
let status = val.status;
this.id = val.id;
if (status === "Completed" || status === "Running") {

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

@ -4,11 +4,13 @@
<el-card v-loading="result.loading">
<el-row>
<el-col :span="10">
<el-input :disabled="isReadOnly" :placeholder="$t('load_test.input_name')" v-model="testPlan.name" class="input-with-select"
<el-input :disabled="isReadOnly" :placeholder="$t('load_test.input_name')" v-model="testPlan.name"
class="input-with-select"
maxlength="30" show-word-limit
>
<template v-slot:prepend>
<el-select :disabled="isReadOnly" v-model="testPlan.projectId" :placeholder="$t('load_test.select_project')">
<el-select :disabled="isReadOnly" v-model="testPlan.projectId"
:placeholder="$t('load_test.select_project')">
<el-option
v-for="item in projects"
:key="item.id"
@ -21,10 +23,13 @@
</el-col>
<el-col :span="12" :offset="2">
<el-button :disabled="isReadOnly" type="primary" plain @click="save">{{$t('commons.save')}}</el-button>
<el-button :disabled="isReadOnly" type="primary" plain @click="saveAndRun">{{$t('load_test.save_and_run')}}</el-button>
<el-button :disabled="isReadOnly" type="primary" plain @click="saveAndRun">
{{$t('load_test.save_and_run')}}
</el-button>
<el-button :disabled="isReadOnly" type="warning" plain @click="cancel">{{$t('commons.cancel')}}</el-button>
<ms-schedule-config :schedule="testPlan.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule" :check-open="checkScheduleEdit" :custom-validate="durationValidate"/>
<ms-schedule-config :schedule="testPlan.schedule" :save="saveCronExpression" @scheduleChange="saveSchedule"
:check-open="checkScheduleEdit" :custom-validate="durationValidate"/>
</el-col>
</el-row>
@ -34,7 +39,8 @@
<performance-basic-config :is-read-only="isReadOnly" :test-plan="testPlan" ref="basicConfig"/>
</el-tab-pane>
<el-tab-pane :label="$t('load_test.pressure_config')">
<performance-pressure-config :is-read-only="isReadOnly" :test-plan="testPlan" :test-id="testId" ref="pressureConfig" @changeActive="changeTabActive"/>
<performance-pressure-config :is-read-only="isReadOnly" :test-plan="testPlan" :test-id="testId"
ref="pressureConfig" @changeActive="changeTabActive"/>
</el-tab-pane>
<el-tab-pane :label="$t('load_test.advanced_config')" class="advanced-config">
<performance-advanced-config :read-only="isReadOnly" :test-id="testId" ref="advancedConfig"/>
@ -67,7 +73,7 @@
data() {
return {
result: {},
testPlan: {schedule:{}},
testPlan: {schedule: {}},
listProjectPath: "/project/listAll",
savePath: "/performance/save",
editPath: "/performance/edit",
@ -177,9 +183,10 @@
this.result = this.$request(options, (response) => {
this.testPlan.id = response.data;
this.$success(this.$t('commons.save_success'));
this.result = this.$post(this.runPath, {id: this.testPlan.id, triggerMode: 'MANUAL'}, () => {
this.result = this.$post(this.runPath, {id: this.testPlan.id, triggerMode: 'MANUAL'}, (response) => {
this.$success(this.$t('load_test.is_running'))
this.$router.push({path: '/performance/report/all'})
let reportId = response.data;
this.$router.push({path: '/performance/report/view/' + reportId})
})
});
},
@ -249,7 +256,7 @@
return true;
},
changeTabActive(activeName) {
this.$nextTick(()=> {
this.$nextTick(() => {
this.active = activeName;
});
},

2
frontend/src/i18n/en-US.js
View File

@ -258,7 +258,7 @@ export default {
generation_error: 'Report generation error, cannot be viewed!',
being_generated: 'Report is being generated...',
delete_confirm: 'Confirm delete: ',
start_status: 'The test is starting, please check the report later!',
start_status: 'The test is in the beginning state, we will automatically display it on the page after we generate the report!',
run_status: 'The test is running, please check the report later！',
user_name: 'Creator',
project_name: 'Project Name'

2
frontend/src/i18n/zh-CN.js
View File

@ -256,7 +256,7 @@ export default {
generation_error: '报告生成错误,无法查看!',
being_generated: '报告正在生成中...',
delete_confirm: '确认删除报告: ',
start_status: '测试处于开始状态,请稍后查看报告！',
start_status: '测试处于开始状态, 我们生成报告后会自动展示到页面上！',
run_status: '测试处于运行状态,请稍后查看报告！',
user_name: '创建人',
project_name: '所属项目',

2
frontend/src/i18n/zh-TW.js
View File

@ -256,7 +256,7 @@ export default {
generation_error: '報告生成錯誤,無法查看!',
being_generated: '報告正在生成中...',
delete_confirm: '確認刪除報告: ',
start_status: '測試處於開始狀態,請稍後查看報告！',
start_status: '測試處於開始狀態, 我們生成報告後會自動展示到頁面上！',
run_status: '測試處於運行狀態,請稍後查看報告！',
user_name: '創建人',
project_name: '所屬項目'