From 02a0b94b619f6803ceeae0c9d4ec80f6c65a2f5c 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, 11 Jul 2022 09:26:16 +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/common/js/util.js                         |  8 +++-----
 src/views/xm/core/xmProject/XmProjectInfo.vue | 11 +++++++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/common/js/util.js b/src/common/js/util.js
index dab154d8..c487b105 100644
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -78,13 +78,11 @@ export default {
     if(typeof cssSelector == 'string'){
       table=document.querySelector(cssSelector);
     }
+    debugger;
     var innerHeight=window.innerHeight  
     var defaultInnerHeight=913;  
-    var pageHeight=90/defaultInnerHeight*innerHeight
-    if(innerHeight<defaultInnerHeight){
-      pageHeight=90
-    }
-    var top=200/defaultInnerHeight*innerHeight;
+    var pageHeight=90/defaultInnerHeight*innerHeight 
+    var top=200/defaultInnerHeight*innerHeight; 
     if(table!=null){
       var rect=table.getBoundingClientRect()    
       if(rect && rect.top!=0){
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 4d0a33ea..035f4a9c 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -145,8 +145,8 @@
         </el-submenu>
       </el-menu>
     </el-row>
-    <el-row>
-      <el-col :span="infotype=='项目概览'?4:0" class="padding border">
+    <el-row ref="pageBody">
+      <el-col :span="infotype=='项目概览'?6:0" class="padding border" :style="{maxHeight:maxTableHeight+'px',overflowY:'auto'}">
       <h4 class="padding-bottom">常用功能快捷导航</h4>
         <el-steps :active="calcProjectStatusStep" finish-status="success" direction="vertical">
           <el-step
@@ -258,7 +258,7 @@
           </el-step>
         </el-steps>
       </el-col>
-      <el-col :span="infotype=='项目概览'?20:24">
+      <el-col :span="infotype=='项目概览'?18:24">
         <xm-project-overview-complex
           v-if="infotype == '项目概览'"
           :sel-project="selProject"
@@ -441,7 +441,8 @@ export default {
       groupUserVisible: false,
       exportArr: ["任务", "计划", "需求监控"],
       dicts:  getDefOptions(),
-	  historyLength:0,
+	    historyLength:0,
+      maxTableHeight:300,
       /**end 自定义属性请在上面加 请加备注**/
     };
   }, //end data
@@ -837,6 +838,8 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
+      
+      this.maxTableHeight = this.source == 'GZT' ?  this.maxTableHeight : util.calcTableMaxHeight(this.$refs.pageBody.$el);
       var infotype = localStorage.getItem("project-infotype");
       if (infotype) {
         this.infotype = infotype;