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 @@
-
+
- 取消
+ 取消
打印
pdf
@@ -17,7 +17,7 @@
-
+
@@ -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 @@
-
+
@@ -25,9 +25,9 @@
-
+
-
+
从报告移出该报表
关闭
@@ -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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
@@ -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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
@@ -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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
@@ -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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
@@ -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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
@@ -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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
@@ -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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
-
-
+
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+
-
+
-
+
从报告移出该报表
关闭
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 @@
-
+