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

fix: UI报告返回按钮回退到接口报告

This commit is contained in:
chenjianxing 2022-03-30 20:55:05 +08:00 committed by zhangdahai112
parent cfe0ac2b39
commit 5a49cc162a
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit b09b6bbf848442ae4fc8ba1f7fe53a0edc075036
Subproject commit c5eb8b5fe1f031aaf4082ea674b22a0832069dd9

17
frontend/src/business/components/api/automation/report/ApiReportViewHeader.vue
View File

@ -20,11 +20,12 @@
<span style="margin-left: 10px">{{$t('report.test_end_time')}}：</span>
<span class="time"> {{ report.endTime | timestampFormatDate }}</span>
</span>
<el-button v-if="!isPlan && (!debug || exportFlag) && !isTemplate" v-permission="['PROJECT_API_REPORT:READ+EXPORT']" :disabled="isReadOnly" class="export-button" plain type="primary" size="mini" @click="handleExport(report.name)" style="margin-right: 10px">
<el-button v-if="!isPlan && (!debug || exportFlag) && !isTemplate && !isUi" v-permission="['PROJECT_API_REPORT:READ+EXPORT']" :disabled="isReadOnly" class="export-button" plain type="primary" size="mini" @click="handleExport(report.name)" style="margin-right: 10px">
{{ $t('test_track.plan_view.export_report') }}
</el-button>
<el-popover
v-if="!isPlan && (!debug || exportFlag) && !isTemplate"
v-if="!isPlan && (!debug || exportFlag) && !isTemplate && !isUi"
v-permission="['PROJECT_PERFORMANCE_REPORT:READ+EXPORT']"
style="margin-right: 10px;float: right;"
placement="bottom"
@ -43,6 +44,7 @@
{{ $t('test_track.plan_view.share_report') }}
</el-button>
</el-popover>
<el-button v-if="showCancelButton" class="export-button" plain size="mini" @click="returnView()" >
{{$t('commons.cancel')}}
</el-button>
@ -91,7 +93,10 @@ export default {
} catch (e) {
return true;
}
}
},
isUi() {
return this.$route && this.$route.meta && this.$route.meta.isUi;
},
},
data() {
return {
@ -116,7 +121,11 @@ export default {
$event.target.blur();
},
returnView(){
this.$router.push('/api/automation/report');
if (this.isUi) {
this.$router.push('/ui/report');
} else {
this.$router.push('/api/automation/report');
}
},
handleShare(report) {
this.getProjectApplication();

2
frontend/src/business/components/api/automation/report/components/MetricChart.vue
View File

@ -270,7 +270,7 @@ export default {
return this.content.errorCode + " / " + this.content.totalAssertions;
},
isUi() {
return this.$route.meta && this.$route.meta.isUi;
return this.$route && this.$route.meta && this.$route.meta.isUi;
},
},
}

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 195b63f5af1fcb28a9f72ca44c1027964734988c
Subproject commit c28dc09a5f7756050c6ca368e9b9b9fdf11c6bbe