From 7af9172518239103c57931e78deec8cb406d20da 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 20:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/rpt/product/questionAgeDist.vue  | 22 ++++++++++++----
 src/views/xm/rpt/product/questionAttDist.vue  | 22 ++++++++++++----
 .../xm/rpt/product/questionRetestDist.vue     | 26 +++++++++++++------
 src/views/xm/rpt/product/questionSort.vue     | 23 ++++++++++++----
 4 files changed, 70 insertions(+), 23 deletions(-)

diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue
index 576d4b7d..ed0e55c7 100644
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@@ -12,7 +12,7 @@
 				<el-col :span="6" class="border">
 					<el-form :model="filters" class="padding">    
 						<el-form-item label="归属项目">
-							<xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-product-id="xmProductCpd.id?xmProductCpd.id.id:null" @row-click="onProjectSelected"  @clear="onProjectClear"></xm-project-select>
+							<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 label="归属产品"  >
@@ -81,13 +81,14 @@
 	  
 	import { getXmQuestionAgeDist } from '@/api/xm/core/xmQuestion';
 	
+	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目选择
 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
 	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
 
 	export default { 
         
 		components: {   
-			XmIterationSelect,XmProductSelect,
+			XmProjectSelect,XmIterationSelect,XmProductSelect,
 		},
         props:['xmProduct','xmIteration','xmProject'],
 		computed: {
@@ -227,18 +228,29 @@
 				if(this.filters.priority){
 					params.priority=this.filters.priority
 				} 
-				params.groupBy=this.groupBy
+
+				if(this.filters.project){
+					params.projectId=this.filters.project.id
+				} 
 				if(this.filters.product){
 					params.productId=this.filters.product.id
-				}
-				
+				} 
 				if(this.filters.iteration){
 					params.linkIterationId=this.filters.iteration.id
 				}
+				params.groupBy=this.groupBy 
 				getXmQuestionAgeDist(params).then(res=>{
 					this.xmQuestionAgeDists=res.data.data
 				})
 				
+			},
+			onProjectSelected(project){
+				this.filters.project=project
+			},
+			
+			onProjectClear(){
+				this.filters.project=null
+				
 			},
 			onProductSelected(product){
 				this.filters.product=product
diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue
index 6eaf28bb..dc657a43 100644
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@@ -17,7 +17,7 @@
 							</el-select>
 						</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.id?xmProductCpd.id.id:null" @row-click="onProjectSelected"  @clear="onProjectClear"></xm-project-select>
+							<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 label="归属产品"  >
@@ -85,13 +85,14 @@
 	  
 	import { getXmQuestionAttDist } from '@/api/xm/core/xmQuestion';
 	
+	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目选择
 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
 	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
 
 	export default { 
         
 		components: {   
-			XmIterationSelect,XmProductSelect,
+			XmProjectSelect,XmIterationSelect,XmProductSelect,
 		},
         props:['xmProduct','xmIteration','xmProject'],
 		computed: {
@@ -300,18 +301,29 @@
 				if(this.filters.priority){
 					params.priority=this.filters.priority
 				} 
-				params.groupBy=this.groupBy
+
+				if(this.filters.project){
+					params.projectId=this.filters.project.id
+				} 
 				if(this.filters.product){
 					params.productId=this.filters.product.id
-				}
-				
+				} 
 				if(this.filters.iteration){
 					params.linkIterationId=this.filters.iteration.id
 				}
+				params.groupBy=this.groupBy 
 				getXmQuestionAttDist(params).then(res=>{
 					this.xmQuestionAttDists=res.data.data
 				})
 				
+			},
+			onProjectSelected(project){
+				this.filters.project=project
+			},
+			
+			onProjectClear(){
+				this.filters.project=null
+				
 			},
 			onProductSelected(product){
 				this.filters.product=product
diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue
index 8188d727..568e7a58 100644
--- a/src/views/xm/rpt/product/questionRetestDist.vue
+++ b/src/views/xm/rpt/product/questionRetestDist.vue
@@ -12,7 +12,7 @@
 				<el-col :span="6" class="border">
 					<el-form :model="filters" class="padding">    
 						<el-form-item label="归属项目">
-							<xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-product-id="xmProductCpd.id?xmProductCpd.id.id:null" @row-click="onProjectSelected"  @clear="onProjectClear"></xm-project-select>
+							<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 label="归属产品"  >
@@ -80,13 +80,14 @@
 	  
 	import { getXmQuestionRetestDist } from '@/api/xm/core/xmQuestion';
 	
+	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目选择
 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
 	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
 
 	export default { 
         
 		components: {   
-			XmIterationSelect,XmProductSelect,
+			XmProjectSelect,XmIterationSelect,XmProductSelect,
 		},
         props:['xmProduct','xmIteration','xmProject'],
 		computed: {
@@ -270,16 +271,17 @@
 				if(this.filters.priority){
 					params.priority=this.filters.priority
 				} 
-				params.groupBy=this.groupBy
+
+				if(this.filters.project){
+					params.projectId=this.filters.project.id
+				} 
 				if(this.filters.product){
 					params.productId=this.filters.product.id
-				}
-				
+				} 
 				if(this.filters.iteration){
-					params.iterationId=this.filters.iteration.id
+					params.linkIterationId=this.filters.iteration.id
 				}
-
-				
+				params.groupBy=this.groupBy  
 				if (
 					this.pageInfo.orderFields != null &&
 					this.pageInfo.orderFields.length > 0
@@ -296,6 +298,14 @@
 					this.xmQuestionRetests=res.data.data
 				})
 				
+			},
+			onProjectSelected(project){
+				this.filters.project=project
+			},
+			
+			onProjectClear(){
+				this.filters.project=null
+				
 			},
 			onProductSelected(product){
 				this.filters.product=product
diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue
index 81d544fa..41e24634 100644
--- a/src/views/xm/rpt/product/questionSort.vue
+++ b/src/views/xm/rpt/product/questionSort.vue
@@ -18,7 +18,7 @@
 							</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.id?xmProductCpd.id.id:null" @row-click="onProjectSelected"  @clear="onProjectClear"></xm-project-select>
+								<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 label="归属产品"  >
@@ -86,13 +86,14 @@
 	  
 	import { getXmQuestionSort } from '@/api/xm/core/xmQuestion';
 	
+	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目选择
 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品选择界面
 	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面
 
 	export default { 
         
 		components: {   
-			XmIterationSelect,XmProductSelect,
+			XmProjectSelect,XmIterationSelect,XmProductSelect,
 		},
         props:['xmProduct','xmIteration','xmProject','initGroupBy'],
 		computed: {
@@ -241,16 +242,20 @@
 				if(this.filters.priority){
 					params.priority=this.filters.priority
 				} 
-				params.groupBy=this.groupBy
+
+				if(this.filters.project){
+					params.projectId=this.filters.project.id
+				} 
 				if(this.filters.product){
 					params.productId=this.filters.product.id
-				}
-				
+				} 
 				if(this.filters.iteration){
 					params.linkIterationId=this.filters.iteration.id
 				}
 
 				
+				params.groupBy=this.groupBy
+				
 				if (
 					this.pageInfo.orderFields != null &&
 					this.pageInfo.orderFields.length > 0
@@ -267,6 +272,14 @@
 					this.xmQuestionSorts=res.data.data
 				})
 				
+			},
+			onProjectSelected(project){
+				this.filters.project=project
+			},
+			
+			onProjectClear(){
+				this.filters.project=null
+				
 			},
 			onProductSelected(product){
 				this.filters.product=product