diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index 53ad7489..d768c4d0 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -255,26 +255,32 @@ export default {
return this.xmIteration.endTime?this.xmIteration.endTime.substring(0,10):'';
},
workloadProgress:function (){
- if(!this.xmIteration.distBudgetWorkload || !this.xmIteration.actWorkload){
+ if(!this.xmIteration.budgetWorkload || !this.xmIteration.actWorkload){
return 0;
}
- return Math.round(this.xmIteration.actWorkload/this.xmIteration.distBudgetWorkload*100);
+ return Math.round(this.xmIteration.actWorkload/this.xmIteration.budgetWorkload*100);
},
deviation:function (){
return this.xmIteration.actWorkload -this.xmIteration.estimateWorkload
},
deviationRate:function (){
+ if(!this.xmIteration.estimateWorkload){
+ return 0;
+ }
return Math.round(this.deviation/this.xmIteration.estimateWorkload*100);
},
remainWorkload:function (){
- return this.xmIteration.distBudgetWorkload - this.xmIteration.actWorkload;
+ return this.xmIteration.budgetWorkload - this.xmIteration.actWorkload;
},
planProgress:function (){
- return Math.round(this.xmIteration.estimateWorkload/this.xmIteration.distBudgetWorkload*100)
+ if(!this.xmIteration.budgetWorkload){
+ return 0;
+ }
+ return Math.round(this.xmIteration.estimateWorkload/this.xmIteration.budgetWorkload*100)
},
realProgress:function (){
- if(this.xmIteration.actWorkload < this.xmIteration.distBudgetWorkload){
- return Math.round(this.xmIteration.actWorkload/this.xmIteration.distBudgetWorkload*100)
+ if(this.xmIteration.actWorkload < this.xmIteration.budgetWorkload){
+ return Math.round(this.xmIteration.actWorkload/this.xmIteration.budgetWorkload*100)
}else{
return 100;
}
@@ -412,28 +418,28 @@ export default {
}
},
data: [
- {value: this.xmIteration.closedBugCnt,
+ {value: this.xmIteration.closedBugs,
itemStyle: {
normal:{
color: '#5470C6'
}
},
name: '已关闭'},
- {value: this.xmIteration.resolvedBugCnt,
+ {value: this.xmIteration.resolvedBugs,
itemStyle: {
normal:{
color: '#91CC75'
}
},
name: '已解决'},
- {value: this.xmIteration.activeBugCnt,
+ {value: this.xmIteration.activeBugs,
itemStyle: {
normal:{
color: '#FAC858'
}
},
name: '已激活'},
- {value: this.xmIteration.confirmedBugCnt,
+ {value: this.xmIteration.confirmedBugs,
itemStyle: {
normal:{
color: '#EE6666'
diff --git a/src/views/xm/core/xmMenu/XmMenuOverview.vue b/src/views/xm/core/xmMenu/XmMenuOverview.vue
index 236a3dec..276a92d2 100644
--- a/src/views/xm/core/xmMenu/XmMenuOverview.vue
+++ b/src/views/xm/core/xmMenu/XmMenuOverview.vue
@@ -266,13 +266,13 @@
}
if(now<=endTime){
let allDays=endTime-startTime;
- return Math.round((now-startTime)/allDays*this.xmMenu.planWorkload)
+ return Math.round((now-startTime)/allDays*this.xmMenu.budgetWorkload)
}else{
- return this.xmMenu.planWorkload;
+ return this.xmMenu.budgetWorkload;
}
},
workloadProgress:function (){
- return Math.round(this.xmMenu.actWorkload/this.xmMenu.planWorkload*100);
+ return Math.round(this.xmMenu.actWorkload/this.xmMenu.budgetWorkload*100);
},
deviation:function (){
return this.xmMenuCpd.actWorkload-this.estimateWorkload;
@@ -281,14 +281,14 @@
return Math.round(this.deviation/this.estimateWorkload*100);
},
remainWorkload:function (){
- return this.xmMenu.planWorkload - this.xmMenu.actWorkload;
+ return this.xmMenu.budgetWorkload - this.xmMenu.actWorkload;
},
planProgress:function (){
- return Math.round(this.xmMenuCpd.estimateWorkload/this.planWorkload *100);
+ return Math.round(this.xmMenuCpd.estimateWorkload/this.budgetWorkload *100);
},
realProgress:function (){
- if(this.xmMenu.actWorkload < this.xmMenu.planWorkload){
- return Math.round(this.xmMenu.actWorkload/this.xmMenu.planWorkload*100)
+ if(this.xmMenu.actWorkload < this.xmMenu.budgetWorkload){
+ return Math.round(this.xmMenu.actWorkload/this.xmMenu.budgetWorkload*100)
}else{
return 100;
}
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 2c44ab66..3bea6bd7 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -122,25 +122,25 @@
- {{p.totalActWorkload==null?0:parseInt(p.totalActWorkload/8)}}
+ {{p.actWorkload==null?0:parseInt(p.actWorkload/8)}}
/
- {{p.totalPlanWorkload==null?0:parseInt(p.totalPlanWorkload/8)}}
+ {{p.budgetWorkload==null?0:parseInt(p.budgetWorkload/8)}}
工作量
- {{p.totalCompleteTaskCnt==null?0:p.totalCompleteTaskCnt}}
+ {{p.taskFinishCnt==null?0:p.taskFinishCnt}}
/
- {{p.totalTaskCnt==null?0:p.totalTaskCnt}}
+ {{p.taskCnt==null?0:p.taskCnt}}
任务
- {{p.totalClosedBugCnt==null?0:p.totalClosedBugCnt}}
+ {{p.closedBugs==null?0:p.closedBugs}}
/
- {{p.totalBugCnt==null?0:p.totalBugCnt}}
+ {{p.bugCnt==null?0:p.bugCnt}}
缺陷
@@ -192,14 +192,14 @@
{{scope.row.menuCnt>0?scope.row.menuFinishCnt+' / '+scope.row.menuCnt:''}}
-
+
- {{scope.row.totalTaskCnt>0?scope.row.totalCompleteTaskCnt+' / '+scope.row.totalTaskCnt:''}}
+ {{scope.row.taskCnt>0?scope.row.taskFinishCnt+' / '+scope.row.taskCnt:''}}
-
+
- {{scope.row.totalBugCnt>0?scope.row.totalClosedBugCnt+' / '+scope.row.totalBugCnt:''}}
+ {{scope.row.bugCnt>0?scope.row.closedBugs+' / '+scope.row.bugCnt:''}}