From 4009dc63343116e9b0db0c2b5fe09e811f6b3342 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 16:56:42 +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

---
 .../iteration/IterationWorkItemDayList.vue    | 55 +++++++++++++++----
 .../xm/rpt/iteration/menuDayAccumulate.vue    | 25 +++++----
 src/views/xm/rpt/iteration/menuDayTrend.vue   | 31 ++++++-----
 src/views/xm/rpt/reportIndex.vue              |  7 ++-
 4 files changed, 80 insertions(+), 38 deletions(-)

diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
index ab390389..ff0016d5 100644
--- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
+++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-        <el-dialog fullscreen :title="(filters.product?'【'+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"> 
@@ -9,16 +9,22 @@
 					</div>
 				</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  :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="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="归属迭代">
+						<xm-iteration-select  v-if="!xmIteration || !xmIteration.id" ref="xmIterationSelect"  :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="xmProject?xmProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClear"></xm-iteration-select>
+						<span v-else>  {{xmIteration.id}}
+							<span v-if="xmIteration.iterationName"><br/>{{ xmIteration.iterationName  }} </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>
   					</el-form-item>  
 					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="listXmProductStateHis">查询</el-button>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmIteationStateHis">查询</el-button>
 					</el-form-item>  
 					</el-form>
 				</el-col>
@@ -33,13 +39,13 @@
 	import { mapGetters } from 'vuex'	 
 	
 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
-	import { listXmProductStateHis } from '@/api/xm/core/xmProductStateHis';
+	import { listXmIteationStateHis } from '@/api/xm/core/xmIterationStateHis';
 	export default { 
         
 		components: {  
 			XmProductSelect, 
 		},
-        props:['xmProduct','xmProject'],
+        props:['xmProduct','xmProject','xmIteration'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -54,6 +60,23 @@
 					['未关缺陷',...this.xmProductStateHiss.map(i=>i.bugCnt-i.closedBugs)],
 					['已关缺陷',...this.xmProductStateHiss.map(i=>i.closedBugs)]
 				]
+			},
+			dialogTitle(){
+				if(this.xmIteration && this.xmIteration.id){
+					return (this.xmIteration?'迭代【'+this.xmIteration.iterationName+'】':'')+'需求年龄数量分布'
+				}else {
+					return (filters.product?'产品【'+filters.product.productName+'】':'')+'需求年龄数量分布'
+				}
+				
+			},
+			xmProductCpd(){
+				if(this.xmIteration && this.xmIteration.id){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				return null;
 			}
 			
         }, 
@@ -85,7 +108,7 @@
 			}//end return
 		},//end data
 		methods: {  
-			listXmProductStateHis(){
+			listXmIteationStateHis(){
 				if(!this.filters.product){
 					this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'})
 					return;
@@ -96,7 +119,7 @@
 					params.startBizDate=this.filters.startBizDate;
 					params.endBizDate=this.filters.endBizDate;
 				}
-				listXmProductStateHis(params).then(res=>{ 
+				listXmIteationStateHis(params).then(res=>{ 
 					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
 				})
 			},
@@ -108,7 +131,7 @@
 				this.xmProductStateHiss=[]
 				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
 				this.$nextTick(()=>{
-					this.listXmProductStateHis();
+					this.listXmIteationStateHis();
 				})
 				
 			},
@@ -215,7 +238,7 @@
 			onProductSelected(product){
 				this.filters.product=product
 				this.xmProductStateHiss=[];
-				this.listXmProductStateHis();
+				this.listXmIteationStateHis();
 			},
 			
 			onProductClear(){
@@ -224,6 +247,14 @@
 				this.xmProductStateHiss=[];
 				
 			},
+			
+			onIterationSelected(iteration){
+				this.filters.iteration=iteration
+			},
+			
+			onIterationClear(){
+				this.filters.iteration=null
+			}
 		},//end method
 		mounted() {
 			/**
diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
index 4d6114b3..9c01c614 100644
--- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue
@@ -25,7 +25,7 @@
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
   					</el-form-item>  
 					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="listXmProductStateHis">查询</el-button>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmIterationStateHis">查询</el-button>
 					</el-form-item>  
 					</el-form>
 				</el-col>
@@ -39,7 +39,7 @@
 	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
 	import { mapGetters } from 'vuex'	 
 	
-	import { listXmProductStateHis } from '@/api/xm/core/xmProductStateHis';
+	import { listXmIterationStateHis } from '@/api/xm/core/xmIterationStateHis';
 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
 	export default { 
         
@@ -121,6 +121,7 @@
                     category:'', 
                     product:null, 
                     project:null,
+					iteration:null,
                 },
 				dicts:{},//下拉选择框的所有静态数据  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 },//查询中... 
@@ -132,30 +133,35 @@
 			}//end return
 		},//end data
 		methods: {  
-			listXmProductStateHis(){
+			listXmIterationStateHis(){
 				if(!this.filters.product){
 					this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'})
 					return;
 				}
-				var params={productId:this.filters.product.id,orderBy:'biz_date asc'}
+				if(!this.filters.iteration){
+					this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'})
+					return;
+				}
+				var params={productId:this.filters.product.id,iterationId:this.filters.iteration.id,orderBy:'biz_date asc'}
 				
 				if(this.filters.startBizDate && this.filters.endBizDate){
 					params.startBizDate=this.filters.startBizDate;
 					params.endBizDate=this.filters.endBizDate;
 				}
-				listXmProductStateHis(params).then(res=>{ 
+				listXmIterationStateHis(params).then(res=>{ 
 					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
 				})
 			},
 			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.filters.iteration=params.xmIteration 
 				this.xmProductStateHiss=[]
 				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
+				if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect();
 				this.$nextTick(()=>{
-					this.listXmProductStateHis();
+					this.listXmIterationStateHis();
 				})
 				
 			},
@@ -253,7 +259,6 @@
 			onProductSelected(product){
 				this.filters.product=product
 				this.xmProductStateHiss=[];
-				this.listXmProductStateHis();
 			},
 			
 			onProductClear(){
@@ -264,7 +269,7 @@
 			onIterationSelected(iteration){
 				this.filters.iteration=iteration
 				this.xmProductStateHiss=[];
-				this.listXmProductStateHis();
+				this.listXmIterationStateHis();
 			},
 			
 			onIterationClear(){
diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue
index 3ae39c65..06626107 100644
--- a/src/views/xm/rpt/iteration/menuDayTrend.vue
+++ b/src/views/xm/rpt/iteration/menuDayTrend.vue
@@ -27,7 +27,7 @@
 							<mdp-date-range v-model="filters" value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></mdp-date-range>
   					</el-form-item>    
 					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="listXmProductStateHis">查询</el-button>
+						 <el-button type="primary" icon="el-icon-search" @click="listXmIterationStateHis">查询</el-button>
 					</el-form-item>  
 					</el-form>
 				</el-col>
@@ -41,7 +41,7 @@
 	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
 	import { mapGetters } from 'vuex'	 
 	
-	import { listXmProductStateHis } from '@/api/xm/core/xmProductStateHis';
+	import { listXmIterationStateHis } from '@/api/xm/core/xmIterationStateHis';
 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
 	export default { 
         
@@ -123,6 +123,7 @@
                     category:'', 
                     product:null, 
                     project:null,
+					iteration:null,
                 },
 				dicts:{},//下拉选择框的所有静态数据  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 },//查询中... 
@@ -134,29 +135,35 @@
 			}//end return
 		},//end data
 		methods: {  
-			listXmProductStateHis(){
+			listXmIterationStateHis(){
 				if(!this.filters.product){
 					this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'})
 					return;
 				}
-				var params={productId:this.filters.product.id,orderBy:'biz_date asc'}
+				
+				if(!this.filters.iteration){
+					this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'})
+					return;
+				}
+				var params={productId:this.filters.product.id,iterationId:this.filters.iteration.id,orderBy:'biz_date asc'}
 				
 				if(this.filters.startBizDate && this.filters.endBizDate){
 					params.startBizDate=this.filters.startBizDate;
 					params.endBizDate=this.filters.endBizDate;
 				}
-				listXmProductStateHis(params).then(res=>{ 
+				listXmIterationStateHis(params).then(res=>{ 
 					this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss;
 				})
 			},
 			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.filters.iteration=params.xmIteration 
 				if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect();
+				if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect();
 				this.$nextTick(()=>{
-					this.listXmProductStateHis();
+					this.listXmIterationStateHis();
 				})
 				
 			},
@@ -250,13 +257,11 @@
 			
 			onProductSelected(product){
 				this.filters.product=product
-				this.xmProductStateHiss=[];
-				this.listXmProductStateHis();
+				this.xmProductStateHiss=[]; 
 			},
 			
 			onProductClear(){
-				this.filters.product=null
-				
+				this.filters.product=null 
 				this.xmProductStateHiss=[];
 				
 			},
@@ -264,7 +269,7 @@
 			onIterationSelected(iteration){
 				this.filters.iteration=iteration
 				this.xmProductStateHiss=[];
-				this.listXmProductStateHis();
+				this.listXmIterationStateHis();
 			},
 			
 			onIterationClear(){
diff --git a/src/views/xm/rpt/reportIndex.vue b/src/views/xm/rpt/reportIndex.vue
index d34c6dce..827f7403 100644
--- a/src/views/xm/rpt/reportIndex.vue
+++ b/src/views/xm/rpt/reportIndex.vue
@@ -80,8 +80,8 @@
 
     import xmQuestionDayTrend from './product/questionDayTrend'
     import xmQuestionDayAccumulate from './product/questionDayAccumulate'
-    import XmIterationXmQuestionDayTrend from './iteration/questionDayTrend'
-    import XmIterationXmQuestionDayAccumulate from './iteration/questionDayAccumulate'
+    import xmIterationXmQuestionDayTrend from './iteration/questionDayTrend'
+    import xmIterationXmQuestionDayAccumulate from './iteration/questionDayAccumulate'
 	import xmQuestionAttDist from './product/questionAttDist'
 	import xmQuestionAgeDist from './product/questionAgeDist'
 	import xmQuestionSort from './product/questionSort'
@@ -97,7 +97,8 @@
         
 		components: {   
             xmIterationBurnout,xmMenuDayTrend,xmMenuDayAccumulate,xmMenuAttDist,xmMenuAgeDist,xmMenuSort,xmProductWorkItemDayList,xmTaskDayTrend,xmTaskDayAccumulate,xmTaskAttDist,xmTaskAgeDist,xmTaskSort,xmProjectWorkItemDayList,xmProjectWorkloadSetDayList,xmProjectWorkloadSetMonthList,xmQuestionDayTrend,xmQuestionDayAccumulate,xmQuestionAttDist,xmQuestionAgeDist,xmQuestionSort,
-		},
+            xmIterationXmMenuDayTrend,xmIterationXmMenuDayAccumulate,xmIterationWorkItemDayList,xmIterationXmQuestionDayTrend,xmIterationXmQuestionDayAccumulate
+        },
         props:['xmProduct','xmIteration','xmProject','xmTestCasedb'],
 		computed: {
 		    ...mapGetters([