From 1f69bad623dee1eff7987bbdb7bd2e1600838a97 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Mon, 22 Nov 2021 12:22:55 +0800
Subject: [PATCH] =?UTF-8?q?style(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/components/MsAsideContainer.vue    |  2 +-
 .../track/plan/view/TestPlanView.vue          |  9 -------
 .../base/TestPlanCommonComponent.vue          | 26 ++++++++++++++-----
 .../report/detail/TestPlanReportContent.vue   | 17 +++++++++---
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsAsideContainer.vue b/frontend/src/business/components/common/components/MsAsideContainer.vue
index 2ae24cb1b9..89ae3b55a8 100644
--- a/frontend/src/business/components/common/components/MsAsideContainer.vue
+++ b/frontend/src/business/components/common/components/MsAsideContainer.vue
@@ -10,7 +10,7 @@
       <i v-if="!asideHidden" class="el-icon-arrow-left"/>
       <i v-if="asideHidden" class="el-icon-arrow-right"/>
     </div>
-    <div style="overflow: scroll" :style="{'height': containerCalHeight }">
+    <div style="overflow: scroll" class="ms-aside-node-tree" :style="{'height': containerCalHeight }">
       <slot></slot>
     </div>
     <ms-horizontal-drag-bar/>
diff --git a/frontend/src/business/components/track/plan/view/TestPlanView.vue b/frontend/src/business/components/track/plan/view/TestPlanView.vue
index a0a46d1be0..6a3dc17f1b 100644
--- a/frontend/src/business/components/track/plan/view/TestPlanView.vue
+++ b/frontend/src/business/components/track/plan/view/TestPlanView.vue
@@ -142,15 +142,6 @@ export default {
   display: inline-block;
 }
 
-/*/deep/ .ms-main-container {*/
-/*  height: calc(100vh - 80px - 53px);*/
-/*}*/
-
-/*/deep/ .ms-aside-container {*/
-/*  height: calc(100vh - 80px - 53px);*/
-/*  margin-top: 1px;*/
-/*}*/
-
 .header-menu.el-menu--horizontal > li {
   height: 49px;
   line-height: 50px;
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestPlanCommonComponent.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestPlanCommonComponent.vue
index c0dbcb6ff2..7ed9c4ec62 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestPlanCommonComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestPlanCommonComponent.vue
@@ -15,15 +15,27 @@
 </template>
 
 <script>
-    import MsMainContainer from "../../../../../common/components/MsMainContainer";
-    import MsAsideContainer from "../../../../../common/components/MsAsideContainer";
-    import MsContainer from "../../../../../common/components/MsContainer";
-    export default {
-        name: "MsTestPlanCommonComponent",
-      components: {MsContainer, MsAsideContainer, MsMainContainer}
-    }
+import MsMainContainer from "../../../../../common/components/MsMainContainer";
+import MsAsideContainer from "../../../../../common/components/MsAsideContainer";
+import MsContainer from "../../../../../common/components/MsContainer";
+
+export default {
+  name: "MsTestPlanCommonComponent",
+  components: {MsContainer, MsAsideContainer, MsMainContainer}
+};
 </script>
 
 <style scoped>
 
+.ms-main-container {
+  height: calc(100vh - 132px) !important;
+}
+
+.ms-aside-container {
+  height: calc(100vh - 132px) !important;
+}
+
+.ms-aside-container >>> .ms-aside-node-tree {
+  height: calc(100vh - 145px) !important;
+}
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
index 1c6be8da83..f62cef79bd 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="container">
-    <el-main>
+  <ms-container>
+    <ms-main-container>
       <el-card v-loading="result ? result.loading : false">
         <test-plan-report-buttons :is-db="isDb" :plan-id="planId" :is-share="isShare" :report="report"
                                   v-if="!isTemplate && !isShare"/>
@@ -10,7 +10,7 @@
         <test-plan-api-report v-if="apiEnable" :is-db="isDb" :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
         <test-plan-load-report v-if="loadEnable" :is-db="isDb" :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
       </el-card>
-    </el-main>
+    </ms-main-container>
     <test-plan-report-navigation-bar
       :api-enable="apiEnable"
       :summary-enable="summaryEnable"
@@ -18,7 +18,7 @@
       :load-enable="loadEnable"
       :overview-enable="overviewEnable"
       :is-template="isTemplate"/>
-  </div>
+  </ms-container>
 </template>
 
 <script>
@@ -41,9 +41,13 @@ import TestPlanSummaryReport from "@/business/components/track/plan/view/comonen
 import TestPlanReportButtons from "@/business/components/track/plan/view/comonents/report/detail/TestPlanReportButtons";
 import TestPlanReportNavigationBar
   from "@/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar";
+import MsContainer from "@/business/components/common/components/MsContainer";
+import MsMainContainer from "@/business/components/common/components/MsMainContainer";
 export default {
   name: "TestPlanReportContent",
   components: {
+    MsMainContainer,
+    MsContainer,
     TestPlanReportNavigationBar,
     TestPlanReportButtons,
     TestPlanSummaryReport,
@@ -224,6 +228,11 @@ export default {
 </script>
 
 <style scoped>
+
+.ms-main-container {
+  height: calc(100vh - 132px);
+}
+
 .el-card {
   /*width: 95% !important;*/
   padding: 15px;