From 1d0a98200191ff923cfc2e530c3c245d77d2371e 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 11:21:25 +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/xmProduct/XmProductOverview.vue | 6 ++++--
 src/views/xm/core/xmProject/XmProjectMng.vue      | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
index bc002770..82129329 100644
--- a/src/views/xm/core/xmProduct/XmProductOverview.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="page-container padding">
-    <el-row class="page-main page-height-70" style="overflow-x: hidden;">
+    <el-row class="page-main" :style="{overflowX:'hidden',height:maxTableHeight+'px'}" ref="pageMainRef">
       <el-row style="margin-bottom:10px">
         <el-card class="box-card" style="padding:0px ;height:100px">
           <div>
@@ -339,7 +339,8 @@ export default {
       isActive: true,
       options:{
         xmProductPstatus:[]
-      }
+      },
+      maxTableHeight:300,
     };
   },
 
@@ -603,6 +604,7 @@ export default {
 				}
 			});
     this.$nextTick(() => {
+      this.maxTableHeight=util.calcTableMaxHeight(this.$refs.pageMainRef.$el)
     });
     this.drawAllBar();
     this.drawPieBug();
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index abc9c3fd..cff2768b 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -78,7 +78,7 @@
 				</el-row> 
 				<el-row  class="page-main"> 
 					<!--列表 XmProject xm_project-->
-					<el-row v-show="showType" v-loading="load.list" :style="{overflow:'auto'}" class="page-height-70">
+					<el-row v-show="showType" v-loading="load.list" :style="{overflowX:'hidden',height:maxTableHeight+'px'}" ref="table1">
 						<el-col  v-cloak v-for="(p,i) in ScreenData" :key="i" :xl="8" :lg="8" :md="8" :sm="12">
 							<el-card @click.native="intoInfo(p,i)" class="project-card" shadow="always">
 								<div class="project-name" title="这是项目名称">{{p.name}}</div>
@@ -744,7 +744,7 @@
 				this.filters.productName=this.$route.params.productName;
 			}
 			this.$nextTick(() => {  
-                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table1.$el);
 				this.showInfo = false;
 				this.getXmProjects();
 			});