diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
index 78ce3747..f1b2cbd9 100644
--- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue
+++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
@@ -3,11 +3,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> 
 					<div> 
-						<div class="main" id="iterationWorkItemDayList" style="width:100%;height:600px;margin:0 auto;"></div> 
+						<div class="main" id="iterationWorkItemDayList" :style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">  
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">  
 					 
 					<el-form-item label="日期区间">
 						<br>
diff --git a/src/views/xm/rpt/branch/menuDayAccumulate.vue b/src/views/xm/rpt/branch/menuDayAccumulate.vue
index 464ff0f9..357372f8 100644
--- a/src/views/xm/rpt/branch/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/branch/menuDayAccumulate.vue
@@ -4,11 +4,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> <div>
 					<div class="main" id="iterationMenuDayAccumulate"
-							style="width:100%;height:600px;margin:0 auto;"></div> 
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/branch/menuDayTrend.vue b/src/views/xm/rpt/branch/menuDayTrend.vue
index 6bd613ff..8357d496 100644
--- a/src/views/xm/rpt/branch/menuDayTrend.vue
+++ b/src/views/xm/rpt/branch/menuDayTrend.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="iterationMenuDayTrend"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding">  
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">  
 					<el-form-item label="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
diff --git a/src/views/xm/rpt/branch/questionDayAccumulate.vue b/src/views/xm/rpt/branch/questionDayAccumulate.vue
index a86ac676..f5383cf7 100644
--- a/src/views/xm/rpt/branch/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/branch/questionDayAccumulate.vue
@@ -4,11 +4,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> <div>
 					<div class="main" id="iterationQuestionDayAccumulate"
-							style="width:100%;height:600px;margin:0 auto;"></div> 
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding">  
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">  
 					<el-form-item label="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
diff --git a/src/views/xm/rpt/branch/questionDayTrend.vue b/src/views/xm/rpt/branch/questionDayTrend.vue
index 42d05b99..41d3e1e8 100644
--- a/src/views/xm/rpt/branch/questionDayTrend.vue
+++ b/src/views/xm/rpt/branch/questionDayTrend.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="iterationQuestionDayTrend"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding">  
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">  
 					<el-form-item label="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
index 23100fee..f3ee92c3 100644
--- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
+++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
@@ -3,11 +3,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> 
 					<div> 
-						<div class="main" id="iterationWorkItemDayList" style="width:100%;height:600px;margin:0 auto;"></div> 
+						<div class="main" id="iterationWorkItemDayList" :style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">  
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">  
 					<el-form-item label="归属产品"  >
 						<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
 						<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue
index 0ea7fcc3..30a86323 100644
--- a/src/views/xm/rpt/iteration/burnout.vue
+++ b/src/views/xm/rpt/iteration/burnout.vue
@@ -6,7 +6,7 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="burnout"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
index 55616e9c..678456bc 100644
--- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
@@ -4,11 +4,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> <div>
 					<div class="main" id="iterationMenuDayAccumulate"
-							style="width:100%;height:600px;margin:0 auto;"></div> 
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue
index c8702a2f..f4fbb61c 100644
--- a/src/views/xm/rpt/iteration/menuDayTrend.vue
+++ b/src/views/xm/rpt/iteration/menuDayTrend.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="iterationMenuDayTrend"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/iteration/questionDayAccumulate.vue b/src/views/xm/rpt/iteration/questionDayAccumulate.vue
index 34a84133..a74422e2 100644
--- a/src/views/xm/rpt/iteration/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/iteration/questionDayAccumulate.vue
@@ -4,11 +4,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> <div>
 					<div class="main" id="iterationQuestionDayAccumulate"
-							style="width:100%;height:600px;margin:0 auto;"></div> 
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue
index 86f5a9e6..132487bf 100644
--- a/src/views/xm/rpt/iteration/questionDayTrend.vue
+++ b/src/views/xm/rpt/iteration/questionDayTrend.vue
@@ -4,12 +4,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="iterationQuestionDayTrend"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品">
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue
index a070f624..4444847c 100644
--- a/src/views/xm/rpt/product/menuAgeDist.vue
+++ b/src/views/xm/rpt/product/menuAgeDist.vue
@@ -4,12 +4,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmMenuAgeDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">   
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">   
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue
index 9d34f2a3..0968e2be 100644
--- a/src/views/xm/rpt/product/menuAttDist.vue
+++ b/src/views/xm/rpt/product/menuAttDist.vue
@@ -4,12 +4,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmMenuAttDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">
 						<el-form-item label="分组属性">
 							<el-select   v-model="groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)" clearable>
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index a8f6cd47..177b986a 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.vue
@@ -4,11 +4,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> <div>
 					<div class="main" id="menuDayAccumulate"
-							style="width:100%;height:600px;margin:0 auto;"></div> 
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index 3b0b4031..1fccab1f 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="menuDayTrend"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue
index 39bbc828..e47f624a 100644
--- a/src/views/xm/rpt/product/menuSort.vue
+++ b/src/views/xm/rpt/product/menuSort.vue
@@ -4,12 +4,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmMenuSort"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">
 						<el-form-item label="分组属性">
 							<el-select   v-model="groupBy"  @change="onXmMenuSomeFieldsChange('groupBy',$event)" clearable>
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue
index 902b6761..a3f16c36 100644
--- a/src/views/xm/rpt/product/productWorkItemDayList.vue
+++ b/src/views/xm/rpt/product/productWorkItemDayList.vue
@@ -4,11 +4,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> 
 					<div> 
-						<div class="main" id="productWorkItemDayList" style="width:100%;height:600px;margin:0 auto;"></div> 
+						<div class="main" id="productWorkItemDayList" :style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 					<el-form-item label="归属产品"  >
 						<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue
index 9ab6a9fb..929fa281 100644
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@@ -4,12 +4,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmQuestionAgeDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding">     
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">     
 						
 						<el-form-item label="测试库" v-if="xmTestCasedb && xmTestCasedb.id" >
  							<span >{{xmTestCasedb.id}} <span v-if="xmTestCasedb.name"><br/>{{  xmTestCasedb.name  }} </span> </span>
diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue
index 3dec3c41..d35b23d2 100644
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@@ -4,12 +4,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmQuestionAttDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding">
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">
 						<el-form-item label="分组属性">
 							<el-select   v-model="groupBy"  @change="onXmQuestionSomeFieldsChange('groupBy',$event)" clearable>
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue
index 88c1df62..01a13222 100644
--- a/src/views/xm/rpt/product/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/product/questionDayAccumulate.vue
@@ -4,11 +4,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> <div>
 					<div class="main" id="questionDayAccumulate"
-							style="width:100%;height:600px;margin:0 auto;"></div> 
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue
index e6424901..cfaba11f 100644
--- a/src/views/xm/rpt/product/questionDayTrend.vue
+++ b/src/views/xm/rpt/product/questionDayTrend.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="questionDayTrend"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 						
 						<el-form-item label="归属产品"  >
 							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue
index 51548ff9..18f6f583 100644
--- a/src/views/xm/rpt/product/questionRetestDist.vue
+++ b/src/views/xm/rpt/product/questionRetestDist.vue
@@ -4,12 +4,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmQuestionRetestDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding">      
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">      
 						
 						<el-form-item label="测试库" v-if="xmTestCasedb && xmTestCasedb.id" >
  							<span >{{xmTestCasedb.id}} <span v-if="xmTestCasedb.name"><br/>{{  xmTestCasedb.name  }} </span> </span>
diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue
index b13a3c9b..3a91a168 100644
--- a/src/views/xm/rpt/project/projectWorkItemDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue
@@ -5,11 +5,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> 
 					<div> 
-						<div class="main" id="projectWorkItemDayList" style="width:100%;height:600px;margin:0 auto;"></div> 
+						<div class="main" id="projectWorkItemDayList" :style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 					<el-form-item label="归属项目" >
 						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
 						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
index 763cb9bb..64f4bbba 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
@@ -5,11 +5,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> 
 					<div> 
-						<div class="main" :id="id" style="width:100%;height:600px;margin:0 auto;"></div> 
+						<div class="main" :id="id" :style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 					<el-form-item label="归属项目" >
 						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
 						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
index 33373e2d..84133e70 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
@@ -5,11 +5,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> 
 					<div> 
-						<div class="main" id="projectWorkloadSetMonthList" style="width:100%;height:600px;margin:0 auto;"></div> 
+						<div class="main" id="projectWorkloadSetMonthList" :style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 					<el-form-item label="归属项目" >
 						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
 						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue
index 4103b187..a22ca350 100644
--- a/src/views/xm/rpt/project/taskAgeDist.vue
+++ b/src/views/xm/rpt/project/taskAgeDist.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmTaskAgeDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">   
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">   
 						<el-form-item label="归属项目" >
 							<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
 							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue
index d12c0f82..1323acfd 100644
--- a/src/views/xm/rpt/project/taskAttDist.vue
+++ b/src/views/xm/rpt/project/taskAttDist.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmTaskAttDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding">
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">
 						<el-form-item label="分组属性">
 							<el-select   v-model="groupBy"  @change="onXmTaskSomeFieldsChange('groupBy',$event)" clearable>
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue
index 686a5d28..1a192375 100644
--- a/src/views/xm/rpt/project/taskDayAccumulate.vue
+++ b/src/views/xm/rpt/project/taskDayAccumulate.vue
@@ -5,11 +5,11 @@
 			<el-row :gutter="5" >
 				<el-col :span="18"> <div>
 					<div class="main" id="taskDayAccumulate"
-							style="width:100%;height:600px;margin:0 auto;"></div> 
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div> 
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 					<el-form-item label="归属项目" >
 						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
 						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue
index 287af64c..7679bc18 100644
--- a/src/views/xm/rpt/project/taskDayTrend.vue
+++ b/src/views/xm/rpt/project/taskDayTrend.vue
@@ -6,12 +6,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="taskDayTrend"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form   :model="filters" class="padding"> 
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef"> 
 					<el-form-item label="归属项目" >
 						<xm-project-select v-if="!xmProject || !xmProject.id" ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
 						<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span> 
diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue
index ec2c691d..94f6d394 100644
--- a/src/views/xm/rpt/project/taskSort.vue
+++ b/src/views/xm/rpt/project/taskSort.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmTaskSort"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">
 						<el-form-item label="分组属性">
 							<el-select   v-model="groupBy"  @change="onXmTaskSomeFieldsChange('groupBy',$event)" clearable>
 								<el-option v-for="i in this.groupBys" :label="i.name" :key="i.id" :value="i.id"></el-option>
diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
index 3fbba97e..468e2342 100644
--- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
+++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
@@ -6,12 +6,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="testPlanCaseExecStatusDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">    
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">    
 						
 						<el-form-item label="测试库" v-if="xmTestCasedb && xmTestCasedb.id" >
  							<span >{{xmTestCasedb.id}} <span v-if="xmTestCasedb.name"><br/>{{  xmTestCasedb.name  }} </span> </span>
diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
index 87d992b8..c776b19e 100644
--- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
+++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
@@ -5,12 +5,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="testDayTimesCalc"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form :model="filters" class="padding">     
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">     
 						
 						<el-form-item label="测试库" v-if="xmTestCasedb && xmTestCasedb.id" >
  							<span >{{xmTestCasedb.id}} <span v-if="xmTestCasedb.name"><br/>{{  xmTestCasedb.name  }} </span> </span>
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
index 53398181..b7dd8355 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
@@ -6,12 +6,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="testPlanCaseExecStatusDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">        
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">        
 						
 						<el-form-item label="测试库" v-if="xmTestCasedb && xmTestCasedb.id" >
  							<span >{{xmTestCasedb.id}} <span v-if="xmTestCasedb.name"><br/>{{  xmTestCasedb.name  }} </span> </span>
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
index 4bf10310..058fcd51 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
@@ -6,12 +6,12 @@
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="testPlanCaseUserDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
+							:style="{width:'100%',height:(maxTableHeight>600?600:maxTableHeight)+'px',overflow: 'hidden'}"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				<el-col :span="6" class="border">
-					<el-form  :model="filters" class="padding">        
+					<el-form :model="filters" class="padding" :style="{width:'100%',maxHeight:maxTableHeight+'px',overflow: 'auto'}" ref="filtersRef">        
 						
 						<el-form-item label="测试库" v-if="xmTestCasedb && xmTestCasedb.id" >
  							<span >{{xmTestCasedb.id}} <span v-if="xmTestCasedb.name"><br/>{{  xmTestCasedb.name  }} </span> </span>