From 68eb8ec93a55c5b12e2f454545eb82368b33709f 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 12:46:27 +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/views/xm/rpt/CompsCard.vue                           | 8 ++------
 src/views/xm/rpt/branch/branchWorkItemDayList.vue        | 2 +-
 src/views/xm/rpt/branch/menuDayAccumulate.vue            | 2 +-
 src/views/xm/rpt/branch/menuDayTrend.vue                 | 2 +-
 src/views/xm/rpt/branch/questionDayAccumulate.vue        | 2 +-
 src/views/xm/rpt/branch/questionDayTrend.vue             | 2 +-
 src/views/xm/rpt/iteration/IterationWorkItemDayList.vue  | 2 +-
 src/views/xm/rpt/iteration/burnout.vue                   | 2 +-
 src/views/xm/rpt/iteration/menuDayAccumulate.vue         | 2 +-
 src/views/xm/rpt/iteration/menuDayTrend.vue              | 2 +-
 src/views/xm/rpt/iteration/questionDayAccumulate.vue     | 2 +-
 src/views/xm/rpt/iteration/questionDayTrend.vue          | 2 +-
 src/views/xm/rpt/product/menuAgeDist.vue                 | 2 +-
 src/views/xm/rpt/product/menuAttDist.vue                 | 2 +-
 src/views/xm/rpt/product/menuDayAccumulate.vue           | 2 +-
 src/views/xm/rpt/product/menuDayTrend.vue                | 2 +-
 src/views/xm/rpt/product/menuSort.vue                    | 2 +-
 src/views/xm/rpt/product/productWorkItemDayList.vue      | 2 +-
 src/views/xm/rpt/product/questionAgeDist.vue             | 2 +-
 src/views/xm/rpt/product/questionAttDist.vue             | 2 +-
 src/views/xm/rpt/product/questionDayAccumulate.vue       | 2 +-
 src/views/xm/rpt/product/questionDayTrend.vue            | 2 +-
 src/views/xm/rpt/product/questionRetestDist.vue          | 2 +-
 src/views/xm/rpt/product/questionSort.vue                | 2 +-
 src/views/xm/rpt/project/projectWorkItemDayList.vue      | 2 +-
 src/views/xm/rpt/project/projectWorkloadSetDayList.vue   | 2 +-
 src/views/xm/rpt/project/projectWorkloadSetMonthList.vue | 2 +-
 src/views/xm/rpt/project/taskAgeDist.vue                 | 2 +-
 src/views/xm/rpt/project/taskAttDist.vue                 | 2 +-
 src/views/xm/rpt/project/taskDayAccumulate.vue           | 2 +-
 src/views/xm/rpt/project/taskDayTrend.vue                | 2 +-
 src/views/xm/rpt/project/taskSort.vue                    | 2 +-
 src/views/xm/rpt/testCase/testCaseSort.vue               | 2 +-
 src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue         | 2 +-
 src/views/xm/rpt/testPlan/testDayTimesCalc.vue           | 2 +-
 src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue | 2 +-
 src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue       | 2 +-
 37 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue
index 2e90d4b9..1bd081ed 100644
--- a/src/views/xm/rpt/CompsCard.vue
+++ b/src/views/xm/rpt/CompsCard.vue
@@ -29,7 +29,7 @@
                             :h="item.h"
                             :i="item.i"
                             :key="index" @resize="sizeAutoChange(item)">
-                            <component :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" :init-group-by="item.initGroupBy" :id="item.id" :show-tool-bar="showToolBar" :show-params="showParams"></component>
+                            <component :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="showParams"></component>
                         </grid-item>
                     </grid-layout>
                 </div>
@@ -322,11 +322,7 @@ export default {
                 })
             }
         },
-        doDelete(compCfg){
-            if(this.isRptCfg==false){
-                 this.$notify({ position:'bottom-left', showClose:true, message: "当前报告为预览模式，不能删除，请切换为配置报告模式", type:  'error' });
-                 return;
-            }
+        doDelete(compCfg){ 
             var index=this.compCfgList.findIndex(k=>k.id==compCfg.id) 
             if(index>=0){ 
                 this.compCfgList.splice(index,1)
diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
index 936b37a6..f81c50e1 100644
--- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue
+++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
@@ -29,7 +29,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/branch/menuDayAccumulate.vue b/src/views/xm/rpt/branch/menuDayAccumulate.vue
index eb4a64c9..41e64ca2 100644
--- a/src/views/xm/rpt/branch/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/branch/menuDayAccumulate.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/branch/menuDayTrend.vue b/src/views/xm/rpt/branch/menuDayTrend.vue
index 625e9924..064a6720 100644
--- a/src/views/xm/rpt/branch/menuDayTrend.vue
+++ b/src/views/xm/rpt/branch/menuDayTrend.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/branch/questionDayAccumulate.vue b/src/views/xm/rpt/branch/questionDayAccumulate.vue
index 3cd58b88..c88f7c99 100644
--- a/src/views/xm/rpt/branch/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/branch/questionDayAccumulate.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/branch/questionDayTrend.vue b/src/views/xm/rpt/branch/questionDayTrend.vue
index 053e6a21..5ed51a56 100644
--- a/src/views/xm/rpt/branch/questionDayTrend.vue
+++ b/src/views/xm/rpt/branch/questionDayTrend.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
index 093b4dba..6e9d4f2a 100644
--- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
+++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue
index 6f59eb27..c930efac 100644
--- a/src/views/xm/rpt/iteration/burnout.vue
+++ b/src/views/xm/rpt/iteration/burnout.vue
@@ -14,7 +14,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
index 90c3d2d7..66de6d8f 100644
--- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue
index d70d9e10..457641f6 100644
--- a/src/views/xm/rpt/iteration/menuDayTrend.vue
+++ b/src/views/xm/rpt/iteration/menuDayTrend.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/iteration/questionDayAccumulate.vue b/src/views/xm/rpt/iteration/questionDayAccumulate.vue
index ee9c332c..e2eb6fa4 100644
--- a/src/views/xm/rpt/iteration/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/iteration/questionDayAccumulate.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue
index 58bdc633..f576be54 100644
--- a/src/views/xm/rpt/iteration/questionDayTrend.vue
+++ b/src/views/xm/rpt/iteration/questionDayTrend.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue
index c5c3d04a..b2f732df 100644
--- a/src/views/xm/rpt/product/menuAgeDist.vue
+++ b/src/views/xm/rpt/product/menuAgeDist.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue
index 4e2af818..5a72ae06 100644
--- a/src/views/xm/rpt/product/menuAttDist.vue
+++ b/src/views/xm/rpt/product/menuAttDist.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index f9b9c5b1..a5a3b623 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.vue
@@ -10,7 +10,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index 299a334e..49265f8b 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue
index 1efccaac..8e2914ac 100644
--- a/src/views/xm/rpt/product/menuSort.vue
+++ b/src/views/xm/rpt/product/menuSort.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue
index f28b8c44..1ee69203 100644
--- a/src/views/xm/rpt/product/productWorkItemDayList.vue
+++ b/src/views/xm/rpt/product/productWorkItemDayList.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue
index 51bbb01b..47c6345d 100644
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue
index 1d563b79..97929704 100644
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue
index bcd7f1ae..a3deded9 100644
--- a/src/views/xm/rpt/product/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/product/questionDayAccumulate.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue
index 444c8992..bacc1d14 100644
--- a/src/views/xm/rpt/product/questionDayTrend.vue
+++ b/src/views/xm/rpt/product/questionDayTrend.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue
index cf55f705..09f328b4 100644
--- a/src/views/xm/rpt/product/questionRetestDist.vue
+++ b/src/views/xm/rpt/product/questionRetestDist.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue
index ef1b2578..e3a6c3b3 100644
--- a/src/views/xm/rpt/product/questionSort.vue
+++ b/src/views/xm/rpt/product/questionSort.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue
index 1f2e3144..c1fb9a44 100644
--- a/src/views/xm/rpt/project/projectWorkItemDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
index c7aac766..15a8bf76 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
index e4818957..6668c3ce 100644
--- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
+++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue
index 4f72c551..119e9c61 100644
--- a/src/views/xm/rpt/project/taskAgeDist.vue
+++ b/src/views/xm/rpt/project/taskAgeDist.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue
index 6ecb618a..deeb8ae8 100644
--- a/src/views/xm/rpt/project/taskAttDist.vue
+++ b/src/views/xm/rpt/project/taskAttDist.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue
index e0c06594..e39ee81c 100644
--- a/src/views/xm/rpt/project/taskDayAccumulate.vue
+++ b/src/views/xm/rpt/project/taskDayAccumulate.vue
@@ -11,7 +11,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue
index c55f30ce..4b5964af 100644
--- a/src/views/xm/rpt/project/taskDayTrend.vue
+++ b/src/views/xm/rpt/project/taskDayTrend.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue
index fe42be53..2479a62e 100644
--- a/src/views/xm/rpt/project/taskSort.vue
+++ b/src/views/xm/rpt/project/taskSort.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/testCase/testCaseSort.vue b/src/views/xm/rpt/testCase/testCaseSort.vue
index fecec693..f9b1b277 100644
--- a/src/views/xm/rpt/testCase/testCaseSort.vue
+++ b/src/views/xm/rpt/testCase/testCaseSort.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
index 3bc078ce..1c1a191d 100644
--- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
+++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
index 950d3047..8415b8b9 100644
--- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
+++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
@@ -12,7 +12,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
index 0777e076..fb01424f 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>
diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
index b8846ec1..c986b11d 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
@@ -13,7 +13,7 @@
 					 <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-row>
-							<el-button type="danger" icon="el-icon-delete" @click="doDelete">从报告移出该报表</el-button>
+							<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>
 						</el-row>
 						<el-row>