From 1d8ab6ddeeeec9ae2aa379368dd5fecdf8139b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 27 Jan 2023 16:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E8=A7=84?=
 =?UTF-8?q?=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/xm/core/xmTestPlanCase.js             |   3 +
 src/views/xm/rpt/reportIndex.vue              |   4 +-
 .../xm/rpt/testPlan/testCaseToPlanCalc.vue    | 277 ++++++++++++++++++
 .../xm/rpt/testPlan/testDayTimesCalc.vue      |   4 +-
 4 files changed, 285 insertions(+), 3 deletions(-)
 create mode 100644 src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue

diff --git a/src/api/xm/core/xmTestPlanCase.js b/src/api/xm/core/xmTestPlanCase.js
index 6e0c73a9..c773710e 100644
--- a/src/api/xm/core/xmTestPlanCase.js
+++ b/src/api/xm/core/xmTestPlanCase.js
@@ -24,6 +24,9 @@ export const getXmTestPlanCaseUserDist = params => { return axios.get(`${base}/x
 //查询每日执行测试次数
 export const getXmTestDayTimesList = params => { return axios.get(`${base}/xm/core/xmTestPlanCase/getXmTestDayTimesList`, { params: params }); };
 
+//查询测试用例规划分析数据
+export const getXmTestCaseToPlanCalcList = params => { return axios.get(`${base}/xm/core/xmTestPlanCase/getXmTestCaseToPlanCalcList`, { params: params }); };
+
 
 //删除一条测试计划与用例关系表 params={caseId:'测试用例编号 主键',planId:'计划编号 主键'}
 export const delXmTestPlanCase = params => { return axios.post(`${base}/xm/core/xmTestPlanCase/del`,params); };
diff --git a/src/views/xm/rpt/reportIndex.vue b/src/views/xm/rpt/reportIndex.vue
index e68b6387..749ede52 100644
--- a/src/views/xm/rpt/reportIndex.vue
+++ b/src/views/xm/rpt/reportIndex.vue
@@ -63,6 +63,7 @@
         <xm-test-plan-case-exec-status-dist ref="xmTestPlanCaseExecStatusDist" :xm-product="xmProduct" :xm-project="xmProject" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan"></xm-test-plan-case-exec-status-dist> 
         <xm-test-plan-case-user-dist ref="xmTestPlanCaseUserDist" :xm-product="xmProduct" :xm-project="xmProject" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan"></xm-test-plan-case-user-dist>
         <xm-test-day-times-calc ref="xmTestDayTimesCalc" :xm-product="xmProduct" :xm-project="xmProject" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan"></xm-test-day-times-calc>
+        <xm-test-case-to-plan-calc ref="xmTestCaseToPlanCalc" :xm-product="xmProduct" :xm-project="xmProject" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan"></xm-test-case-to-plan-calc>
 
 
     </section>
@@ -111,6 +112,7 @@
 	import xmTestPlanCaseExecStatusDist from './testPlan/testPlanCaseExecStatusDist'
 	import xmTestPlanCaseUserDist from './testPlan/testPlanCaseUserDist'
 	import xmTestDayTimesCalc from './testPlan/testDayTimesCalc'
+	import xmTestCaseToPlanCalc from './testPlan/testCaseToPlanCalc'
     
     import pieSimple from './images/pie-simple.png'
     import lineStack from './images/line-stack.png'
@@ -126,7 +128,7 @@
             xmIterationXmMenuDayTrend,xmIterationXmMenuDayAccumulate,xmIterationWorkItemDayList,xmIterationXmQuestionDayTrend,xmIterationXmQuestionDayAccumulate,
             
             xmTestPlanCaseExecStatusDist,xmTestPlanCaseUserDist,xmQuestionRetestDist,xmQuestionStateDist,
-            xmQuestionAskUserSort,xmQuestionHandlerUserSort,xmQuestionFuncSort,xmQuestionMenuSort,xmTestDayTimesCalc,
+            xmQuestionAskUserSort,xmQuestionHandlerUserSort,xmQuestionFuncSort,xmQuestionMenuSort,xmTestDayTimesCalc,xmTestCaseToPlanCalc
         
         },
         props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan'],
diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
new file mode 100644
index 00000000..31077e6e
--- /dev/null
+++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
@@ -0,0 +1,277 @@
+<template>
+	<section>
+
+		<el-dialog fullscreen :title="title" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+			<el-row :gutter="5">
+				<el-col :span="18"> 
+					<div>
+						<div class="main" id="testPlanCaseExecStatusDist"
+							style="width:100%;height:600px;margin:0 auto;"></div>
+						<div class="progress"></div>
+					</div>
+				</el-col>
+				<el-col :span="6" class="border padding">
+					<el-form  :model="filters">   
+						
+						
+						<el-form-item label="归属产品"  >
+							<xm-product-select v-if="!xmProductCpd || !xmProductCpd.id"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmTestPlan?xmTestPlan.id:null"  @clear="onProductClear"></xm-product-select>
+							<span v-else>{{xmProductCpd.id}} <span v-if="xmProductCpd.productName"><br/>{{  xmProductCpd.productName  }} </span> </span>
+						</el-form-item>
+						<el-form-item label="测试计划" v-if="xmTestPlan && xmTestPlan.id">
+ 							<span>  {{xmTestPlan.id}}
+								<span v-if="xmTestPlan.name"><br/>{{ xmTestPlan.name  }} </span>
+							</span> 
+						</el-form-item>  
+						<el-form-item label="测试计划" v-else-if="filters.product && filters.product.id">
+							<span v-if="filters.testPlan">{{ filters.testPlan.name }}</span><el-button type="primary" @click="$refs['xmTestPlanSelectRef'].open()">选择计划</el-button>
+						</el-form-item> 
+						 
+						<el-form-item label="归属项目"  >
+							<xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-product-id="xmProductCpd?xmProductCpd.id:null" @row-click="onProjectSelected" @clear="onProjectClear"></xm-project-select>
+							<span v-else>{{xmProject.id}} <span v-if="xmProject.name"><br/>{{  xmProject.name  }} </span> </span>
+						</el-form-item>
+					<el-form-item>
+						 <el-button type="primary" icon="el-icon-search" @click="searchXmTestPlanCaseExecStatusDist">查询</el-button>
+					</el-form-item>  
+					</el-form>
+				</el-col>
+			</el-row>
+        </el-dialog>
+
+		<xm-test-plan-select  ref="xmTestPlanSelectRef" :casedb-id="xmTestCasedb?xmTestCasedb.id:null" :product-id="xmProduct?xmProduct.id:null" :project-id="xmProject?xmProject.id:null"   placeholder="迭代"  @select="onXmTestPlanSelected" @clear="onXmTestPlanClear"></xm-test-plan-select >
+ 
+ 	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
+	import { mapGetters } from 'vuex'	 
+	  
+	import { getXmTestCaseToPlanCalcList } from '@/api/xm/core/xmTestPlanCase';
+	
+	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品
+	import  xmTestPlanSelect from '@/views/xm/core/xmTestPlan/XmTestPlanSelect';//计划选择器
+
+	export default { 
+        
+		components: {   
+			XmProjectSelect,XmProductSelect,xmTestPlanSelect,
+		},
+        props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ]), 
+			xmTestCaseToPlanCalcListCpd(){
+				if(this.xmTestCaseToPlanCalcList.length==0){
+					return []
+				}else{   
+					var names=this.legendCpd;
+					var datas=[]
+					this.xmTestCaseToPlanCalcList.forEach(i=>{
+						var nameIndex=0;
+						if(i.useTimes<=2){
+							nameIndex=i.useTimes
+						}else if(i.useTimes>=3 && i.useTimes<=5){
+							nameIndex=3
+						}else if(i.useTimes>5 && i.useTimes<=10){
+							nameIndex=4
+						}else if(i.useTimes>10){
+							nameIndex=5
+						}
+						var data={name:names[nameIndex],value:i.caseNum}
+						datas.push(data)
+					})
+					return datas;
+				} 
+			},
+			title(){
+				return  '测试用例规划分析'
+			},
+			/**0-未测，1-通过，2-受阻，3-忽略，4-失败 */
+			legendCpd(){ 
+				 return ['0次','1次','2次','3-5次','5-10次','10次以上']
+			}, 
+			
+			xmProductCpd(){
+				if(this.xmTestPlan && this.xmTestPlan.id){
+					return {id:this.xmTestPlan.productId,productName:this.xmTestPlan.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
+        }, 
+		watch: {  
+			xmTestCaseToPlanCalcListCpd(){
+				this.drawCharts();
+			}
+	    },
+		data() {
+			return {
+                filters:{ 
+					testPlan:null,
+					product:null,
+					project:null,
+                }, 
+				 
+				dicts:{testStepTcode:[]},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				load:{ list: false, edit: false, del: false, add: false },//查询中... 
+				dateRanger:[], 
+                maxTableHeight:300, 
+                visible:false,
+				xmTestCaseToPlanCalcList:[],
+				conditionBtnVisible:false,
+
+			}//end return
+		},//end data
+		methods: { 
+			formatDict(itemId,val){
+				var dict=this.dicts[itemId]
+				if(dict){
+					var item=dict.find(i=>i.id==val)
+					if(item){
+						return item.name
+					}
+				}
+				return val;
+			}, 
+			drawCharts() {
+				this.myChart = this.$echarts.init(document.getElementById("testPlanCaseExecStatusDist")); 
+				this.myChart.setOption(   
+					{
+						title: {
+							text: this.title, 
+							left: 'center'
+						},
+						tooltip: {
+							trigger: 'item'
+						},
+						legend: { 
+							top:'5%',
+							left: 'center',
+							data:this.legendCpd,
+						},
+						series: [
+							{
+							type: 'pie',
+							radius: '50%',
+							data: this.xmTestCaseToPlanCalcListCpd,
+							emphasis: {
+								itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
+								}
+							},
+
+							label: {
+								show: true,
+								position: 'center'
+							},
+							}
+						]
+					}
+				)
+			},
+			onXmQuestionSomeFieldsChange(fieldName,$event){
+				this.xmTestCaseToPlanCalcList=[]
+			},
+			searchXmTestPlanCaseExecStatusDist(){ 
+
+				var params={ } 
+				if(this.filters.product && this.filters.product.id){
+					params.productId=this.filters.product.id
+				}
+				
+				if(this.filters.project && this.filters.project.id){
+					params.projectId=this.filters.project.id
+				}
+
+				
+				if(this.filters.project && this.filters.project.id){
+					params.projectId=this.filters.project.id
+				}
+
+				
+				if(this.filters.testPlan && this.filters.testPlan.id){
+					params.planId=this.filters.testPlan.id
+				}
+				if(this.filters.testCasedb && this.filters.testCasedb.id){
+					params.casedbId=this.filters.testCasedb.id
+				}
+				if(params.productId || params.projectId || params.planId || params.casedbId){
+					getXmTestCaseToPlanCalcList(params).then(res=>{
+						this.xmTestCaseToPlanCalcList=res.data.data
+					})
+				}else{
+					this.$message.error("请选择查询条件，产品、项目、测试计划最少选择一个")
+				}
+			},
+			onProductSelected(product){
+				this.filters.product=product
+			},
+			
+			onProductClear(){
+				this.filters.product=null
+				
+			},
+			
+			onProjectSelected(project){
+				this.filters.project=project
+			},
+			
+			onProjectClear(){
+				this.filters.project=null
+				
+			},
+			onXmTestPlanSelected(xmTestPlan){
+				this.filters.testPlan=xmTestPlan
+			},
+			
+			onXmTestPlanClear(){
+				this.filters.testPlan=null
+			},
+			initData(){
+				if(this.xmTestPlan){ 
+					this.filters.testPlan=this.xmTestPlan
+				} 
+			}, 
+			sizeAutoChange(){
+				this.myChart.resize();
+			},
+			open(params){
+				this.visible=true;
+				this.filters.testPlan=this.xmTestPlan
+				this.filters.product=this.xmProduct
+				this.filters.project=this.xmProject
+				this.filters.testCasedb=this.xmTestCasedb
+				
+				if(this.xmTestPlan && this.xmTestPlan.id){ 
+						this.searchXmTestPlanCaseExecStatusDist(); 
+					
+				}
+				
+			}
+		},//end method
+		mounted() { 
+ 			initSimpleDicts('all',['testStepTcode'] ).then(res=>{
+				this.dicts=res.data.data;
+			}) 
+			this.initData();   
+			
+		}//end mounted
+	}
+
+</script>
+
+<style scoped>
+   .image {
+    width: 100%;
+    display: block;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
index 7c94fffb..1769536f 100644
--- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
+++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue
@@ -73,9 +73,9 @@
 					}
 				} 
 				if(productName){
-					return `产品【${productName}】缺陷每日趋势图`
+					return `产品【${productName}】测试用例每日执行次数统计`
 				}else{
-					return "产品缺陷每日趋势图"
+					return "测试用例每日执行次数统计"
 				}
 			},
 			xmProductCpd(){