From 9cebb13a8ae7191f0065afd78fddd75049e17eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 26 Jan 2023 18:08:09 +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

---
 .../xm/rpt/testPlan/testPlanCaseUserDist.vue  | 79 +++++++++++--------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
index e667cabe..5d6d6f93 100644
--- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
+++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue
@@ -59,6 +59,30 @@
 		    ...mapGetters([
 		      'userInfo','roles'
 		    ]), 
+			 
+			hadExecCpd(){
+				if(this.xmTestPlanCaseUserDists.length==0){
+					return []
+				}else{ 
+					return this.xmTestPlanCaseUserDists.map(i=>i.hadExec)
+				}
+			}, 
+			
+			notExecCpd(){
+				if(this.xmTestPlanCaseUserDists.length==0){
+					return []
+				}else{ 
+					return this.xmTestPlanCaseUserDists.map(i=>i.notExec)
+				}
+			}, 
+			legendCpd(){
+				if(this.xmTestPlanCaseUserDists.length==0){
+					return []
+				}else{ 
+					return this.xmTestPlanCaseUserDists.map(i=>i.execUsername)
+				}
+				
+			},
 			xmTestPlanCaseUserDistsCpd(){
 				if(this.xmTestPlanCaseUserDists.length==0){
 					return []
@@ -76,13 +100,7 @@
 			},
 			title(){
 				return  '测试用例执行结果数量分布'
-			},
-			/**0-未测，1-通过，2-受阻，3-忽略，4-失败 */
-			legendCpd(){
-				var itemId="testPlanTcode"; 
-				return this.dicts[itemId].map(i=>this.formatDict(itemId,i.id))
 			}, 
-			
 			xmProductCpd(){
 				if(this.xmTestPlan && this.xmTestPlan.id){
 					return {id:this.xmTestPlan.productId,productName:this.xmTestPlan.productName}
@@ -129,42 +147,37 @@
 			}, 
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("testPlanCaseUserDist")); 
-				this.myChart.setOption(   
+				this.myChart.setOption(      
 					{
-						title: {
-							text: this.title, 
-							left: 'center'
+						xAxis: {
+							type: 'category',
+							data: this.legendCpd
 						},
-						tooltip: {
-							trigger: 'item'
+						yAxis: {
+							type: 'value'
 						},
-						legend: { 
-							top:'5%',
-							left: 'center',
-							data:this.legendCpd,
-						},
-						series: [
+						series: [ 
 							{
-							type: 'pie',
-							radius: '50%',
-							data: this.xmTestPlanCaseUserDistsCpd,
-							emphasis: {
-								itemStyle: {
-								shadowBlur: 10,
-								shadowOffsetX: 0,
-								shadowColor: 'rgba(0, 0, 0, 0.5)'
-								}
+								name: '已执行',
+								type: 'bar',
+								barGap: 0, 
+								emphasis: {
+									focus: 'series'
+								},
+								data: this.hadExecCpd
 							},
-
-							label: {
-								show: true,
-								position: 'center'
+							{
+								name: '未执行',
+								type: 'bar', 
+								emphasis: {
+									focus: 'series'
+								},
+								data: this.notExecCpd
 							},
-							}
 						]
 					}
 				)
-			}, 
+			},
 			searchXmTestPlanCaseUserDist(){ 
 
 				var params={ }