diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index ca69e4aa..7da52b1d 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -149,7 +149,7 @@
 				parentIteration:null,
         iterationStateVisible:false,
         gstcVisible:false,
-		tableHeight:500,
+		tableHeight:300,
         ganrrColumns: {
           children: 'children',
           name: 'iterationName',
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index c007d3df..a915625c 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -91,7 +91,7 @@
 				},
 				iteration:null,
 				menuVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 1e93d2b8..3da060d9 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -302,7 +302,7 @@
 				taskListForMenuVisible:false,
 				iterationVisible:false,
 				userSelectVisible:false,
-				tableHeight:500,
+				tableHeight:300,
  				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 95403bef..c10df8b0 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -118,7 +118,7 @@
 				},
  				menuDetailVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 86cbc05b..31f5697d 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -229,7 +229,7 @@
 				menuDetailVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 				gstcVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				ganrrColumns: {
           children: 'children',
           name: 'menuName',
diff --git a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
index 535baa3c..aa01be8d 100644
--- a/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
+++ b/src/views/xm/core/xmMenuExchange/XmMenuExchangeMng.vue
@@ -115,7 +115,7 @@
 					menuId:'',menuName:'',productId:'',remark:'',id:'',pid:'',cuserid:'',cusername:'',ctime:'',cbranchId:'',adopt:'',adoptUserid:'',adoptUsername:'',adoptTime:'',closed:'',puserid:'',pusername:'',premark:'',notifyUserids:'',notifyChannels:'',notifyUsernames:'',cuserHeadImg:'',replyType:''
 				},
 				xmMenuVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index 56887c97..ef77da6c 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -216,7 +216,7 @@
 				valueChangeRows:[],
 				selGroups:null,
 				menuDetailVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 6aea3144..3e906bb5 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -140,7 +140,7 @@
 				},
 				iterationVisible:false,
 				productStateVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 049dd7f6..b8161095 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -70,7 +70,7 @@
 				},
 				iterationVisible:false,
 				productStateVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmProject/XmProjectList.vue b/src/views/xm/core/xmProject/XmProjectList.vue
index 8e587cb0..58e66bb0 100644
--- a/src/views/xm/core/xmProject/XmProjectList.vue
+++ b/src/views/xm/core/xmProject/XmProjectList.vue
@@ -71,7 +71,7 @@
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
-				tableHeight:500,
+				tableHeight: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:''
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 0c69e587..977bcd78 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -55,7 +55,7 @@
 		</el-row> 
 		<el-row  class="app-container"> 
 			<!--列表 XmProject xm_project-->
-			<el-row v-show="showType" v-loading="load.list">
+			<el-row v-show="showType" v-loading="load.list" class="project-box">
 				<el-col  v-cloak v-for="(p,i) in ScreenData" :key="i" :xl="4" :lg="6" :md="8" :sm="12">
 					<el-card @click.native="intoInfo(p,i)" class="project-card" shadow="always">
 						<div class="project-name" title="这是项目名称">{{p.name}}</div>
@@ -269,7 +269,7 @@
 				finishFlag: false,
 				xmRecordVisible: false,
 				productSelectVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -785,5 +785,29 @@
 }
 .right-btn{
 	margin-top: 12px;
+} 
+@media only screen and (max-height: 2400px) {
+	.project-box{
+		max-height: 1600x;
+		overflow-y: auto;
+	}
+}
+@media only screen and (max-height: 1200px) {
+	.project-box{
+		max-height: 800px;
+		overflow-y: auto;
+	}
+}
+@media only screen and (max-height: 980px) {
+	.project-box{
+		max-height: 600px;
+		overflow-y: auto;
+	}
+}
+@media only screen and (max-height: 640px) {
+	.project-box{
+		max-height: 300px;
+		overflow-y: auto;
+	}
 }
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
index f80ffffd..d22f61dd 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseBatch.vue
@@ -280,7 +280,7 @@
 				valueChangeRows:[],
 				batchEditVisible:false,
 				menuVisible:false,//由故事自动创建阶段计划
-				tableHeight:500,
+				tableHeight:300,
         pickerOptions: util.pickerOptions('date'),
         gstcVisible:false,
         ganrrColumns: {
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index 83226e00..8ce1c941 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -318,20 +318,19 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 				valueChangeRows:[],
 				batchEditVisible:false,
 				menuVisible:false,//由故事自动创建阶段计划
-				tableHeight:500,
-        pickerOptions: util.pickerOptions('date'),
-        gstcVisible:false,
-		groupUserSelectVisible:false,//选择负责人
-        ganrrColumns: {
-          children: 'children',
-          name: 'phaseName',
-          id: 'id',
-          pid: 'parentPhaseId',
-          startDate: 'beginDate',
-          endDate: 'endDate',
-		  
-        },
-		tableHeight:500,
+				tableHeight:200,
+				pickerOptions: util.pickerOptions('date'),
+				gstcVisible:false,
+				groupUserSelectVisible:false,//选择负责人
+				ganrrColumns: {
+				children: 'children',
+				name: 'phaseName',
+				id: 'id',
+				pid: 'parentPhaseId',
+				startDate: 'beginDate',
+				endDate: 'endDate',
+				
+				},
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -1291,13 +1290,13 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
       console.log('mounted--his.selProject==', this.selProject);
       
 			this.$nextTick(() => {
+				 
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=100/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				if(this.selProject){
 					this.getXmProjectPhases();
 				}
-				
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=65/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				listOption([
 					{categoryId:'all',itemCode:'xmPhaseStatus'} 
 				]).then(res=>{
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index a13aa0be..ec2c3e95 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -108,7 +108,7 @@
 				menuVisible:false,//由故事自动创建阶段计划
         pickerOptions: util.pickerOptions('date'),
         gstcVisible:false,
-		tableHeight:500,
+		tableHeight:300,
         ganrrColumns: {
           children: 'children',
           name: 'phaseName',
@@ -418,7 +418,7 @@
        
 			this.$nextTick(() => {
 				var clientRect=this.$refs.selectPhaseTable.$el.getBoundingClientRect();
-				var subHeight=65/1000 * window.innerHeight; 
+				var subHeight=150/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/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 52cb25c2..7ee33c0d 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -221,7 +221,7 @@
 				selectUserVisible:false,
 				selectProjectVisible:false,
 				nextAction:'',
-				tableHeight:500,
+				tableHeight:300,
 				cloumns: [
 					{
 						key: 'name',
diff --git a/src/views/xm/core/xmRecord/XmRecord.vue b/src/views/xm/core/xmRecord/XmRecord.vue
index 1ddee9f5..407a55b6 100644
--- a/src/views/xm/core/xmRecord/XmRecord.vue
+++ b/src/views/xm/core/xmRecord/XmRecord.vue
@@ -98,7 +98,7 @@
 				editForm: {
 					id:'',projectId:'',operUserid:'',operUsername:'',operTime:'',objType:'',action:'',oldValue:'',newValue:'',remarks:'',taskId:'',reqNo:'',branchId:'',ip:''
 				},
-				tableHeight:500,
+				tableHeight:300,
 				/**begin 自定义属性请在下面加 请加备注**/
 				objTypeOptions: [{key:"all",name:"全部"},{key:"task",name:"任务"},{"key":"project" ,name:"项目"},{key:"budget",name:"预算"},{key:"cost",name:"成本"},{key:"phase",name:"阶段计划"},{"key":"group",name:"团队"}]
 				/**end 自定义属性请在上面加 请加备注**/
diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue
index b9b745d8..72cb0433 100644
--- a/src/views/xm/core/xmTask/XmTaskList.vue
+++ b/src/views/xm/core/xmTask/XmTaskList.vue
@@ -147,7 +147,7 @@
  				projectPhase: null,
  				pickerOptions:  util.pickerOptions(), 
 				selectProjectVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
index 26a746fe..f72b1caa 100644
--- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue
@@ -152,7 +152,7 @@
 
 				selkey: "all",       
  				pickerOptions:  util.pickerOptions(),
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
diff --git a/src/views/xm/core/xmTask/XmTaskListForProduct.vue b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
index 8752cacf..e607d3c4 100644
--- a/src/views/xm/core/xmTask/XmTaskListForProduct.vue
+++ b/src/views/xm/core/xmTask/XmTaskListForProduct.vue
@@ -172,7 +172,7 @@
  				projectPhase: null,
  				pickerOptions:  util.pickerOptions(), 
 				selectProjectVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 9762a7f4..89927620 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -639,7 +639,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
         menuExecutor:false,//执行人查询
 				groupUserSelectVisible:false,//选择负责人
 				showSkillSearchVisible:false,//按技能查询
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -1663,8 +1663,8 @@ XmProjectGroupSelect
 			}
 			this.$nextTick(()=>{
 				this.getXmTasks();     
-				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=85/1000 * window.innerHeight;
+				var clientRect=this.$refs.table.$el.getBoundingClientRect(); 
+				var subHeight=150/1000 * window.innerHeight;
 				if(this.isTaskCenter){
 					subHeight=50/1000 * window.innerHeight;
 				}
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index 262bd664..af795111 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -317,7 +317,7 @@
 				menuDetailVisible:false,
 				pickerOptions:  util.pickerOptions(),
 				gstcVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
diff --git a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
index 17114a6e..2c2641a7 100644
--- a/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
+++ b/src/views/xm/core/xmTaskExecuser/XmTaskExecuserMng.vue
@@ -270,7 +270,7 @@
 				],  
 				execuserAddType:'add',//add为新增 join为当前登陆者加入
 				pickerOptions:  util.pickerOptions('datarange'),
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 72eaba97..28ea30cf 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -115,7 +115,7 @@
 				},
 				/**begin 自定义属性请在下面加 请加备注**/ 
 				menuVisible:false,
-				tableHeight:500,
+				tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index b63252fd..5cacf1bf 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -241,7 +241,7 @@
             endDate: 'endTime',
 
           },
-			tableHeight:500,
+			tableHeight:300,
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data