From c621daca69b9bd581a25c0d815568513ade9c92a 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, 16 Feb 2023 01:18:54 +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/router/routes_xm.js                      |  2 +-
 src/views/xm/core/xmProduct/XmProductMng.vue | 27 +++++++++++++++++++-
 src/views/xm/core/xmProject/XmProjectMng.vue | 17 +++++++++---
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 1e13889b..623b79f1 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -618,10 +618,10 @@ export default {
       },
       // leaf: true,//只有一个节点
       children: [
+        { path: 'casedb/mng', component: _import('xm/core/xmTestCasedb/XmTestCasedbMng'), name: 'XmTestCasedbMng', meta: { title: '测试设计',roles:["user"] }},
         { path: 'question/detail', component: _import('xm/core/xmQuestion/XmQuestionDetailRoute'), name: 'questionDetail', meta: { title: '缺陷明细',roles:["user"] },hidden:true},
         { path: 'question/mng', component: _import('xm/core/xmQuestion/XmQuestionMngRoute'), name: 'XmQuestionMng', meta: { title: '缺陷管理',roles:["user"] }},
         { path: 'question/mng/me', component: _import('xm/core/xmQuestion/XmQuestionMngMy'), name: 'XmQuestionMngMy', meta: { title: '我的缺陷' ,roles:["user"]}},
-        { path: 'casedb/mng', component: _import('xm/core/xmTestCasedb/XmTestCasedbMng'), name: 'XmTestCasedbMng', meta: { title: '测试管理',roles:["user"] }},
 
       ]
     },
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index c7487b72..41573e3d 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -184,9 +184,15 @@
 											</span>
 											<span class="item-type">缺陷</span>
 										</div>
-									</div>
+									</div> 
+								
 								<div class="project-rate">
 									<el-progress :percentage="(p.finishRate==null?0:p.finishRate)"></el-progress>
+									
+									<el-tag v-if="getPlanRealProgress(p)>0" type="warning" effect="dark">超前{{ getPlanRealProgress(p) }}%</el-tag>
+									<el-tag v-else-if="getPlanRealProgress(p)<0" type="danger" effect="dark">落后{{ 0-getPlanRealProgress(p) }}%</el-tag>
+									<el-tag v-else-if="getProgress(p)>0" effect="dark" type="success" class="el-icon-check"> </el-tag>
+									<el-tag v-else-if="getProgress(p)==0" effect="dark" type="info">未开始 </el-tag>
 								</div>
 								<div class="project-footer"> 
 									<div class="project-type" title="产品经理">
@@ -820,6 +826,25 @@
 					})
 				}
 			},
+			
+			getProgress(p){
+				var planRate=0;
+				if(!p.estimateWorkload||!p.budgetWorkload){
+					planRate= 0;
+					return planRate;
+				}
+				planRate= Math.round(p.estimateWorkload/p.budgetWorkload*100);
+				return planRate
+			},
+			getPlanRealProgress(p){
+				var planRate=0;
+				if(!p.estimateWorkload||!p.budgetWorkload){
+					planRate= 0;
+					return planRate;
+				}
+				planRate=  p.estimateWorkload/p.budgetWorkload*100;
+				return Math.round((p.finishRate||0)-planRate)
+			}
 		},//end methods
 		components: {
 		    'xm-product-add':XmProductAdd,
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 7d69c21b..145ffdb1 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -147,7 +147,8 @@
 								
 								<el-tag v-if="getPlanRealProgress(p)>0" type="warning" effect="dark">超前{{ getPlanRealProgress(p) }}%</el-tag>
 								<el-tag v-else-if="getPlanRealProgress(p)<0" type="danger" effect="dark">落后{{ 0-getPlanRealProgress(p) }}%</el-tag>
-								<el-tag v-else effect="dark" type="success">理想</el-tag>
+								<el-tag v-else-if="getProgress(p)>0" effect="dark" type="success" class="el-icon-check"> </el-tag>
+								<el-tag v-else-if="getProgress(p)==0" effect="dark" type="info">未开始 </el-tag>
 							</div>
 							<div class="project-footer">
 								<div class="project-type" title="项目经理">
@@ -890,13 +891,23 @@
 				var allFinishCnt= (project.menuFinishCnt||0 )+ (project.menuCloseCnt||0)
 				 return allFinishCnt;
 			},
-			getPlanRealProgress(project){
+			getProgress(project){
 				var planRate=0;
 				if(!project.estimateWorkload||!project.budgetWorkload){
 					planRate= 0;
+					return planRate;
 				}
 				planRate= Math.round(project.estimateWorkload/project.budgetWorkload*100);
-				return (project.finishRate||0)-planRate
+				return planRate
+			},
+			getPlanRealProgress(project){
+				var planRate=0;
+				if(!project.estimateWorkload||!project.budgetWorkload){
+					planRate= 0;
+					return planRate;
+				}
+				planRate=project.estimateWorkload/project.budgetWorkload*100;
+				return  Math.round((project.finishRate||0)-planRate)
 			}
 			/**end 自定义函数请在上面加**/