From 385c42690bbf737ac27270b98042be4d9345b357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 30 Jan 2023 09:37:12 +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

---
 .../xmTestPlan/rpt/biz/questionAgeDist.vue    | 20 ++++--
 .../xmTestPlan/rpt/biz/questionAttDist.vue    | 20 ++++--
 .../core/xmTestPlan/rpt/biz/questionSort.vue  | 35 ++++++++-
 .../rpt/biz/testPlanCaseExecStatusDist.vue    | 20 ++++--
 .../rpt/biz/testPlanCaseUserDist.vue          | 71 ++++++++++++++-----
 5 files changed, 132 insertions(+), 34 deletions(-)

diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
index ffe12485..292f37a2 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
@@ -147,10 +147,22 @@
 						title: {
 							text: this.title, 
 							left: 'center'
-						},
+						}, 
 						tooltip: {
-							trigger: 'item'
+							trigger: 'item',
+							
 						},
+						
+						toolbox: {
+							show: true,
+							right:"20px",
+							feature: {
+								dataView: { show: true, readOnly: false },  
+								saveAsImage: { show: true }, 
+							}
+						}, 
+						calculable: true,
+						
 						legend: { 
 							top:'5%',
 							left: 'center',
@@ -170,8 +182,8 @@
 							},
 
 							label: {
-								show: true,
-								position: 'center'
+								show: true, 
+								
 							},
 							}
 						]
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue
index cc6ee77e..6208d078 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue
@@ -219,10 +219,22 @@
 						title: {
 							text: this.title, 
 							left: 'center'
-						},
+						}, 
 						tooltip: {
-							trigger: 'item'
+							trigger: 'item',
+							
 						},
+						
+						toolbox: {
+							show: true,
+							right:"20px",
+							feature: {
+								dataView: { show: true, readOnly: false },  
+								saveAsImage: { show: true }, 
+							}
+						}, 
+						calculable: true,
+						
 						legend: { 
 							top:'5%',
 							left: 'center',
@@ -242,8 +254,8 @@
 							},
 
 							label: {
-								show: true,
-								position: 'center'
+								show: true, 
+								
 							},
 							}
 						]
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue
index 345ce63d..356725e0 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue
@@ -1,7 +1,6 @@
 <template>
 	<section>
-		<el-row class="padding">
-			<span>{{compCfg?compCfg.name:'缺陷排行榜'}}</span>
+		<el-row class="padding"> 
 			<el-popover   trigger="manual" v-model="conditionBtnVisible" style="float:right;" width="300">  
 				<el-button slot="reference" icon="el-icon-more" @click="conditionBtnVisible=!conditionBtnVisible"></el-button> 
 				<el-row>
@@ -150,6 +149,27 @@
 				this.myChart = this.$echarts.init(document.getElementById(this.id)); 
 				this.myChart.setOption(   
 					{
+						title: {
+							text: this.title, 
+							left: 'left'
+						}, 
+						
+						tooltip: {
+							trigger: 'axis', 
+						},
+						barMaxWidth: 100,
+						toolbox: {
+							show: true,
+							right:"20px",
+							feature: {
+							dataView: { show: true, readOnly: false },
+							magicType: { show: true, type: ['line', 'bar'] },
+							
+							saveAsImage: { show: true }
+							}
+						},
+
+						calculable: true,
 						xAxis: {
 							type: 'category',
 							data: this.legendCpd
@@ -160,7 +180,16 @@
 						series: [
 							{
 							data: this.xmQuestionSortsCpd,
-							type: 'bar'
+							type: 'bar',								
+							label:{
+									show: true, 
+								},
+							markPoint: {
+									data: [
+									{ type: 'max', name: 'Max' },
+									{ type: 'min', name: 'Min' }
+									]
+								}, 
 							}
 						]
 					}
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
index 16a1d481..e5866376 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
@@ -108,10 +108,22 @@
 						title: {
 							text: this.title, 
 							left: 'center'
-						},
+						}, 
 						tooltip: {
-							trigger: 'item'
+							trigger: 'item',
+							
 						},
+						
+						toolbox: {
+							show: true,
+							right:"20px",
+							feature: {
+								dataView: { show: true, readOnly: false },  
+								saveAsImage: { show: true }, 
+							}
+						}, 
+						calculable: true,
+						
 						legend: { 
 							top:'5%',
 							left: 'center',
@@ -131,8 +143,8 @@
 							},
 
 							label: {
-								show: true,
-								position: 'center'
+								show: true, 
+								
 							},
 							}
 						]
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
index 024d8bcb..48bdf41e 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
@@ -102,33 +102,66 @@
 						title: {
 							text: this.title, 
 							left: 'center'
-						},
+						}, 
+						
 						tooltip: {
-							trigger: 'item'
+							trigger: 'item', 
+						},
+						barMaxWidth: 100,
+						toolbox: {
+							show: true,
+							right:"20px",
+							feature: {
+							dataView: { show: true, readOnly: false },
+							magicType: { show: true, type: ['line', 'bar'] },
+							
+							saveAsImage: { show: true }
+							}
 						},
-						legend: { 
+
+						calculable: true,
+						
+						legend: {
 							top:'5%',
 							left: 'center',
-							data:this.legendCpd,
+							data: ['已执行', '未执行']
+						},
+						xAxis: {
+							type: 'category',
+							data: this.legendCpd
 						},
-						series: [
+						yAxis: {
+							type: 'value'
+						},
+						series: [ 
 							{
-							type: 'pie',
-							radius: '50%',
-							data: this.xmTestPlanCaseUserDistsCpd,
-							emphasis: {
-								itemStyle: {
-								shadowBlur: 10,
-								shadowOffsetX: 0,
-								shadowColor: 'rgba(0, 0, 0, 0.5)'
-								}
+								name: '已执行',
+								type: 'bar', 
+								data: this.hadExecCpd, 
+								label:{
+									show: true, 
+								},
+								markPoint: {
+									data: [
+									{ type: 'max', name: 'Max' },
+									{ type: 'min', name: 'Min' }
+									]
+								}, 
 							},
-
-							label: {
-								show: true,
-								position: 'center'
+							{
+								name: '未执行',
+								type: 'bar',  
+								data: this.notExecCpd,
+								label:{
+									show: true, 
+								},
+								markPoint: {
+									data: [
+									{ type: 'max', name: 'Max' },
+									{ type: 'min', name: 'Min' }
+									]
+								}, 
 							},
-							}
 						]
 					}
 				)