From 47b54af1348d6a1d6b84266c8f30e69639d4efce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 3 Mar 2022 18:04:03 +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

---
 src/views/xm/core/xmIteration/XmIterationOverview.vue | 6 ++++--
 src/views/xm/core/xmProject/XmProjectOverview.vue     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index debe7a6a..4769b7a9 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="page-container padding">
-    <el-row class="page-main " style="overflow-x: hidden;">
+    <el-row class="page-main " :style="{overflowX: 'hidden',height:maxTableHeight+'px'}" ref="table">
       <el-row style="margin-bottom:10px">
         <el-card class="box-card" style="padding:0px ;height:100px">
           <div>
@@ -317,6 +317,7 @@ export default {
   data() {
     return {
       isActive: true,
+      maxTableHeight:300,
       };
   },
 
@@ -573,7 +574,8 @@ export default {
   },
 
   mounted() {
-    this.$nextTick(() => {
+    this.$nextTick(() => { 
+      this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
     });
     this.drawAllBar();
     this.drawPieBug();
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index 003a2d6f..318d7183 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="page-container padding">
-    <el-row class="page-main " style="overflow-x: hidden;">
+    <el-row class="page-main " :style="{overflowX: 'hidden',height:maxTableHeight+'px'}" ref="table">
       <el-row style="margin-bottom:10px">
         <el-card class="box-card" style="padding:0px ;height:100px">
           <div>
@@ -364,6 +364,7 @@ export default {
   data() {
     return {
       isActive: true,
+      maxTableHeight:300,
       options:{
         projectType:[],
         urgencyLevel:[],
@@ -755,6 +756,7 @@ export default {
 
   mounted() {
     this.$nextTick(() => {
+      this.maxTableHeight=util.calcTableMaxHeight(this.$refs.table.$el)
     });
     listOption([{categoryId:'all',itemCode:'projectType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'},{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
       if(res.data.tips.isOk){