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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
q4speed 2020-05-18 15:32:44 +08:00
parent bb7d818a33 515dc1cf3d
commit 7991950025
6 changed files with 93 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/business/components/performance/home/PerformanceReportRecentList.vue
View File

@ -21,7 +21,7 @@
</el-table-column>
<el-table-column prop="status" :label="$t('commons.status')">
<template v-slot:default="{row}">
{{row.status}}
<ms-performance-report-status :row="row"/>
</template>
</el-table-column>
</el-table>
@ -30,8 +30,11 @@
<script>
import MsPerformanceReportStatus from "../report/PerformanceReportStatus";
export default {
name: "MsPerformanceReportRecentList",
components: {MsPerformanceReportStatus},
data() {
return {
result: {},

6
frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
View File

@ -22,8 +22,7 @@
</el-table-column>
<el-table-column prop="status" :label="$t('commons.status')">
<template v-slot:default="{row}">
<!-- <ms-api-test-status :row="row"/>-->
{{row.status}}
<ms-performance-test-status :row="row"/>
</template>
</el-table-column>
</el-table>
@ -32,8 +31,11 @@
<script>
import MsPerformanceTestStatus from "../test/PerformanceTestStatus";
export default {
name: "MsPerformanceTestRecentList",
components: {MsPerformanceTestStatus},
data() {
return {
result: {},

41
frontend/src/business/components/performance/report/PerformanceReportStatus.vue Normal file
View File

@ -0,0 +1,41 @@
<template>
<div>
<el-tag size="mini" type="primary" v-if="row.status === 'Starting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="info" v-else-if="row.status === 'Completed'">
{{ row.status }}
</el-tag>
<el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
<template v-slot:content>
<div>{{row.description}}</div>
</template>
<el-tag size="mini" type="danger">
{{ row.status }}
</el-tag>
</el-tooltip>
<span v-else>
{{ row.status }}
</span>
</div>
</template>
<script>
export default {
name: "MsPerformanceReportStatus",
props: {
row: Object
}
}
</script>
<style scoped>
</style>

27
frontend/src/business/components/performance/report/PerformanceTestReport.vue
View File

@ -46,29 +46,7 @@
prop="status"
:label="$t('commons.status')">
<template v-slot:default="{row}">
<el-tag size="mini" type="primary" v-if="row.status === 'Starting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="info" v-else-if="row.status === 'Completed'">
{{ row.status }}
</el-tag>
<el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
<template v-slot:content>
<div>{{row.description}}</div>
</template>
<el-tag size="mini" type="danger">
{{ row.status }}
</el-tag>
</el-tooltip>
<span v-else>
{{ row.status }}
</span>
<ms-performance-report-status :row="row"/>
</template>
</el-table-column>
<el-table-column
@ -91,10 +69,11 @@
import MsTablePagination from "../../common/pagination/TablePagination";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
import MsPerformanceReportStatus from "./PerformanceReportStatus";
export default {
name: "PerformanceTestReport",
components: {MsTablePagination, MsContainer, MsMainContainer},
components: {MsPerformanceReportStatus, MsTablePagination, MsContainer, MsMainContainer},
created: function () {
this.initTableData();
},

29
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
View File

@ -46,32 +46,7 @@
prop="status"
:label="$t('commons.status')">
<template v-slot:default="{row}">
<el-tag size="mini" type="info" v-if="row.status === 'Saved'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="primary" v-else-if="row.status === 'Starting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="info" v-else-if="row.status === 'Completed'">
{{ row.status }}
</el-tag>
<el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
<template v-slot:content>
<div>{{row.description}}</div>
</template>
<el-tag size="mini" type="danger">
{{ row.status }}
</el-tag>
</el-tooltip>
<span v-else>
{{ row.status }}
</span>
<ms-performance-test-status :row="row"/>
</template>
</el-table-column>
<el-table-column
@ -94,9 +69,11 @@
import MsTableOperator from "../../common/components/MsTableOperator";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
import MsPerformanceTestStatus from "./PerformanceTestStatus";
export default {
components: {
MsPerformanceTestStatus,
MsTablePagination,
MsTableOperator,
MsContainer,

38
frontend/src/business/components/performance/test/PerformanceTestStatus.vue Normal file
View File

@ -0,0 +1,38 @@
<template>
<div>
<el-tag size="mini" type="primary" v-if="row.status === 'Starting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
{{ row.status }}
</el-tag>
<el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
<template v-slot:content>
<div>{{row.description}}</div>
</template>
<el-tag size="mini" type="danger">
{{ row.status }}
</el-tag>
</el-tooltip>
<el-tag size="mini" type="info">
{{ row.status }}
</el-tag>
</div>
</template>
<script>
export default {
name: "MsPerformanceTestStatus",
props: {
row: Object
}
}
</script>
<style scoped>
</style>