From e757e3e8be9aa999d135451c95bf92bf25a46e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 1 Mar 2022 21:45:12 +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                       | 17 ++++++++---------
 src/views/xm/core/xmMenu/XmMenuMng.vue      |  4 ++--
 src/views/xm/core/xmMenu/XmMenuSelect.vue   |  4 ++--
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue |  4 ++--
 src/views/xm/core/xmTask/XmTaskMng.vue      |  4 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/common/js/util.js b/src/common/js/util.js
index 87e8be84..d6b1d52a 100644
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -13,25 +13,24 @@ function padding(s, len) {
 
 export default {
 
-  
-  calcTableMaxHeight(cssSelector) {    
-    debugger; 
-    var table=document.querySelector(cssSelector);
+  calcTableMaxHeight(cssSelector) {     
+    var table=cssSelector;
+    if(typeof cssSelector == 'string'){
+      table=document.querySelector(cssSelector);
+    }
     var innerHeight=window.innerHeight 
     var defaultInnerHeight=913;  
     var pageHeight=90/defaultInnerHeight*innerHeight;
-    var top=100/defaultInnerHeight*innerHeight;
+    var top=200/defaultInnerHeight*innerHeight;
     if(table!=null){
       var rect=table.getBoundingClientRect()    
       if(rect && rect.top!=0){
         top=rect.top;
-      }
-    }else{
-      top=200/defaultInnerHeight*innerHeight;
+      } 
     } 
     var maxTableHeight =innerHeight-top-pageHeight;
     return maxTableHeight;
-  },
+  }, 
   getPositionTop(node) { 
 
       if(!node){
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 4155ebac..f572014a 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -91,7 +91,7 @@
 						</el-popover>  
 					 </el-row>  
 					<el-row class="padding-top">  
-						<el-table lazy :load="loadMenusLazy"   stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData"  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
+						<el-table lazy :load="loadMenusLazy"  class="menu-mng-table" stripe fit border ref="table" :max-height="tableHeight" :data="xmMenusTreeData"  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
 							<el-table-column sortable type="selection" width="40"></el-table-column> 
 							<el-table-column prop="menuName" label="需求名称" min-width="160"> 
 								<template slot-scope="scope">
@@ -930,7 +930,7 @@
 			this.$nextTick(() => { 
 				
 				 
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.tableHeight =  util.calcTableMaxHeight(".menu-mng-table"); 
 				this.getXmMenus();
           });  
 		}
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 083a3184..8b5fc362 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -76,7 +76,7 @@
 					<el-button   type="primary" v-if="multi"  v-on:click="multiSelectedConfirm">确认选择</el-button>
 				</el-row>
 				<el-row style="padding-top:12px;">
-					<el-table ref="table"  lazy :load="loadMenusLazy" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table ref="table" class="menu-table"  lazy :load="loadMenusLazy" :height="tableHeight" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
@@ -421,7 +421,7 @@
 				this.getXmMenus(); 
             	
 				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
+				this.tableHeight =  util.calcTableMaxHeight(".menu-table"); 
         	}); 
 		}
 	}
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index ac90a8f0..ae978584 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -14,7 +14,7 @@
 			<el-button  v-if=" batchEditVisible==true "  @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>  
   		</el-row>
 		<el-row class="page-main" v-show="!batchEditVisible">    
-				<el-table ref="table" :height="tableHeight" v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-table ref="table" class="menu-plan-table" :height="tableHeight" v-if="!gstcVisible" :data="xmMenusTreeData" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column sortable type="selection" width="40"></el-table-column>
  					<el-table-column prop="menuName" label="需求名称" min-width="150" >
 						<template slot-scope="scope"> 
@@ -577,7 +577,7 @@
 			this.$nextTick(() => {
 				
 				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table");  
+				this.tableHeight =  util.calcTableMaxHeight(".menu-plan-table");  
 				this.getXmMenus();
 			}); 
 				listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 60080489..bafdf9ce 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -361,7 +361,7 @@
               :xmTasks="xmTasks"
               @submit="afterEditSubmit"
             ></xm-task-agile-kanban>
-            <el-table
+            <el-table class="task-table"
               v-else
               show-summary
               lazy
@@ -2441,7 +2441,7 @@ export default {
     }
     this.$nextTick(() => {
       this.getXmTasks(); 
-      this.tableHeight = util.calcTableMaxHeight(".el-table");  
+      this.tableHeight = util.calcTableMaxHeight(".task-table");  
       listOption([
         { categoryId: "all", itemCode: "planType" },
         { categoryId: "all", itemCode: "taskType" },