From 5380b3ff39c5bf8ff4e487b9327230d166d18433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 2 Aug 2022 19:20:40 +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/core/xmTestPlan/rpt/CompsCard.vue | 18 +++++++++---------
 .../xmTestPlan/rpt/biz/questionAgeDist.vue     | 13 ++++++++-----
 .../xmTestPlan/rpt/biz/questionAttDist.vue     | 15 +++++++++------
 .../rpt/biz/testPlanCaseExecStatusDist.vue     | 15 +++++++++------
 .../rpt/biz/testPlanCaseUserDist.vue           | 15 +++++++++------
 5 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
index 95376523..c01bc746 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
@@ -107,14 +107,14 @@ export default {
             maxTableHeight:300,
             // 布局位置数据
             initCompCfg: [
-                 { i:1, x: 0,  y: 12,  w: 12, h: 4,  id:'xmQuestionAgeDist',name:'缺陷年龄分布',compId:'xmQuestionAgeDist', params:[] }, 
-                 { i: 2, x: 0,  y: 12,  w: 12, h: 4, id:'xmQuestionAttDist',name:'缺陷属性分布',compId:'xmQuestionAttDist',  },
-                 { i: 3, x: 0,  y: 12,  w: 12, h: 4,   id:'xmQuestionHandlerUserSort',name:'缺陷负责人排行榜',compId:'xmQuestionHandlerUserSort',  }, 
-                 { i: 4, x: 0,  y: 12,  w: 12, h: 4,   id:'xmQuestionAskUserSort',name:'缺陷提出人排行榜', compId:'xmQuestionAskUserSort',  }, 
-                 { i:5, x: 0,  y: 12,  w: 12, h: 4,   id:'xmQuestionMenuSort',name:'缺陷需求分布', compId:'xmQuestionMenuSort',  }, 
-                 { i: 6, x: 0,  y: 12,  w: 12, h: 4,   id:'xmQuestionFuncSort',name:'缺陷模块分布', compId:'xmQuestionFuncSort',  },  
-                 { i: 7, x: 0,  y: 12,  w: 12, h: 4,   id:'xmTestPlanCaseExecStatusDist',name:'用例执行结果分布', compId:'xmTestPlanCaseExecStatusDist',  }, 
-                 { i: 8, x: 0,  y: 12,  w: 12, h: 4,   id:'xmTestPlanCaseUserDist',name:'用例执行人情况分布', compId:'xmTestPlanCaseUserDist',  }, 
+                 { i:1, x: 0,  y: 12,  w: 12, h: 6,  id:'xmQuestionAgeDist',name:'缺陷年龄分布',compId:'xmQuestionAgeDist', params:[] }, 
+                 { i: 2, x: 0,  y: 12,  w: 12, h: 6, id:'xmQuestionAttDist',name:'缺陷属性分布',compId:'xmQuestionAttDist',  },
+                 { i: 3, x: 0,  y: 12,  w: 12, h: 6,   id:'xmQuestionHandlerUserSort',name:'缺陷负责人排行榜',compId:'xmQuestionHandlerUserSort',  }, 
+                 { i: 4, x: 0,  y: 12,  w: 12, h: 6,   id:'xmQuestionAskUserSort',name:'缺陷提出人排行榜', compId:'xmQuestionAskUserSort',  }, 
+                 { i:5, x: 0,  y: 12,  w: 12, h: 6,   id:'xmQuestionMenuSort',name:'缺陷需求分布', compId:'xmQuestionMenuSort',  }, 
+                 { i: 6, x: 0,  y: 12,  w: 12, h: 6,   id:'xmQuestionFuncSort',name:'缺陷模块分布', compId:'xmQuestionFuncSort',  },  
+                 { i: 7, x: 0,  y: 12,  w: 12, h: 6,   id:'xmTestPlanCaseExecStatusDist',name:'用例执行结果分布', compId:'xmTestPlanCaseExecStatusDist',  }, 
+                 { i: 8, x: 0,  y: 12,  w: 12, h: 6,   id:'xmTestPlanCaseUserDist',name:'用例执行人情况分布', compId:'xmTestPlanCaseUserDist',  }, 
                  
                  
             ],
@@ -141,7 +141,7 @@ export default {
             }
         },
         onCompSelect(comp){
-            var compCfg={i:this.compCfgList.length+1, x: 0,  y: 0,  w: 12, h: 6, compId:comp.compId,name:comp.name,id:comp.compId+seq.sn(),params:[]} 
+            var compCfg={i:this.compCfgList.length+1, x: 0,  y: 12,  w: 12, h: 6, compId:comp.compId,name:comp.name,id:comp.compId+seq.sn(),params:[]} 
                 this.compCfgList.push(compCfg) 
         }
          
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
index db0e1376..7d6eccb1 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section> 
 		<el-row class="padding">
-			<span>{{comp?comp.compName:'缺陷年龄数量分布'}}</span>
+			<span>{{compCfg?compCfg.name:'缺陷年龄数量分布'}}</span>
 			<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-form :model="filters">   
@@ -51,7 +51,7 @@
 		</el-row>
 		<el-row> 
 					<div>
-						<div class="main" id="xmQuestionAgeDist"
+						<div class="main" :id="id"
 							style="width:100%;height:600px;margin:0 auto;"></div>
 						<div class="progress"></div>
 					</div>  
@@ -74,7 +74,7 @@
 		components: {   
 			XmIterationSelect,XmProductSelect,
 		},
-        props:['xmTestPlan','xmRptConfig','comp'],
+        props:['xmTestPlan','xmRptConfig','compCfg'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -97,6 +97,9 @@
 			},
 			legendCpd(){
 				 return ['0-2天','3-5天','6-7天','8-15天','16-30天','30天以上']
+			},
+			id(){
+				return this.compCfg.id
 			}
 			
         }, 
@@ -133,7 +136,7 @@
 		},//end data
 		methods: {   
 			drawCharts() {
-				this.myChart = this.$echarts.init(document.getElementById("xmQuestionAgeDist")); 
+				this.myChart = this.$echarts.init(document.getElementById(this.id)); 
 				this.myChart.setOption(   
 					{
 						title: {
@@ -207,7 +210,7 @@
 					this.filters.planId=this.xmTestPlan.id
 				}
 				if(this.xmRptConfig && this.xmRptConfig.cfg){
-					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.comp.id)
+					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id)
 					if(compCfg && compCfg.params){
 						compCfg.params.forEach(k=>{
 							this.filters[k.id]=k.value
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue
index 6e357cb7..e3a7177d 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAttDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row class="padding">
-			<span>{{comp?comp.compName:'缺陷属性数量分布'}}</span>
+			<span>{{compCfg?compCfg.name:'缺陷属性数量分布'}}</span>
 			<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-form :model="filters">   
@@ -55,7 +55,7 @@
 		</el-row>
 		<el-row>  
 			<div>
-				<div class="main" id="xmQuestionAttDist"
+				<div class="main" :id="id"
 					style="width:100%;height:600px;margin:0 auto;"></div>
 				<div class="progress"></div>
 			</div> 
@@ -78,7 +78,7 @@
 		components: {   
 			XmIterationSelect,XmProductSelect,
 		},
-        props:['xmTestPlan','xmRptConfig','comp'],
+        props:['xmTestPlan','xmRptConfig','compCfg'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -132,7 +132,10 @@
 				} 
 
 				return this.dicts[itemId].map(i=>i.name)
-			}
+			},
+			id(){
+				return this.compCfg.id
+			},
 			
         }, 
 		watch: {  
@@ -206,7 +209,7 @@
 				
 			},
 			drawCharts() {
-				this.myChart = this.$echarts.init(document.getElementById("xmQuestionAttDist")); 
+				this.myChart = this.$echarts.init(document.getElementById(this.id)); 
 				this.myChart.setOption(   
 					{
 						title: {
@@ -281,7 +284,7 @@
 					this.filters.planId=this.xmTestPlan.id
 				}
 				if(this.xmRptConfig && this.xmRptConfig.cfg){
-					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.comp.id)
+					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id)
 					if(compCfg && compCfg.params){
 						compCfg.params.forEach(k=>{
 							this.filters[k.id]=k.value
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
index f25708c4..aaaef107 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseExecStatusDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row class="padding">
-			<span>{{comp?comp.compName:'执行结果分布'}}</span>
+			<span>{{compCfg?compCfg.name:'执行结果分布'}}</span>
 			<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-form :model="filters">    
@@ -13,7 +13,7 @@
 		</el-row>
 		<el-row>  
 			<div>
-				<div class="main" id="xmTestPlanCaseExecStatusDist"
+				<div class="main" :id="id"
 					style="width:100%;height:600px;margin:0 auto;"></div>
 				<div class="progress"></div>
 			</div> 
@@ -36,7 +36,7 @@
 		components: {   
 			XmIterationSelect,XmProductSelect,
 		},
-        props:['xmTestPlan','xmRptConfig','comp'],
+        props:['xmTestPlan','xmRptConfig','compCfg'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -59,7 +59,10 @@
 			legendCpd(){
 				var itemId="testPlanTcode"; 
 				return this.dicts[itemId].map(i=>i.name)
-			}
+			},
+			id(){
+				return this.compCfg.id
+			},
 			
         }, 
 		watch: {  
@@ -95,7 +98,7 @@
 				return val;
 			}, 
 			drawCharts() {
-				this.myChart = this.$echarts.init(document.getElementById("xmTestPlanCaseExecStatusDist")); 
+				this.myChart = this.$echarts.init(document.getElementById(this.id)); 
 				this.myChart.setOption(   
 					{
 						title: {
@@ -165,7 +168,7 @@
 					this.filters.planId=this.xmTestPlan.id
 				}
 				if(this.xmRptConfig && this.xmRptConfig.cfg){
-					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.comp.id)
+					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id)
 					if(compCfg && compCfg.params){
 						compCfg.params.forEach(k=>{
 							this.filters[k.id]=k.value
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
index d962dcf5..4fe79d28 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/testPlanCaseUserDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
 		<el-row class="padding">
-			<span>{{comp?comp.compName:'成员执行结果分布'}}</span>
+			<span>{{compCfg?compCfg.name:'成员执行结果分布'}}</span>
 			<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-form :model="filters">    
@@ -13,7 +13,7 @@
 		</el-row>
 		<el-row>  
 			<div>
-				<div class="main" id="xmTestPlanCaseUserDist"
+				<div class="main" :id="id"
 					style="width:100%;height:600px;margin:0 auto;"></div>
 				<div class="progress"></div>
 			</div> 
@@ -36,7 +36,7 @@
 		components: {   
 			XmIterationSelect,XmProductSelect,
 		},
-        props:['xmTestPlan','xmRptConfig','comp'],
+        props:['xmTestPlan','xmRptConfig','compCfg'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -53,7 +53,10 @@
 			},
 			legendCpd(){ 
 				return ['已执行','未执行']
-			}
+			},
+			id(){
+				return this.compCfg.id
+			},
 			
         }, 
 		watch: {  
@@ -89,7 +92,7 @@
 				return val;
 			}, 
 			drawCharts() {
-				this.myChart = this.$echarts.init(document.getElementById("xmTestPlanCaseUserDist")); 
+				this.myChart = this.$echarts.init(document.getElementById(this.id)); 
 				this.myChart.setOption(   
 					{
 						title: {
@@ -159,7 +162,7 @@
 					this.filters.planId=this.xmTestPlan.id
 				}
 				if(this.xmRptConfig && this.xmRptConfig.cfg){
-					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.comp.id)
+					var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.compCfg.id)
 					if(compCfg && compCfg.params){
 						compCfg.params.forEach(k=>{
 							this.filters[k.id]=k.value