diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue
index 7790ca03..95c9be4c 100644
--- a/src/views/xm/rpt/iteration/burnout.vue
+++ b/src/views/xm/rpt/iteration/burnout.vue
@@ -12,15 +12,24 @@
-
+
+
+ {{ xmProduct.id }}
+ {{ xmProduct.productName }}
+
+
+ 编号:{{ xmIteration.id }}
+ 名称:{{ xmIteration.iterationName }}
+
+
- 查询
+ 查询
@@ -48,7 +57,7 @@
props:['xmProduct','xmIteration','xmProject'],
computed: {
...mapGetters([
- 'userInfo','roles'
+ 'userInfo','roles',
]),
datesCpd(){
if(this.xmIterationStateHiss.length==0){
@@ -67,8 +76,8 @@
if(length==0){
return [];
}
- var startDate=this.xmIteration.startTime.substring(0,10)
- var endDate=this.xmIteration.endTime.substring(0,10)
+ var startDate=this.filters.iteration.startTime.substring(0,10)
+ var endDate=this.filters.iteration.endTime.substring(0,10)
var uniDayWorkload=max.budgetWorkload/(length+1)
return this.xmIterationStateHiss.map((i,index)=>{
if(i.bizDateendDate){
@@ -133,8 +142,8 @@
return max;
},
findLength(){
- if(this.xmIteration && this.xmIteration.id){
- return parseInt(util.timeDifference(this.xmIteration.startTime.substring(0,10)+" 00:00:00",this.xmIteration.endTime.substring(0,10)+" 00:00:00")/60/24)
+ if(this.filters.iteration && this.filters.iteration.id){
+ return parseInt(util.timeDifference(this.filters.iteration.startTime.substring(0,10)+" 00:00:00",this.filters.iteration.endTime.substring(0,10)+" 00:00:00")/60/24)
}else if(this.xmIterationStateHiss){
return this.xmIterationStateHiss.length;
}else{
diff --git a/src/views/xm/rpt/reportIndexForIteration.vue b/src/views/xm/rpt/reportIndexForIteration.vue
index 3cec0c80..04cf300a 100644
--- a/src/views/xm/rpt/reportIndexForIteration.vue
+++ b/src/views/xm/rpt/reportIndexForIteration.vue
@@ -1,6 +1,6 @@
@@ -14,6 +14,13 @@
...mapGetters([
'userInfo','roles','xmIteration'
]),
+ xmProduct:function(){
+ if(this.xmIteration && this.xmIteration.id){
+ return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+ }else{
+ return null;
+ }
+ }
},
watch:{