From 82f77832c40ab254c457e4c8f73f0cd818cca4d0 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 21:05:10 +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/product/menuDayAccumulate.vue      | 32 ++++++++++++++++---
 src/views/xm/rpt/product/menuDayTrend.vue     | 31 +++++++++++++++---
 .../xm/rpt/product/productWorkItemDayList.vue | 27 ++++++++++++----
 .../xm/rpt/product/questionDayAccumulate.vue  | 32 ++++++++++++++++---
 src/views/xm/rpt/product/questionDayTrend.vue | 32 ++++++++++++++++---
 5 files changed, 130 insertions(+), 24 deletions(-)

diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index b429a9fc..46131811 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.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"> <div>
@@ -10,9 +10,11 @@
 				</el-col>
 				<el-col :span="6" class="border padding">
 					<el-form  :model="filters"> 
-						<el-form-item label="归属产品">
-							 <xm-product-select  v-if="!xmProduct"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"   @clear="onProductClear"></xm-product-select>
-  					  </el-form-item>    
+						
+						<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="xmIteration?xmIteration.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="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
@@ -79,8 +81,28 @@
 				}else{ 
 					return this.xmProductStateHiss.map(i=>i.menuFinishCnt)
 				}
+			}, 
+			dialogTitle(){
+				var productName=""; 
+				if(this.filters.product && this.filters.product.id){
+					if(this.filters.product.productName){
+						productName=this.filters.product.productName
+					}else{ 
+						productName=this.filters.product.id
+					}
+				} 
+				if(productName){
+					return `产品【${productName}】需求每日累积图`
+				}else{
+					return "产品需求每日累积图"
+				}
 			},
-			
+			xmProductCpd(){ 
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
         }, 
 		watch: {  
 			datesCpd(){
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index bfed4928..b12e7d73 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.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"> 
@@ -12,9 +12,11 @@
 				</el-col>
 				<el-col :span="6" class="border padding">
 					<el-form   :model="filters"> 
-						<el-form-item label="归属产品" v-if="!xmProduct">
-							 <xm-product-select  v-if="!xmProduct"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"   @clear="onProductClear"></xm-product-select>
-  					  </el-form-item>  
+						
+						<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="xmIteration?xmIteration.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="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
@@ -83,6 +85,27 @@
 				}
 			},
 			
+			dialogTitle(){
+				var productName=""; 
+				if(this.filters.product && this.filters.product.id){
+					if(this.filters.product.productName){
+						productName=this.filters.product.productName
+					}else{ 
+						productName=this.filters.product.id
+					}
+				} 
+				if(productName){
+					return `产品【${productName}】需求每日趋势图`
+				}else{
+					return "产品需求每日趋势图"
+				}
+			},
+			xmProductCpd(){ 
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
         }, 
 		watch: {  
 			datesCpd(){
diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue
index acffc0b9..6e508094 100644
--- a/src/views/xm/rpt/product/productWorkItemDayList.vue
+++ b/src/views/xm/rpt/product/productWorkItemDayList.vue
@@ -10,9 +10,11 @@
 				</el-col>
 				<el-col :span="6" class="border padding">
 					<el-form  :model="filters"> 
-					<el-form-item label="归属产品">
-							<xm-product-select  v-if="!xmProduct"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"   @clear="onProductClear"></xm-product-select>
-  					</el-form-item>  
+						
+					<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="xmIteration?xmIteration.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="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
@@ -54,11 +56,22 @@
 					['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)],
 					['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)]
 				]
-			},
-			dialogTitle(){ 
-				return (this.filters.product?'产品【'+this.filters.product.productName+'】':'')+'工作项每日趋势图' 
-				
 			}, 
+			dialogTitle(){
+				var productName=""; 
+				if(this.filters.product && this.filters.product.id){
+					if(this.filters.product.productName){
+						productName=this.filters.product.productName
+					}else{ 
+						productName=this.filters.product.id
+					}
+				} 
+				if(productName){
+					return `产品【${productName}】需求每日趋势图`
+				}else{
+					return "产品需求每日趋势图"
+				}
+			},
 			xmProductCpd(){ 
 				if(this.xmProduct && this.xmProduct.id){
 					return this.xmProduct
diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue
index e45c300d..2454f967 100644
--- a/src/views/xm/rpt/product/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/product/questionDayAccumulate.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"> <div>
@@ -10,9 +10,11 @@
 				</el-col>
 				<el-col :span="6" class="border padding">
 					<el-form :model="filters"> 
-						<el-form-item label="归属产品">
-							 <xm-product-select  v-if="!xmProduct"  ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"   @clear="onProductClear"></xm-product-select>
-  					  </el-form-item>    
+						
+						<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="xmIteration?xmIteration.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="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
@@ -81,6 +83,28 @@
 				}
 			},
 			
+			dialogTitle(){
+				var productName=""; 
+				if(this.filters.product && this.filters.product.id){
+					if(this.filters.product.productName){
+						productName=this.filters.product.productName
+					}else{ 
+						productName=this.filters.product.id
+					}
+				} 
+				if(productName){
+					return `产品【${productName}】需求每日累积图`
+				}else{
+					return "产品缺陷每日累积图"
+				}
+			},
+			xmProductCpd(){ 
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
+			
         }, 
 		watch: {  
 			datesCpd(){
diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue
index caf3b120..5bec1c30 100644
--- a/src/views/xm/rpt/product/questionDayTrend.vue
+++ b/src/views/xm/rpt/product/questionDayTrend.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"> 
@@ -12,9 +12,11 @@
 				</el-col>
 				<el-col :span="6" class="border padding">
 					<el-form :model="filters"> 
-						<el-form-item label="归属产品" v-if="!xmProduct" >
-							 <xm-product-select   ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"   @clear="onProductClear"></xm-product-select>
-  					  </el-form-item>  
+						
+						<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="xmIteration?xmIteration.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="日期区间">
 						<br>
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
@@ -83,6 +85,28 @@
 				}
 			},
 			
+			
+			dialogTitle(){
+				var productName=""; 
+				if(this.filters.product && this.filters.product.id){
+					if(this.filters.product.productName){
+						productName=this.filters.product.productName
+					}else{ 
+						productName=this.filters.product.id
+					}
+				} 
+				if(productName){
+					return `产品【${productName}】缺陷每日趋势图`
+				}else{
+					return "产品缺陷每日趋势图"
+				}
+			},
+			xmProductCpd(){ 
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
+			}
         }, 
 		watch: {  
 			datesCpd(){