diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss index 09cc2eb7..a1d9e3a1 100644 --- a/src/styles/mdp.scss +++ b/src/styles/mdp.scss @@ -329,6 +329,13 @@ table tr.hover-row{ width: 20px; } +.echart-box{ + min-height: calc(60vh); + max-height: calc(80vh); + overflow-y: 'hidden'; + width:100%; +} + /*此处根据不同屏幕分配率显示不同的样式*/ /*手机端*/ @media only screen and (min-width: 0px) and (max-width: 768px) { diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue index c8e83b94..93fd1bbd 100644 --- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue +++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue @@ -155,7 +155,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/branch/menuDayAccumulate.vue b/src/views/xm/rpt/branch/menuDayAccumulate.vue index bb18614e..767d96c3 100644 --- a/src/views/xm/rpt/branch/menuDayAccumulate.vue +++ b/src/views/xm/rpt/branch/menuDayAccumulate.vue @@ -189,7 +189,8 @@ }, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/branch/menuDayTrend.vue b/src/views/xm/rpt/branch/menuDayTrend.vue index cbf96e96..7edb730f 100644 --- a/src/views/xm/rpt/branch/menuDayTrend.vue +++ b/src/views/xm/rpt/branch/menuDayTrend.vue @@ -161,7 +161,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/branch/questionDayAccumulate.vue b/src/views/xm/rpt/branch/questionDayAccumulate.vue index 792ec6bd..798f8c68 100644 --- a/src/views/xm/rpt/branch/questionDayAccumulate.vue +++ b/src/views/xm/rpt/branch/questionDayAccumulate.vue @@ -177,7 +177,8 @@ }, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/branch/questionDayTrend.vue b/src/views/xm/rpt/branch/questionDayTrend.vue index 82f0bdac..e4d31200 100644 --- a/src/views/xm/rpt/branch/questionDayTrend.vue +++ b/src/views/xm/rpt/branch/questionDayTrend.vue @@ -162,7 +162,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue index 7929e623..00626321 100644 --- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue +++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue @@ -197,7 +197,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue index e5a7c583..876d7a52 100644 --- a/src/views/xm/rpt/iteration/burnout.vue +++ b/src/views/xm/rpt/iteration/burnout.vue @@ -214,7 +214,8 @@ }, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue index fbf1e10f..22f1f5c5 100644 --- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue @@ -209,7 +209,8 @@ }, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue index debce7c4..c4eb9ca6 100644 --- a/src/views/xm/rpt/iteration/menuDayTrend.vue +++ b/src/views/xm/rpt/iteration/menuDayTrend.vue @@ -205,7 +205,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/iteration/questionDayAccumulate.vue b/src/views/xm/rpt/iteration/questionDayAccumulate.vue index 869f1885..8f766bd7 100644 --- a/src/views/xm/rpt/iteration/questionDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/questionDayAccumulate.vue @@ -218,7 +218,8 @@ }, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue index 69490579..bdce11e0 100644 --- a/src/views/xm/rpt/iteration/questionDayTrend.vue +++ b/src/views/xm/rpt/iteration/questionDayTrend.vue @@ -204,7 +204,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue index f037db4d..99397fe2 100644 --- a/src/views/xm/rpt/product/menuAgeDist.vue +++ b/src/views/xm/rpt/product/menuAgeDist.vue @@ -185,7 +185,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue index 8d177b36..91280b4d 100644 --- a/src/views/xm/rpt/product/menuAttDist.vue +++ b/src/views/xm/rpt/product/menuAttDist.vue @@ -242,7 +242,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue index 69e2e97e..f5cb7e71 100644 --- a/src/views/xm/rpt/product/menuDayAccumulate.vue +++ b/src/views/xm/rpt/product/menuDayAccumulate.vue @@ -191,7 +191,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue index b2c5aaa8..d7fb6ed2 100644 --- a/src/views/xm/rpt/product/menuDayTrend.vue +++ b/src/views/xm/rpt/product/menuDayTrend.vue @@ -187,7 +187,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue index a5ced708..f52b258e 100644 --- a/src/views/xm/rpt/product/menuSort.vue +++ b/src/views/xm/rpt/product/menuSort.vue @@ -204,7 +204,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue index 0ab07edf..29483c6a 100644 --- a/src/views/xm/rpt/product/productWorkItemDayList.vue +++ b/src/views/xm/rpt/product/productWorkItemDayList.vue @@ -181,7 +181,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue index 62dab6fb..7b71c589 100644 --- a/src/views/xm/rpt/product/questionAgeDist.vue +++ b/src/views/xm/rpt/product/questionAgeDist.vue @@ -211,7 +211,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue index 6de643bb..543f8b1f 100644 --- a/src/views/xm/rpt/product/questionAttDist.vue +++ b/src/views/xm/rpt/product/questionAttDist.vue @@ -3,8 +3,7 @@
-
+
@@ -286,7 +285,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, @@ -294,9 +294,8 @@ }, calculable: true, - legend: { - top:'5%', - left: 'center', + legend: { + bottom: 'bottom', data:this.legendCpd, }, series: [ diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue index ef869ffd..91862cc8 100644 --- a/src/views/xm/rpt/product/questionDayAccumulate.vue +++ b/src/views/xm/rpt/product/questionDayAccumulate.vue @@ -203,7 +203,8 @@ }, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue index 19fed3fb..68a2b41a 100644 --- a/src/views/xm/rpt/product/questionDayTrend.vue +++ b/src/views/xm/rpt/product/questionDayTrend.vue @@ -187,7 +187,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue index 1baecd36..17335ac0 100644 --- a/src/views/xm/rpt/product/questionRetestDist.vue +++ b/src/views/xm/rpt/product/questionRetestDist.vue @@ -246,7 +246,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue index 9ed6fe81..7c7dc961 100644 --- a/src/views/xm/rpt/product/questionSort.vue +++ b/src/views/xm/rpt/product/questionSort.vue @@ -3,8 +3,7 @@
-
+
@@ -233,7 +232,7 @@ { title: { text: this.title, - left: 'center' + left: 'center', }, tooltip: { @@ -242,7 +241,9 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, @@ -256,13 +257,13 @@ type: 'category', data: this.legendCpd }, - yAxis: { + yAxis: { type: 'value' }, series: [ { data: this.xmQuestionSortsCpd, - type: 'bar', + type: 'bar', label:{ show: true, }, diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue index 6475b44a..d280b0e7 100644 --- a/src/views/xm/rpt/project/projectWorkItemDayList.vue +++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue @@ -176,7 +176,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue index 5a4f072a..79a0db17 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue @@ -194,7 +194,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue index 538fbc42..35b3ea8b 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue @@ -195,7 +195,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue index 9757e22b..f2ba4bfa 100644 --- a/src/views/xm/rpt/project/taskAgeDist.vue +++ b/src/views/xm/rpt/project/taskAgeDist.vue @@ -156,7 +156,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue index 58027bff..06bc4d0f 100644 --- a/src/views/xm/rpt/project/taskAttDist.vue +++ b/src/views/xm/rpt/project/taskAttDist.vue @@ -216,7 +216,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue index b549a3ff..f1877ce7 100644 --- a/src/views/xm/rpt/project/taskDayAccumulate.vue +++ b/src/views/xm/rpt/project/taskDayAccumulate.vue @@ -194,7 +194,8 @@ }, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue index 5cecd80d..cd0026d2 100644 --- a/src/views/xm/rpt/project/taskDayTrend.vue +++ b/src/views/xm/rpt/project/taskDayTrend.vue @@ -177,7 +177,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue index 3e28e77c..4163650f 100644 --- a/src/views/xm/rpt/project/taskSort.vue +++ b/src/views/xm/rpt/project/taskSort.vue @@ -176,7 +176,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/reportIndex.vue b/src/views/xm/rpt/reportIndex.vue index 53f8ee7b..ebfc7683 100644 --- a/src/views/xm/rpt/reportIndex.vue +++ b/src/views/xm/rpt/reportIndex.vue @@ -351,7 +351,7 @@ margin-right: 5px; } p { - font-size: 18px; + font-size: 16px; font-weight: bold; color: #7D7D7D; margin-bottom: 10px; @@ -398,7 +398,7 @@ .title{ width:100%; p { - font-size: 14px; + font-size: 12px; font-weight: bold; color: #7D7D7D; margin-bottom: 5px; @@ -418,9 +418,9 @@ .desc{ width:75%; span { - font-size: 8px; + font-size: 10px; color: #7D7D7D; - line-height: 10px; + line-height: 12px; } } diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue index e91d76e1..f8aa2057 100644 --- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue +++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue @@ -189,7 +189,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue index 7c29721b..66bb8418 100644 --- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue +++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue @@ -208,7 +208,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] }, diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue index 79ca5dc2..69c3b6d9 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue @@ -182,7 +182,8 @@ toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, saveAsImage: { show: true }, diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue index 0cc4d851..5fcfa3ca 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue @@ -200,7 +200,8 @@ barMaxWidth: 100, toolbox: { show: true, - right:"20px", + top:"5%", + right:"10px", feature: { dataView: { show: true, readOnly: false }, magicType: { show: true, type: ['line', 'bar'] },