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

Merge branch 'dev' of https://github.com/fit2cloudrd/metersphere-server into dev

This commit is contained in:
chenjianxing 2020-05-18 11:22:52 +08:00
parent 0285b4cd59 b8f65d8759
commit 64d6d11f11
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/business/components/api/report/ApiReportList.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="container" v-loading="result.loading"> <ms-container>
<div class="main-content"> <ms-main-container>
<el-card class="table-card"> <el-card class="table-card" v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="search" :title="$t('commons.test')" <ms-table-header :condition.sync="condition" @search="search" :title="$t('commons.test')"
:show-create="false"/> :show-create="false"/>
@ -76,16 +76,18 @@
<ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize" <ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
:total="total"/> :total="total"/>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader"; import MsTableHeader from "../../common/components/MsTableHeader";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
components: {MsTableHeader, MsTablePagination}, components: {MsMainContainer, MsContainer, MsTableHeader, MsTablePagination},
data() { data() {
return { return {
result: {}, result: {},

14
frontend/src/business/components/api/test/ApiTestList.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="container" v-loading="result.loading"> <ms-container>
<div class="main-content"> <ms-main-container>
<el-card class="table-card"> <el-card class="table-card" v-loading="result.loading">
<template v-slot:header> <template v-slot:header>
<ms-table-header :condition.sync="condition" @search="search" :title="$t('commons.test')" <ms-table-header :condition.sync="condition" @search="search" :title="$t('commons.test')"
@create="create" :createTip="$t('load_test.create')"/> @create="create" :createTip="$t('load_test.create')"/>
@ -81,17 +81,19 @@
<ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize" <ms-table-pagination :change="search" :current-page.sync="currentPage" :page-size.sync="pageSize"
:total="total"/> :total="total"/>
</el-card> </el-card>
</div> </ms-main-container>
</div> </ms-container>
</template> </template>
<script> <script>
import MsTablePagination from "../../common/pagination/TablePagination"; import MsTablePagination from "../../common/pagination/TablePagination";
import MsTableHeader from "../../common/components/MsTableHeader"; import MsTableHeader from "../../common/components/MsTableHeader";
import MsTableOperator from "../../common/components/MsTableOperator"; import MsTableOperator from "../../common/components/MsTableOperator";
import MsContainer from "../../common/components/MsContainer";
import MsMainContainer from "../../common/components/MsMainContainer";
export default { export default {
components: {MsTableHeader, MsTablePagination, MsTableOperator}, components: {MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, MsTableOperator},
data() { data() {
return { return {
result: {}, result: {},