From ef076aa09439629bf88d8121610a4736dffa06c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 31 Mar 2022 01:44:57 +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

---
 src/views/xm/core/xmIteration/XmIterationOverview.vue | 9 ++++++---
 src/views/xm/core/xmMenu/XmMenuMng.vue                | 6 ++----
 2 files changed, 8 insertions(+), 7 deletions(-)

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){