From 926d1bad1eab3d26eac26727fe7f625667da2abc Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 18 May 2020 11:37:33 +0800
Subject: [PATCH] ms-container

---
 .../performance/report/PerformanceReportView.vue | 16 ++++++++++------
 .../performance/report/PerformanceTestReport.vue | 16 ++++++++--------
 .../business/components/project/MsProject.vue    |  2 +-
 .../src/business/components/settings/Setting.vue |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 2382d4640a..1e06df3e67 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -1,7 +1,7 @@
 <template>
-  <div v-loading="result.loading" class="container">
-    <div class="main-content">
-      <el-card>
+  <ms-container>
+    <ms-main-container>
+      <el-card v-loading="result.loading">
         <el-row>
           <el-col :span="16">
             <el-row>
@@ -51,8 +51,8 @@
         </el-tabs>
 
       </el-card>
-    </div>
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
@@ -60,6 +60,8 @@
   import MsReportLogDetails from './components/LogDetails';
   import MsReportRequestStatistics from './components/RequestStatistics';
   import MsReportTestOverview from './components/TestOverview';
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
 
   export default {
     name: "PerformanceReportView",
@@ -67,7 +69,9 @@
       MsReportErrorLog,
       MsReportLogDetails,
       MsReportRequestStatistics,
-      MsReportTestOverview
+      MsReportTestOverview,
+      MsContainer,
+      MsMainContainer
     },
     data() {
       return {
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
index df2a2c990b..ac0c9678d9 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
@@ -1,8 +1,7 @@
 <template>
-  <div class="container" v-loading="result.loading">
-
-    <div class="main-content">
-      <el-card class="table-card">
+  <ms-container>
+    <ms-main-container>
+      <el-card class="table-card" v-loading="result.loading">
         <template v-slot:header>
           <div>
             <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"
                              :total="total"/>
       </el-card>
-    </div>
-
-  </div>
+    </ms-main-container>
+  </ms-container>
 </template>
 
 <script>
   import MsTablePagination from "../../common/pagination/TablePagination";
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
 
   export default {
     name: "PerformanceTestReport",
-    components: {MsTablePagination},
+    components: {MsTablePagination, MsContainer, MsMainContainer},
     created: function () {
       this.initTableData();
     },
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index e32b67c07b..5ae40e20a3 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -9,7 +9,7 @@
         <el-table :data="items" style="width: 100%">
           <el-table-column prop="name" :label="$t('commons.name')"/>
           <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>
             <template v-slot:default="scope">
               <ms-table-operator @editClick="edit(scope.row)" @deleteClick="del(scope.row)"/>
diff --git a/frontend/src/business/components/settings/Setting.vue b/frontend/src/business/components/settings/Setting.vue
index c171c4f9eb..7f98f9b560 100644
--- a/frontend/src/business/components/settings/Setting.vue
+++ b/frontend/src/business/components/settings/Setting.vue
@@ -35,7 +35,7 @@
     padding: 20px;
   }
 
-  .ms-main-container {
+  ms-main-container {
     height: calc(100vh - 40px);
   }