From 8d3309c876360bab1c80f75564dbdaf8965dbc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 4 Feb 2023 16:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/mdp.scss                               |  1 +
 src/views/xm/rpt/CompsCard.vue                    | 15 +++++++++++----
 src/views/xm/rpt/branch/branchWorkItemDayList.vue |  8 ++++----
 src/views/xm/rpt/branch/menuDayAccumulate.vue     |  6 +++---
 src/views/xm/rpt/branch/menuDayTrend.vue          |  6 +++---
 src/views/xm/rpt/branch/questionDayAccumulate.vue |  6 +++---
 src/views/xm/rpt/branch/questionDayTrend.vue      |  6 +++---
 .../xm/rpt/iteration/IterationWorkItemDayList.vue |  8 ++++----
 src/views/xm/rpt/iteration/burnout.vue            |  8 ++++----
 src/views/xm/rpt/iteration/menuDayAccumulate.vue  |  6 +++---
 src/views/xm/rpt/iteration/menuDayTrend.vue       |  6 +++---
 .../xm/rpt/iteration/questionDayAccumulate.vue    |  6 +++---
 src/views/xm/rpt/iteration/questionDayTrend.vue   |  6 +++---
 src/views/xm/rpt/product/menuAgeDist.vue          |  6 +++---
 src/views/xm/rpt/product/menuAttDist.vue          |  6 +++---
 src/views/xm/rpt/product/menuDayAccumulate.vue    |  6 +++---
 src/views/xm/rpt/product/menuDayTrend.vue         |  6 +++---
 src/views/xm/rpt/product/menuSort.vue             |  6 +++---
 .../xm/rpt/product/productWorkItemDayList.vue     |  8 ++++----
 src/views/xm/rpt/product/questionAgeDist.vue      |  6 +++---
 src/views/xm/rpt/product/questionAttDist.vue      |  6 +++---
 .../xm/rpt/product/questionDayAccumulate.vue      |  6 +++---
 src/views/xm/rpt/product/questionDayTrend.vue     |  6 +++---
 src/views/xm/rpt/product/questionRetestDist.vue   |  6 +++---
 src/views/xm/rpt/product/questionSort.vue         |  6 +++---
 .../xm/rpt/project/projectWorkItemDayList.vue     | 12 ++++++------
 .../xm/rpt/project/projectWorkloadSetDayList.vue  |  8 ++++----
 .../rpt/project/projectWorkloadSetMonthList.vue   |  8 ++++----
 src/views/xm/rpt/project/taskAgeDist.vue          |  6 +++---
 src/views/xm/rpt/project/taskAttDist.vue          |  6 +++---
 src/views/xm/rpt/project/taskDayAccumulate.vue    | 10 ++++------
 src/views/xm/rpt/project/taskDayTrend.vue         |  6 +++---
 src/views/xm/rpt/project/taskSort.vue             |  6 +++---
 src/views/xm/rpt/testCase/testCaseSort.vue        |  6 +++---
 src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue  |  6 +++---
 src/views/xm/rpt/testPlan/testDayTimesCalc.vue    |  6 +++---
 .../rpt/testPlan/testPlanCaseExecStatusDist.vue   |  6 +++---
 .../xm/rpt/testPlan/testPlanCaseUserDist.vue      |  6 +++---
 38 files changed, 130 insertions(+), 124 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 793d8856..04158b4a 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -369,6 +369,7 @@ table tr.hover-row{
   max-height: calc(80vh);   
   overflow-y: 'hidden';
   width:100%; 
+  padding:10px;
 } 
 /*此处根据不同屏幕分配率显示不同的样式*/
 /*手机端*/
diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue
index 83988fe0..403d97a8 100644
--- a/src/views/xm/rpt/CompsCard.vue
+++ b/src/views/xm/rpt/CompsCard.vue
@@ -5,9 +5,9 @@
             <comps-set :comp-ids="compIds" :category="category" @row-click="onCompSelect"></comps-set>
         </el-col>
         <el-col :span="18" ref="table" class="border">
-            <el-row  v-if="exportToolBarVisible">
+            <el-row  v-if="exportToolBarVisible" class="padding">
                 <span style="float:right;">
-                    <el-button @click="exportToolBarVisible=false">取消</el-button> 
+                    <el-button @click="cancelExport">取消</el-button> 
                     <el-button v-print="{id:'printBody',popTitle:rptConfigParamsCpd.name+'-报告'}">打印</el-button>
                     <el-button @click="exportToPdf">pdf</el-button> 
                 </span> 
@@ -17,7 +17,7 @@
                     <el-empty description="暂未选择模块"></el-empty>
                 </div>
                 <div v-else id="printBody" ref="rptBox"> 
-                    <component v-for="(item,index) in compCfgList" :key="index" :is="item.compId" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :category="category" :cfg="item.cfg" :ref="item.id" @delete="doDelete(item)" :init-group-by="item.initGroupBy" :id="item.id" :show-tool-bar="showToolBar" :show-params="paramsVisible"></component>
+                    <component v-for="(item,index) in compCfgList" :key="index" :is="item.compId" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :category="category" :cfg="item.cfg" :ref="item.id" @delete="doDelete(item)" :init-group-by="item.initGroupBy" :show-tool-bar="false" :id="item.id" :show-params="paramsVisible"></component>
                          
                 </div>
             </div>
@@ -318,7 +318,14 @@ export default {
         },
         exportToPdf(){
             this.paramsVisible=false
-            this.$PDFSave(this.$refs.rptBox, this.rptConfigParamsCpd.name+"-报告");  
+            this.$nextTick(()=>{
+                this.$PDFSave(this.$refs.rptBox, this.rptConfigParamsCpd.name+"-报告");  
+            })
+            
+        },
+        cancelExport(){
+            this.exportToolBarVisible=false
+            this.paramsVisible=this.showParams
         }
          
     },
diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
index f81c50e1..75f2c59a 100644
--- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue
+++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
@@ -1,6 +1,6 @@
 <template> 
 			<el-row :gutter="5" >
-				<el-col :span="18">  
+				<el-col :span="showParams?23:24">  
 					<div class="rpt-box">
 						<el-row v-if="isRptCfg">
 							<el-row class="row-box padding-top">
@@ -25,9 +25,9 @@
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
@@ -249,7 +249,7 @@
 					},
 					barMaxWidth: 100,
 					toolbox: {
-						show: true,
+						show: this.showToolBar,
 						top:"5%",
 						right:"10px",
 						feature: {
diff --git a/src/views/xm/rpt/branch/menuDayAccumulate.vue b/src/views/xm/rpt/branch/menuDayAccumulate.vue
index 41e64ca2..6451eed9 100644
--- a/src/views/xm/rpt/branch/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/branch/menuDayAccumulate.vue
@@ -2,14 +2,14 @@
 	<section>
  			
 			<el-row :gutter="5" >
-				<el-col :span="18"> <div>
+				<el-col :span="showParams?23:24"> <div>
 					<div class="echart-box" id="iterationMenuDayAccumulate" ></div> 
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/branch/menuDayTrend.vue b/src/views/xm/rpt/branch/menuDayTrend.vue
index 064a6720..63f22791 100644
--- a/src/views/xm/rpt/branch/menuDayTrend.vue
+++ b/src/views/xm/rpt/branch/menuDayTrend.vue
@@ -2,16 +2,16 @@
 	<section>
  			
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/branch/questionDayAccumulate.vue b/src/views/xm/rpt/branch/questionDayAccumulate.vue
index c88f7c99..ffe1a510 100644
--- a/src/views/xm/rpt/branch/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/branch/questionDayAccumulate.vue
@@ -2,14 +2,14 @@
 	<section>
  			
 			<el-row :gutter="5" >
-				<el-col :span="18"> <div>
+				<el-col :span="showParams?23:24"> <div>
 					<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/branch/questionDayTrend.vue b/src/views/xm/rpt/branch/questionDayTrend.vue
index 5ed51a56..9b197e7b 100644
--- a/src/views/xm/rpt/branch/questionDayTrend.vue
+++ b/src/views/xm/rpt/branch/questionDayTrend.vue
@@ -2,16 +2,16 @@
 	<section>
  			
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
index 6e9d4f2a..e3fbceb6 100644
--- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
+++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
@@ -1,15 +1,15 @@
 <template>
 	<section> 
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div> 
 						<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
@@ -241,7 +241,7 @@
 					},
 					barMaxWidth: 100,
 					toolbox: {
-						show: true,
+						show: this.showToolBar,
 						top:"5%",
 						right:"10px",
 						feature: {
diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue
index c930efac..f9ed33ce 100644
--- a/src/views/xm/rpt/iteration/burnout.vue
+++ b/src/views/xm/rpt/iteration/burnout.vue
@@ -3,16 +3,16 @@
  			
 			 
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
@@ -265,7 +265,7 @@
 						trigger: 'axis'
 					},
 					toolbox: {
-						show: true,
+						show: this.showToolBar,
 						top:"5%",
 						right:"10px",
 						feature: {
diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
index 66de6d8f..3070c35d 100644
--- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
@@ -2,14 +2,14 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> <div>
+				<el-col :span="showParams?23:24"> <div>
 					<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue
index 457641f6..89e840e7 100644
--- a/src/views/xm/rpt/iteration/menuDayTrend.vue
+++ b/src/views/xm/rpt/iteration/menuDayTrend.vue
@@ -2,16 +2,16 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/iteration/questionDayAccumulate.vue b/src/views/xm/rpt/iteration/questionDayAccumulate.vue
index e2eb6fa4..bc9d5788 100644
--- a/src/views/xm/rpt/iteration/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/iteration/questionDayAccumulate.vue
@@ -2,14 +2,14 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> <div>
+				<el-col :span="showParams?23:24"> <div>
 					<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue
index f576be54..396bf1e1 100644
--- a/src/views/xm/rpt/iteration/questionDayTrend.vue
+++ b/src/views/xm/rpt/iteration/questionDayTrend.vue
@@ -1,16 +1,16 @@
 <template>
 	<section> 
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue
index b2f732df..6422a973 100644
--- a/src/views/xm/rpt/product/menuAgeDist.vue
+++ b/src/views/xm/rpt/product/menuAgeDist.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue
index 5a72ae06..ed342813 100644
--- a/src/views/xm/rpt/product/menuAttDist.vue
+++ b/src/views/xm/rpt/product/menuAttDist.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index a5a3b623..d1865653 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.vue
@@ -2,13 +2,13 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> <div>
+				<el-col :span="showParams?23:24"> <div>
 					<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index 49265f8b..2c8a9bc7 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.vue
@@ -2,15 +2,15 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue
index 8e2914ac..9b99a925 100644
--- a/src/views/xm/rpt/product/menuSort.vue
+++ b/src/views/xm/rpt/product/menuSort.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue
index 1ee69203..749ec751 100644
--- a/src/views/xm/rpt/product/productWorkItemDayList.vue
+++ b/src/views/xm/rpt/product/productWorkItemDayList.vue
@@ -2,15 +2,15 @@
 	<section>
  
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div> 
 						<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
@@ -225,7 +225,7 @@
 					},
 					barMaxWidth: 100,
 					toolbox: {
-						show: true,
+						show: this.showToolBar,
 						top:"5%",
 						right:"10px",
 						feature: {
diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue
index 47c6345d..c267818f 100644
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue
index 97929704..f73bee17 100644
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue
index a3deded9..aa266b15 100644
--- a/src/views/xm/rpt/product/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/product/questionDayAccumulate.vue
@@ -2,14 +2,14 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> <div>
+				<el-col :span="showParams?23:24"> <div>
 					<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue
index bacc1d14..bcbe45cc 100644
--- a/src/views/xm/rpt/product/questionDayTrend.vue
+++ b/src/views/xm/rpt/product/questionDayTrend.vue
@@ -2,16 +2,16 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
 				
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue
index 09f328b4..9ae24e6b 100644
--- a/src/views/xm/rpt/product/questionRetestDist.vue
+++ b/src/views/xm/rpt/product/questionRetestDist.vue
@@ -1,15 +1,15 @@
 <template>
 	<section>
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue
index ca226dd5..7a8613f6 100644
--- a/src/views/xm/rpt/product/questionSort.vue
+++ b/src/views/xm/rpt/product/questionSort.vue
@@ -1,15 +1,15 @@
 <template>
 	<section >
  			<el-row :gutter="5">
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue
index c1fb9a44..71cf5125 100644
--- a/src/views/xm/rpt/project/projectWorkItemDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue
@@ -3,14 +3,14 @@
         
  
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div> 
 						<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
@@ -222,7 +222,7 @@
 					},
 					barMaxWidth: 100,
 					toolbox: {
-						show: true,
+						show: this.showToolBar,
 						top:"5%",
 						right:"10px",
 						feature: {
@@ -231,8 +231,8 @@
 						
 						saveAsImage: { show: true }
 						}
-					},
-
+					}, 
+					
 					calculable: true,
 					legend: { 
 							bottom: 'bottom',
diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
index 15a8bf76..af8d3f73 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
@@ -3,14 +3,14 @@
         
  
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div> 
 						<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
@@ -233,7 +233,7 @@
 					},
 					barMaxWidth: 100,
 					toolbox: {
-						show: true,
+						show: this.showToolBar,
 						top:"5%",
 						right:"10px",
 						feature: {
diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
index 6668c3ce..3fe8d4a3 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
@@ -3,14 +3,14 @@
         
  
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div> 
 						<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
@@ -234,7 +234,7 @@
 					},
 					barMaxWidth: 100,
 					toolbox: {
-						show: true,
+						show: this.showToolBar,
 						top:"5%",
 						right:"10px",
 						feature: {
diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue
index 119e9c61..58a0d4d7 100644
--- a/src/views/xm/rpt/project/taskAgeDist.vue
+++ b/src/views/xm/rpt/project/taskAgeDist.vue
@@ -2,15 +2,15 @@
 	<section>
         
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24">  
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue
index deeb8ae8..46d8babd 100644
--- a/src/views/xm/rpt/project/taskAttDist.vue
+++ b/src/views/xm/rpt/project/taskAttDist.vue
@@ -2,15 +2,15 @@
 	<section>
         
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue
index e39ee81c..f0fc85a4 100644
--- a/src/views/xm/rpt/project/taskDayAccumulate.vue
+++ b/src/views/xm/rpt/project/taskDayAccumulate.vue
@@ -1,15 +1,13 @@
 <template>
-	<section>
-        
-			
+	<section> 
 			<el-row :gutter="5" >
-				<el-col :span="18"> <div>
+				<el-col :span="showParams?23:24"> <div>
 					<div class="echart-box" :id="this.id"></div> 
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button>  
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue
index 4b5964af..bb2f8a7a 100644
--- a/src/views/xm/rpt/project/taskDayTrend.vue
+++ b/src/views/xm/rpt/project/taskDayTrend.vue
@@ -3,15 +3,15 @@
         
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue
index 2479a62e..9fab157b 100644
--- a/src/views/xm/rpt/project/taskSort.vue
+++ b/src/views/xm/rpt/project/taskSort.vue
@@ -2,15 +2,15 @@
 	<section>
         
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/testCase/testCaseSort.vue b/src/views/xm/rpt/testCase/testCaseSort.vue
index f9b1b277..35597e39 100644
--- a/src/views/xm/rpt/testCase/testCaseSort.vue
+++ b/src/views/xm/rpt/testCase/testCaseSort.vue
@@ -3,15 +3,15 @@
 
 		
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
index 1c1a191d..2e2617b0 100644
--- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
+++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
@@ -3,15 +3,15 @@
 
 		
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
index 8415b8b9..b2476120 100644
--- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
+++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
@@ -2,15 +2,15 @@
 	<section>
 			
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
index fb01424f..0195618f 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
@@ -3,15 +3,15 @@
 
 		
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
index c986b11d..2620f47a 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
@@ -3,15 +3,15 @@
 
 		
 			<el-row :gutter="5" >
-				<el-col :span="18"> 
+				<el-col :span="showParams?23:24"> 
 					<div>
 						<div class="echart-box" :id="this.id"></div>
 						<div class="progress"></div>
 					</div>
 				</el-col>
-				<el-col :span="6" v-if="showParams"> 
+				<el-col :span="showParams?1:0" v-if="showParams"> 
 					 <el-popover   trigger="manual" v-model="filterVisible" style="float:right;" width="500">
-						<el-button slot="reference" style="margin-top:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
+						<el-button slot="reference" style="margin-top:10px;margin-right:10px;" icon="el-icon-more" @click="filterVisible=!filterVisible"></el-button> 
 						<el-row>
 							<el-button type="danger" icon="el-icon-delete" @click="$emit('delete',cfg)">从报告移出该报表</el-button>
 							<el-button icon="el-icon-close" style="float:right;" @click="filterVisible=false">关闭</el-button>