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

ms-container

This commit is contained in:
shiziyuan9527 2020-05-18 11:37:33 +08:00
parent 64d6d11f11
commit 926d1bad1e
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<template> <template>
<div v-loading="result.loading" class="container"> <ms-container>
<div class="main-content"> <ms-main-container>
<el-card> <el-card v-loading="result.loading">
<el-row> <el-row>
<el-col :span="16"> <el-col :span="16">
<el-row> <el-row>
@ -51,8 +51,8 @@
</el-tabs> </el-tabs>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
@ -60,6 +60,8 @@
import MsReportLogDetails from './components/LogDetails'; import MsReportLogDetails from './components/LogDetails';
import MsReportRequestStatistics from './components/RequestStatistics'; import MsReportRequestStatistics from './components/RequestStatistics';
import MsReportTestOverview from './components/TestOverview'; import MsReportTestOverview from './components/TestOverview';
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
name: "PerformanceReportView", name: "PerformanceReportView",
@ -67,7 +69,9 @@
MsReportErrorLog, MsReportErrorLog,
MsReportLogDetails, MsReportLogDetails,
MsReportRequestStatistics, MsReportRequestStatistics,
MsReportTestOverview MsReportTestOverview,
MsContainer,
MsMainContainer
}, },
data() { data() {
return { return {

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

@ -1,8 +1,7 @@
<template> <template>
<div class="container" v-loading="result.loading"> <ms-container>
<ms-main-container>
<div class="main-content"> <el-card class="table-card" v-loading="result.loading">
<el-card class="table-card">
<template v-slot:header> <template v-slot:header>
<div> <div>
<el-row type="flex" justify="space-between" align="middle"> <el-row type="flex" justify="space-between" align="middle">
@ -84,17 +83,18 @@
<ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize" <ms-table-pagination :change="initTableData" :current-page.sync="currentPage" :page-size.sync="pageSize"
:total="total"/> :total="total"/>
</el-card> </el-card>
</div> </ms-main-container>
</ms-container>
</div>
</template> </template>
<script> <script>
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
name: "PerformanceTestReport", name: "PerformanceTestReport",
components: {MsTablePagination}, components: {MsTablePagination, MsContainer, MsMainContainer},
created: function () { created: function () {
this.initTableData(); this.initTableData();
}, },

2
frontend/src/business/components/project/MsProject.vue
View File

@ -9,7 +9,7 @@
<el-table :data="items" style="width: 100%"> <el-table :data="items" style="width: 100%">
<el-table-column prop="name" :label="$t('commons.name')"/> <el-table-column prop="name" :label="$t('commons.name')"/>
<el-table-column prop="description" :label="$t('commons.description')"/> <el-table-column prop="description" :label="$t('commons.description')"/>
<el-table-column prop="workspaceName" label="所属工作空间"/> <el-table-column prop="workspaceName" :label="$t('project.owning_workspace')"/>
<el-table-column> <el-table-column>
<template v-slot:default="scope"> <template v-slot:default="scope">
<ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/> <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>

2
frontend/src/business/components/settings/Setting.vue
View File

@ -35,7 +35,7 @@
padding: 20px; padding: 20px;
} }
.ms-main-container { ms-main-container {
height: calc(100vh - 40px); height: calc(100vh - 40px);
} }