diff --git a/src/common/js/util.js b/src/common/js/util.js
index 1182b683..64947143 100644
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -13,15 +13,27 @@ function padding(s, len) {
 
 export default {
 
-  getPositionTop(node) {
+  
+  calcTableMaxHeight(cssSelector) {   
+    var table=document.querySelector(cssSelector);
+    var top=this.getPositionTop(table) 
+    var defaultInnerHeight=913; 
+    var innerHeight=window.innerHeight
+    if(top==0){
+      top=100/defaultInnerHeight*innerHeight
+    }
+    var maxTableHeight = innerHeight - top-80/defaultInnerHeight*innerHeight;
+    return maxTableHeight;
+  },
+  getPositionTop(node) { 
+
       if(!node){
-        return 150;
-      }
-      var top = node.offsetTop;
-      var parent = node.offsetParent;
-      while(parent != null) {
-          top += parent.offsetTop;
-          parent = parent.offsetParent;
+        return 0;
+      } 
+      var rect=node.getBoundingClientRect() 
+      var top=rect.top; 
+      if(top==0){
+        return 0;
       }
       return top;
   },
diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
index d7521f15..f37f7fa0 100644
--- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue
+++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue
@@ -256,10 +256,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;  
+			this.$nextTick(() => { 
+				this.tableHeight =  util.calcTableMaxHeight('el-table');  
 				this.getXmEnvLists();
         	}); 
 		}
diff --git a/src/views/xm/core/xmFile/XmFileMng.vue b/src/views/xm/core/xmFile/XmFileMng.vue
index 64183c0c..d35ff368 100644
--- a/src/views/xm/core/xmFile/XmFileMng.vue
+++ b/src/views/xm/core/xmFile/XmFileMng.vue
@@ -272,9 +272,9 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmFiles();
 			}); 
 		}
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 867490ae..6a40af4d 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -525,9 +525,9 @@ import XmIterationSelect from './XmIterationSelect.vue';
 		},
 		mounted() {
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70/1000 * window.innerHeight;
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+				this.tableHeight =  util.calcTableMaxHeight('el-table');
 				this.getXmIterations();
         	});
           // console.log(this.dateRanger,this.dateRangerOnline);
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index abd083a2..5c921c3d 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -351,9 +351,9 @@
 		},
 		mounted() {
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70/1000 * window.innerHeight;
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+				this.tableHeight =  util.calcTableMaxHeight('el-table');
 				this.getXmIterations();
         	});
            
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 13ca26a8..b88bb182 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -330,9 +330,9 @@
 				this.iteration=this.xmIteration
 			}
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmIterationMenus();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index ff49c118..cc68e1f2 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -928,9 +928,9 @@
 				this.productVisible=false;
 			}
 			this.$nextTick(() => { 
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight;  
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				 
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmMenus();
           });  
 		}
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index 54f75be2..cd940783 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -1081,12 +1081,12 @@
 			this.$nextTick(() => { 
 				this.filters.product=this.product
 				this.getXmMenus();
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
+				
+				
 				if(this.selProject){
 					subHeight=110/1000 * window.innerHeight; 
 				} 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				
 				
           }); 
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 9fd3e5c1..cbf98cc1 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -419,9 +419,9 @@
 					this.filters.iterationFilterType='not-join'
 				}
 				this.getXmMenus(); 
-            	var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+            	
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
         	}); 
 		}
 	}
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 904857dd..6e8076e8 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -575,9 +575,9 @@
 		},
 		mounted() {  
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;  
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table');  
 				this.getXmMenus();
 			}); 
 				listOption([{categoryId:'all',itemCode:'xmMenuPlanStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index 710c92cb..244d554b 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -481,9 +481,9 @@
 		},
 		mounted() {  
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmMenus();
 			}); 
 				listOption([{categoryId:'all',itemCode:'xmMenuStateStatus'} ]).then(res=>{
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index c5e1ab72..245ed8c0 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -651,9 +651,9 @@ import XmProductSelect from './XmProductSelect.vue';
 				}
 			});
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70/1000 * window.innerHeight;
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+				this.tableHeight =  util.calcTableMaxHeight('el-table');
 				this.getXmProducts();
         	});
 		}
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index ac34058c..60580c6f 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -305,9 +305,9 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProducts();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 74dae8f6..69654815 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -425,11 +425,8 @@
 		    //在下面添加其它组件
 		},
 		mounted() {
-			this.$nextTick(() => { 
-				
-                var table=document.querySelector('.project-table .table');
-                var top=util.getPositionTop(table)
-                this.maxTableHeight = window.innerHeight - top -100;
+			this.$nextTick(() => {  
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
 				this.getXmProducts();
         	});
 		}
diff --git a/src/views/xm/core/xmProductState/XmProductStateMng.vue b/src/views/xm/core/xmProductState/XmProductStateMng.vue
index 946eb4ad..680a498c 100644
--- a/src/views/xm/core/xmProductState/XmProductStateMng.vue
+++ b/src/views/xm/core/xmProductState/XmProductStateMng.vue
@@ -225,9 +225,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProductStates();
         	}); 
         	/** 举例，
diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
index e1d37622..c70485c8 100644
--- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
+++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue
@@ -306,7 +306,7 @@ import { months } from 'moment';
 		mounted() { 
 			this.showType = "人力";
 				this.$nextTick(() => { 
-					//var clientRect=this.$refs.table.$el.getBoundingClientRect();
+					//
 					var subHeight=700/1000 * window.innerHeight; 
 					this.tableHeight =  window.innerHeight-subHeight; 
 			  }); 
diff --git a/src/views/xm/core/xmProject/XmProjectForLink.vue b/src/views/xm/core/xmProject/XmProjectForLink.vue
index 8dec55e8..993f28e7 100644
--- a/src/views/xm/core/xmProject/XmProjectForLink.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLink.vue
@@ -212,9 +212,9 @@ XmProjectList
 		},
 		mounted() { 
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.showInfo = false;
 				this.getXmProjects();
       }); 
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index ec76ec48..75b37b2a 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -153,9 +153,9 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.showInfo = false;
 				this.getXmProjects();
       }); 
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 73f8bb75..2ff61fd2 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-80">
+					<el-row v-show="showType" v-loading="load.list" style="overflow:auto;" class="page-height-70">
 						<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>
@@ -115,7 +115,7 @@
 						</el-col>
 					</el-row>
 
-					<el-table class="project-table" ref="table" :height="maxTableHeight" v-cloak v-show="!showType" stripe :data="ScreenData" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+					<el-table  ref="table" :height="maxTableHeight" v-cloak v-show="!showType" stripe :data="ScreenData" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column  type="index" label="序号" width="80" ></el-table-column>
 						<el-table-column prop="code" label="项目编号" min-width="120" ></el-table-column>
 						<el-table-column prop="name" label="标题" min-width="200" >
@@ -743,10 +743,8 @@
 				this.filters.productId=this.$route.params.productId;
 				this.filters.productName=this.$route.params.productName;
 			}
-			this.$nextTick(() => { 
-                var table=document.querySelector('.project-table .table');
-                var top=util.getPositionTop(table)
-                this.maxTableHeight = window.innerHeight - top -100;
+			this.$nextTick(() => {  
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
 				this.showInfo = false;
 				this.getXmProjects();
 			}); 
diff --git a/src/views/xm/core/xmProject/XmProjectSelect.vue b/src/views/xm/core/xmProject/XmProjectSelect.vue
index 0c6f5f42..f7f9f1e0 100644
--- a/src/views/xm/core/xmProject/XmProjectSelect.vue
+++ b/src/views/xm/core/xmProject/XmProjectSelect.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>  
-		<el-row class="page-main page-height-90">   
-			<el-table ref="table" :height="tableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"  @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" >
+		<el-row class="page-main">   
+			<el-table ref="table" :height="maxTableHeight"  stripe :data="xmProjects"  highlight-current-row v-loading="load.list"  @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" >
  				<el-table-column prop="name" label="项目名称" min-width="80" >
 					 <template slot-scope="scope">
 						 {{scope.row.name}}&nbsp;&nbsp;
@@ -58,7 +58,7 @@
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
-				tableHeight:300,
+				maxTableHeight:300,
 				//编辑xmProject界面初始化数据
 				editForm: {
 					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:'',bizProcInstId:'',bizFlowState:'',planNouserAt:'',planInnerUserAt:'',planOutUserAt:'',locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:'',totalReceivables:'',budgetMarginRate:'',contractAmt:'',planInnerUserPrice:'',budgetOutUserPrice:'',planOutUserCnt:'',planInnerUserCnt:'',planWorkingHours:''
@@ -156,10 +156,10 @@
 		    //在下面添加其它组件
 		},
 		mounted() { 
-			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+			this.$nextTick(() => {  
+                
+                
+                this.maxTableHeight = window.innerHeight - top -100;
 				this.showInfo = false;
 				this.getXmProjects();
       }); 
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index 106fa331..efa27fab 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -552,8 +552,8 @@
 			}
 			this.$nextTick(() => {
 				
-                var table=document.querySelector('.el-table');
-                var top=util.getPositionTop(table)
+                
+                
                 this.maxTableHeight = window.innerHeight - top -100;
 				this.showInfo = false;
 				this.getXmProjects();
diff --git a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
index d6603396..8ebad5c5 100644
--- a/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
+++ b/src/views/xm/core/xmProjectContract/XmProjectContractMng.vue
@@ -241,9 +241,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectContracts();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
index 5fa5de7f..f92e2f2a 100644
--- a/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
+++ b/src/views/xm/core/xmProjectEnvList/XmProjectEnvListMng.vue
@@ -319,9 +319,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				console.log(this.currProject);
 				this.getXmProjectEnvLists();
 			});
diff --git a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
index 0d1f28d4..82f7852c 100644
--- a/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
+++ b/src/views/xm/core/xmProjectGroupState/XmProjectGroupStateMng.vue
@@ -268,9 +268,9 @@ XmProjectGroupStateOverview
 		mounted() {
 			this.$nextTick(() => {
 
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70/1000 * window.innerHeight;
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+				this.tableHeight =  util.calcTableMaxHeight('el-table');
 				this.getXmProjectGroupStates();
         	});
         	/** 举例，
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index 5de6e35d..2120818a 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -252,9 +252,9 @@
 			    //initSimpleDicts('all',['sex','gradeLvl']).then(res=>this.dicts=res.data.data);
 			    this.initData()
 				this.searchXmProjectGroupUsers();
-                var table=document.querySelector('.el-table');
-                var top=util.getPositionTop(table)
-                this.maxTableHeight = window.innerHeight - top -60;
+                
+                
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
 
         	});
 		}
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
index 5216e8ac..5037d869 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
@@ -228,9 +228,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectGroupUserCandidates();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
index 06cc026d..42c86134 100644
--- a/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
+++ b/src/views/xm/core/xmProjectKpi/XmProjectKpiMng.vue
@@ -251,9 +251,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectKpis();
         	}); 
 		}
diff --git a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
index 53b7096e..8959cf9d 100644
--- a/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostNouser/XmProjectMBudgetCostNouserMng.vue
@@ -345,9 +345,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectMBudgetCostNousers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
index ad7e663d..d71d88cc 100644
--- a/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMBudgetCostUser/XmProjectMBudgetCostUserMng.vue
@@ -350,9 +350,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectMBudgetCostUsers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
index fb050bfb..bc335807 100644
--- a/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
+++ b/src/views/xm/core/xmProjectMCostNouser/XmProjectMCostNouserMng.vue
@@ -346,9 +346,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectMCostNousers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
index edb6c883..27d1b738 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserList.vue
@@ -240,9 +240,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectMCostUsers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
index 70715d5d..dc0d9ecd 100644
--- a/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
+++ b/src/views/xm/core/xmProjectMCostUser/XmProjectMCostUserMng.vue
@@ -350,9 +350,9 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmProjectMCostUsers();
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 54e134a6..75bfc676 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -1302,9 +1302,9 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 			this.selectTotalProjectAndPhaseBudgetCost();
 			this.$nextTick(() => {
 				 
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				
+				
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				if(this.selProject){
 					this.getXmProjectPhases();
 				} 
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 2376d13c..2475aea8 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -460,7 +460,7 @@
        
 			this.$nextTick(() => {
 				var clientRect=this.$refs.selectPhaseTable.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
+				
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.selectPhaseTable.$el.offsetTop-subHeight; 
 				if(this.selProject){
 					this.getXmProjectPhases();
diff --git a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
index 80eeda8f..e7bec999 100644
--- a/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
+++ b/src/views/xm/core/xmProjectPhaseTemplate/XmProjectPhaseTemplateMng.vue
@@ -299,9 +299,9 @@
 			}
 			this.$nextTick(() => {
 				
-                var table=document.querySelector('.el-table');
-                var top=util.getPositionTop(table)
-                this.maxTableHeight = window.innerHeight - top -60;
+                
+                
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
 				this.getXmProjectPhases();   
 			}); 
 			
diff --git a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
index 5f9e1f0c..07ee98dc 100644
--- a/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
+++ b/src/views/xm/core/xmProjectState/XmProjectStateMng.vue
@@ -1,5 +1,5 @@
 <template>
-	<section class="page-container page-full-height padding border">
+	<section class="page-container padding border">
 		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询">
 				<template slot="append">
@@ -11,9 +11,9 @@
  			<el-button type="success" @click="loadTasksToXmProjectState" icon="el-icon-s-data">刷新数据</el-button> 
 			<el-button type="success" @click="loadTasksSettleToXmProjectState" icon="el-icon-s-data">刷新结算数据</el-button>  
 		</el-row> 
-		<el-row class="page-main page-height-90"> 
+		<el-row class="page-main"> 
 			<!--列表 XmProjectState 项目指标日统计表-->
-			<el-table ref="table" :height="tableHeight" :data="xmProjectStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table ref="table" :height="maxTableHeight" :data="xmProjectStates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 				<el-table-column  type="selection" width="45"></el-table-column>
 				<el-table-column sortable type="index" width="45">  </el-table-column> 
 				<el-table-column   type="expand" width="45">
@@ -173,7 +173,7 @@
 				},
 				selectProjectVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
-				tableHeight:300,
+				maxTableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -421,22 +421,19 @@
 		},
 		mounted() { 
 			this.$nextTick(() => {
+				
 				if(this.selProject){
 					this.filters.selProject=this.selProject
-				}
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
-				if(this.selProject){
-					subHeight=100/1000 * window.innerHeight;
-				}
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				} 
+
 				this.getXmProjectStates();
 				listOption([{categoryId:'all',itemCode:'projectStatus'}] ).then(res=>{
 					if(res.data.tips.isOk){  
 						this.options['projectStatus']=res.data.data.projectStatus 
 						//this.editForm.projectStatus=this.options['projectStatus'][0].optionValue
 					}
-				});
+				}); 
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
         	}); 
         	/** 举例，
     		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
index 9bc991ac..7f7a3af6 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateList.vue
@@ -213,9 +213,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-                var table=document.querySelector('.el-table');
-                var top=util.getPositionTop(table)
-                this.maxTableHeight = window.innerHeight - top -60;
+                
+                
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
 				this.getXmProjectTemplates();
 				listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
 					if(res.data.tips.isOk){ 
diff --git a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
index 886bca13..c8184537 100644
--- a/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
+++ b/src/views/xm/core/xmProjectTemplate/XmProjectTemplateMng.vue
@@ -259,9 +259,9 @@
 		mounted() { 
 			this.$nextTick(() => {
 				
-                var table=document.querySelector('.el-table');
-                var top=util.getPositionTop(table)
-                this.maxTableHeight = window.innerHeight - top -60;
+                
+                
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
 				this.getXmProjectTemplates();
 				listOption([{categoryId:'all',itemCode:'projectType'}] ).then(res=>{
 					if(res.data.tips.isOk){ 
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index f92ece6d..34eadd81 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -941,9 +941,9 @@
 			}
 			
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70/1000 * window.innerHeight;
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+				this.tableHeight =  util.calcTableMaxHeight('el-table');
 				this.getXmQuestions();
 			});
 				listOption([{categoryId:'all',itemCode:'bugSeverity'},{categoryId:'all',itemCode:'bugSolution'},{categoryId:'all',itemCode:'bugStatus'},{categoryId:'all',itemCode:'bugType'},{categoryId:'all',itemCode:'urgencyLevel'}] ).then(res=>{
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index a2fbce29..d921f3cc 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -260,13 +260,13 @@
 			}
 			
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
+				
+				
 				
 				if(this.projectId){
 					subHeight=100/1000 * window.innerHeight;
 				}
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmRecords();
         	}); 
 		}
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index 05c96fc3..dc8c7ebf 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -402,12 +402,12 @@
 		},
 		mounted() {
 			this.$nextTick(()=>{ 
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70/1000 * window.innerHeight;
 				if(this.isTaskCenter){
 					subHeight=50/1000 * window.innerHeight;
 				}
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmTasks(); 
 			});
 				listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 6159ea0e..9bd8cbe5 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -2454,7 +2454,7 @@ export default {
       /**
 				let self = this;
 				window.onresize = function() {
-					self.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+					self.tableHeight =  util.calcTableMaxHeight('el-table');
 				}
  				*/
       listOption([
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index b8cfc1c4..2ec27436 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -817,12 +817,12 @@
 		},
 		mounted() {
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70/1000 * window.innerHeight;
 				if(this.selProject){
 					subHeight=100/1000 * window.innerHeight;
 				}
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;
+				this.tableHeight =  util.calcTableMaxHeight('el-table');
 				this.getXmTaskExecusers();
 				});
 
diff --git a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
index 23bc3fcb..775554a8 100644
--- a/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
+++ b/src/views/xm/core/xmTaskTemplate/XmTaskTemplateMng.vue
@@ -11,9 +11,9 @@
 					<el-button v-if="!selProjectTemplate"  @click="showProjectTemplate">选择模板</el-button>   
 					<el-button v-if="isSelect" type="primary" @click="selectedConfirm">确认选择</el-button>  
 				</el-row>
-				<el-row class="page-main page-height-80">  
+				<el-row class="page-main">  
 						<!--列表 XmTaskTemplate xm_task_template select-confirm-->
-						<el-table :data="xmTaskTemplatesTreeData" row-key="id" :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 :height="maxTableHeight" :data="xmTaskTemplatesTreeData" row-key="id" :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="name" label="任务名称" min-width="150" >						
 								<template slot-scope="scope">
@@ -74,7 +74,7 @@
 				xmTaskTemplates: [],//查询结果
 				pageInfo:{//分页数据
 					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
+					pageSize:20,//每页数据
 					count:false,//是否需要重新计算总记录数
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
@@ -97,6 +97,7 @@
 				},
 				parentTaskTemplate:null,
 				projectPhaseTemplate:null,
+				maxTableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -277,7 +278,10 @@
 			if(this.selProjectTemplate){
 				this.filters.projectTemplate=this.selProjectTemplate
 			}
-			this.$nextTick(() => {
+			this.$nextTick(() => { 
+                
+                
+                this.maxTableHeight = util.calcTableMaxHeight('.el-table');
 				//this.getXmTaskTemplates();
         	}); 
 		}
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 366ca1d1..364d8683 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -455,12 +455,12 @@
 			this.$nextTick(() => {
 				this.filters.luser=this.userInfo; 
 				this.getXmTestCases();
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				
 				var subHeight=70;  
 				if(this.selProject){
 					subHeight=100/1000 * window.innerHeight;
 				}
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
         	}); 
         	/** 举例，
     		listOption([{categoryId:'all',itemCode:'sex'},{categoryId:'all',itemCode:'grade'}] ).then(res=>{
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 9bb243d1..c28f0170 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -763,12 +763,12 @@
 			this.filters.selProject=this.selProject; 
 			this.filters.execUser=this.userInfo;
 			this.$nextTick(() => {
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
+				
+				
 				if(this.selProject){
 					subHeight=100/1000 * window.innerHeight;
 				}
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				this.tableHeight =  util.calcTableMaxHeight('el-table'); 
 				this.getXmTestCaseExecs();
         	}); 
         	/** 举例，