From cfc339b4d9d149a9e4ee552198b9b8831b04b1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 8 Feb 2023 16:13:26 +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/xmProject/XmProjectMng.vue    | 12 ++++++++++++
 .../xm/core/xmProject/XmProjectOverview.vue     | 17 +++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 7a671811..7d69c21b 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -144,6 +144,10 @@
 							</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 effect="dark" type="success">理想</el-tag>
 							</div>
 							<div class="project-footer">
 								<div class="project-type" title="项目经理">
@@ -885,6 +889,14 @@
 			menuFinishCntCalc(project){
 				var allFinishCnt= (project.menuFinishCnt||0 )+ (project.menuCloseCnt||0)
 				 return allFinishCnt;
+			},
+			getPlanRealProgress(project){
+				var planRate=0;
+				if(!project.estimateWorkload||!project.budgetWorkload){
+					planRate= 0;
+				}
+				planRate= Math.round(project.estimateWorkload/project.budgetWorkload*100);
+				return (project.finishRate||0)-planRate
 			}
 			/**end 自定义函数请在上面加**/
 			
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index 4d5b1640..a2685734 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -78,11 +78,11 @@
                   </div>
                   <div>
                     <div class="progress-item">
-                      <el-progress :percentage="taskProgress">
+                      <el-progress :percentage="realProgress">
                       </el-progress>
                       
-                      <el-tag v-if="planProgress>taskProgress" type="danger" effect="dark">整体进度 落后{{ planProgress-taskProgress }}%</el-tag>
-                          <el-tag v-else-if="planProgress<taskProgress" type="warning" effect="dark">整体进度 超前{{ taskProgress-planProgress }}%</el-tag>
+                      <el-tag v-if="planProgress>realProgress" type="danger" effect="dark">整体进度 落后{{ planProgress-realProgress }}%</el-tag>
+                          <el-tag v-else-if="planProgress<realProgress" type="warning" effect="dark">整体进度 超前{{ realProgress-planProgress }}%</el-tag>
                           <el-tag v-else effect="dark" type="success">整体进度 理想</el-tag>
                       <div class="title">
                       </div>
@@ -187,7 +187,7 @@
                 <el-row  >
                   <div class="item">
                     <el-col :span="8">
-                      <div>
+                      <div title="总估工时-已完成工时">
                         <div style="text-align:center;">
                           <span style="font-size:24px;" v-text="remainWorkload"></span>
                           <span style="font-size:5px;">h</span>
@@ -196,7 +196,7 @@
                       </div>
                     </el-col>
                     <el-col :span="8">
-                      <div>
+                      <div title="已完成工时-当前应完成工时">
                         <div style="text-align:center;">
                           <span style="font-size:24px;" v-text="deviation"></span>
                           <span style="font-size:5px;">h</span>
@@ -205,7 +205,7 @@
                       </div>
                     </el-col>
                     <el-col :span="8">
-                      <div>
+                      <div title="（已完成工时-当前应完成工时）/ 当前应完成工时">
                         <div style="text-align:center;">
                           <span style="font-size:24px;" v-text="deviationRate"></span>
                           <span style="font-size:5px;">%</span>
@@ -281,10 +281,7 @@ export default {
     },
     totalTask: function() {
       return this.selProject.taskCnt;
-    },
-    taskProgress: function (){
-      return this.selProject.finishRate?parseInt(this.selProject.finishRate):0;
-    },
+    }, 
     taskStartTime: function (){
       return this.selProject.startTime?this.selProject.startTime.substring(0,10):'';
     },