From 8f3724e54ede35c6c3e13dd8f5c574121b06b94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 25 Jan 2023 17:42:54 +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/iteration/IterationWorkItemDayList.vue    |  6 ++----
 src/views/xm/rpt/product/menuAgeDist.vue             |  9 ++++++---
 src/views/xm/rpt/product/menuAttDist.vue             |  9 ++++++---
 src/views/xm/rpt/product/menuDayAccumulate.vue       |  3 +--
 src/views/xm/rpt/product/menuDayTrend.vue            |  3 +--
 src/views/xm/rpt/product/menuSort.vue                |  6 +++++-
 src/views/xm/rpt/product/productWorkItemDayList.vue  | 12 +++++++++++-
 src/views/xm/rpt/product/questionAgeDist.vue         |  5 ++++-
 src/views/xm/rpt/product/questionAttDist.vue         |  5 ++++-
 src/views/xm/rpt/product/questionSort.vue            |  5 ++++-
 10 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
index ff0016d5..4f221870 100644
--- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
+++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
@@ -63,10 +63,8 @@
 			},
 			dialogTitle(){
 				if(this.xmIteration && this.xmIteration.id){
-					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'需求年龄数量分布'
-				}else {
-					return (filters.product?'产品【'+filters.product.productName+'】':'')+'需求年龄数量分布'
-				}
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'工作项每日趋势图'
+				} 
 				
 			},
 			xmProductCpd(){
diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue
index fccf177b..04a4ba06 100644
--- a/src/views/xm/rpt/product/menuAgeDist.vue
+++ b/src/views/xm/rpt/product/menuAgeDist.vue
@@ -138,9 +138,12 @@
 		methods: {   
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.product=params.xmProduct 
+				this.filters.iteration=params.xmIteration 
+				
+				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
+					this.searchXmMenuAgeDist()
+				}
 				
 			},
 			drawCharts() {
diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue
index 7752936f..1ab5c1fe 100644
--- a/src/views/xm/rpt/product/menuAttDist.vue
+++ b/src/views/xm/rpt/product/menuAttDist.vue
@@ -196,9 +196,12 @@
 			}, 
 			open(params){
 				this.visible=true;
-				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.product=params.xmProduct 
+				this.filters.iteration=params.xmIteration 
+				
+				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
+					this.searchXmMenuAttDist()
+				}
 				
 			},
 			drawCharts() {
diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index 06fadeb6..85d334b9 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.vue
@@ -126,8 +126,7 @@
 			open(params){
 				this.visible=true;
 				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct
+				this.filters.project=params.xmProject 
 				this.xmProductStateHiss=[]
 				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
 				this.$nextTick(()=>{
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index 0181ee9f..98a12626 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.vue
@@ -128,8 +128,7 @@
 			open(params){
 				this.visible=true;
 				this.filters.product=params.xmProduct
-				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.project=params.xmProject 
 				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
 				this.$nextTick(()=>{
 					this.listXmProductStateHis();
diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue
index 54467268..00c7ab37 100644
--- a/src/views/xm/rpt/product/menuSort.vue
+++ b/src/views/xm/rpt/product/menuSort.vue
@@ -156,7 +156,11 @@
 				this.visible=true;
 				this.filters.product=params.xmProduct
 				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.iteration=params.xmIteration 
+				
+				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
+					this.searchXmMenuSort()
+				}
 				
 			},
 			drawCharts() {
diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue
index 036cb594..4914e6ec 100644
--- a/src/views/xm/rpt/product/productWorkItemDayList.vue
+++ b/src/views/xm/rpt/product/productWorkItemDayList.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-        <el-dialog fullscreen :title="(this.filters.product?'【'+this.filters.product.productName+'】':'')+'工作项按日分布趋势图'" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
+        <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
  
 			<el-row :gutter="5">
 				<el-col :span="18"> 
@@ -54,6 +54,16 @@
 					['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)],
 					['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)]
 				]
+			},
+			dialogTitle(){ 
+				return (this.filters.product?'产品【'+this.filters.product.productName+'】':'')+'工作项每日趋势图' 
+				
+			}, 
+			xmProductCpd(){ 
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
 			}
 			
         }, 
diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue
index 444c2927..60a6e2cc 100644
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@@ -151,7 +151,10 @@
 				this.visible=true;
 				this.filters.product=params.xmProduct
 				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.iteration=params.xmIteration 
+				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
+					this.searchXmQuestionAgeDist()
+				}
 				
 			},
 			drawCharts() {
diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue
index 48608b31..79e93899 100644
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@@ -219,8 +219,11 @@
 				this.visible=true;
 				this.filters.product=params.xmProduct
 				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.iteration=params.xmIteration 
 				
+				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
+					this.searchXmQuestionAttDist()
+				}
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmQuestionAttDist")); 
diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue
index b6ae9133..e0b49367 100644
--- a/src/views/xm/rpt/product/questionSort.vue
+++ b/src/views/xm/rpt/product/questionSort.vue
@@ -170,8 +170,11 @@
 				this.visible=true;
 				this.filters.product=params.xmProduct
 				this.filters.project=params.xmProject
-				this.filters.Product=params.xmProduct 
+				this.filters.iteration=params.xmIteration 
 				
+				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
+					this.searchXmQuestionSort()
+				}
 			},
 			drawCharts() {
 				this.myChart = this.$echarts.init(document.getElementById("xmQuestionSort"));