diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue index 2e747a9e..60107168 100644 --- a/src/views/xm/core/xmIteration/XmIterationOverview.vue +++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue @@ -249,15 +249,18 @@ export default { return this.xmIteration.taskCnt-this.xmIteration.finishTaskCnt; }, taskProgress: function (){ - return this.xmIteration.finishRate; + return this.xmIteration.finishRate||0; }, iterationStartTime: function (){ - return this.xmIteration.startTime.substring(0,10); + return this.xmIteration.startTime?this.xmIteration.startTime.substring(0,10):''; }, iterationEndTime: function (){ - return this.xmIteration.endTime.substring(0,10); + return this.xmIteration.endTime?this.xmIteration.endTime.substring(0,10):''; }, workloadProgress:function (){ + if(!this.xmIteration.distBudgetWorkload || !this.xmIteration.actWorkload){ + return 0; + } return Math.round(this.xmIteration.actWorkload/this.xmIteration.distBudgetWorkload*100); }, deviation:function (){ diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue index 59697d71..c8ca4b2b 100644 --- a/src/views/xm/core/xmMenu/XmMenuMng.vue +++ b/src/views/xm/core/xmMenu/XmMenuMng.vue @@ -646,8 +646,7 @@ this.maps.set(tree.menuId, { tree, treeNode, resolve }) //储存数据 var params={pmenuId:tree.menuId} - params=this.getParams(params); - params.isTop="" + params=this.getParams(params); this.load.list = true; var func=listXmMenuWithState if(this.selProject&&this.selProject.id){ @@ -684,8 +683,7 @@ params.productId=this.filters.product.id } params=this.getParams(params); - params.withParents="1" - //params.isTop="1" + params.withParents="1" let callback= (res)=>{ var tips=res.data.tips; if(tips.isOk){