From dee61337136192f456e167807f41d83909204760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 1 Aug 2022 20:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmTestPlan/rpt/CompsCard.vue      | 20 +++++++++++--------
 src/views/xm/core/xmTestPlan/rpt/index.vue    |  6 ++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
index ee451e52..c760d3a8 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
@@ -1,11 +1,12 @@
 <template>
-    <el-row v-if="rptConfigVisible">
-        <el-col :span="6">
+<section>
+    <el-row v-if="rptConfigVisible"  class="page-center border">
+        <el-col :span="6" :style="{height:maxTableHeight+'px',overflow:'auto'}">
             <comps-set :comp-ids="compIds"></comps-set>
         </el-col>
-        <el-col :span="18">
+        <el-col :span="18" :style="{height:maxTableHeight+'px',overflow:'auto'}" ref="table">
             <div>
-                <div class="empty" v-if="layout.length == 0">
+                <div class="empty" v-if="layout.length == 0" >
                     <el-empty description="暂未选择模块"></el-empty>
                 </div>
                 <div v-else style="width: 100%; min-height: 800px; margin-top: 10px">
@@ -35,16 +36,17 @@
             </div>
         </el-col> 
     </el-row>
-    <el-row v-else class="page-center border">
+    <el-row v-if="rptConfigVisible==false" :style="{height:maxTableHeight+'px',overflow:'auto'}" ref="table" class="page-center border"> 
         <el-row v-for="(item,index) in layout" :key="index">
-             <component :is="item.compId"></component>
+            <component :is="item.compId"></component>
         </el-row>
-    </el-row>
-   
+    </el-row> 
+    </section>
 </template>
 
 <script>  
  
+import util from '@/common/js/util';//全局公共库
 import VueGridLayout from 'vue-grid-layout';
 import { mapGetters } from 'vuex'
 import XmTestPlanMng from '@/views/xm/core/xmTestPlan/XmTestPlanMng'
@@ -82,6 +84,7 @@ export default {
     data() {
         return {
             xmRptConfig:null,
+            maxTableHeight:300,
             // 布局位置数据
             layout: [
                  { 
@@ -140,6 +143,7 @@ export default {
     mounted() {
         this.$nextTick(() => {
              
+            this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
         })
     },
 
diff --git a/src/views/xm/core/xmTestPlan/rpt/index.vue b/src/views/xm/core/xmTestPlan/rpt/index.vue
index cde4db75..d9a36be9 100644
--- a/src/views/xm/core/xmTestPlan/rpt/index.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/index.vue
@@ -40,12 +40,10 @@ export default {
 
 
   mounted() {
-
+    
   }
 }
 </script>
 
-<style lang="scss" scoped>
-@import './common.scss';
-@import './index.scss';
+<style lang="scss" scoped> 
 </style>