diff --git a/src/views/xm/XmOverview2.vue b/src/views/xm/XmOverview2.vue
index 082d79ee..4febbcb0 100644
--- a/src/views/xm/XmOverview2.vue
+++ b/src/views/xm/XmOverview2.vue
@@ -175,7 +175,7 @@ export default {
       return Math.round(this.xmBranchState.totalActWorkload-this.xmBranchState.estimateWorkload);
     },
     deviationRate:function (){
-      return Math.round((this.xmBranchState.totalActWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.totalPlanWorkload*100);
+      return Math.round((this.xmBranchState.totalActWorkload-this.xmBranchState.estimateWorkload)/this.xmBranchState.estimateWorkload*100);
     },
     remainWorkload:function (){
       return this.xmBranchState.totalPlanWorkload - this.xmBranchState.totalActWorkload;
diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index 60107168..0702a411 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -20,11 +20,8 @@
               </div>
               <el-row style="margin-bottom:18px">
                 <el-row>
-                  <span v-text="this.xmIteration.adminUsername"></span>
-                </el-row>
-                <el-row>
-                  <span>负责人</span>
-                </el-row>
+                  <span>负责人</span> <span v-text="this.xmIteration.adminUsername"></span>
+                </el-row> 
               </el-row>
               <el-row style="margin-bottom:18px">
                 <el-col :span="8" @click="">
@@ -138,12 +135,12 @@
                 <span>迭代工时</span>
               </div>
               <div>
-                <el-row style="padding:25px;">
+                <el-row >
                   <div class="item">
                     <el-col :span="8">
                       <div>
                         <div style="text-align:center;">
-                          <span style="font-size:24px;" v-text="this.xmIteration.distBudgetWorkload"></span>
+                          <span style="font-size:24px;" v-text="this.xmIteration.estimateWorkload"></span>
                           <span style="font-size:5px;">h</span>
                         </div>
                         <div style="text-align:center;font-size:5px;">预估工时</div>
@@ -169,7 +166,7 @@
                     </el-col>
                   </div>
                 </el-row>
-                <el-row style="padding:25px;">
+                <el-row  >
                   <div class="item">
                     <el-col :span="8">
                       <div>
@@ -202,11 +199,11 @@
                 </el-row>
                 <el-row>
                   <span style="margin-left:20px;">项目预计进度</span>
-                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;" :text-inside="true" :stroke-width="24" :percentage="planProgress"></el-progress>
+                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;"   :stroke-width="14" :percentage="planProgress"></el-progress>
                 </el-row>
                 <el-row>
                   <span style="margin-left:20px;">项目实际进度</span>
-                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;" :text-inside="true" :stroke-width="24" :percentage="realProgress"></el-progress>
+                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;" color="#47CBF6"    :stroke-width="14" :percentage="realProgress"></el-progress>
                 </el-row>
 
               </div>
@@ -263,33 +260,17 @@ export default {
       }
       return Math.round(this.xmIteration.actWorkload/this.xmIteration.distBudgetWorkload*100);
     },
-    deviation:function (){
-      let now = new Date();
-      let startTime = new Date(this.xmIteration.startTime);
-      let endTime = new Date(this.xmIteration.endTime);
-      if(now<=endTime){
-        let allDays=endTime-startTime;
-        return this.xmIteration.actWorkload - Math.round((now-startTime)/allDays*this.xmIteration.distBudgetWorkload)
-      }else{
-        return this.xmIteration.actWorkload - this.xmIteration.distBudgetWorkload;
-      }
+    deviation:function (){ 
+        return this.xmIteration.actWorkload -this.xmIteration.estimateWorkload
     },
     deviationRate:function (){
-      return Math.round(this.deviation/this.xmIteration.distBudgetWorkload*100);
+      return Math.round(this.deviation/this.xmIteration.estimateWorkload*100);
     },
     remainWorkload:function (){
       return this.xmIteration.distBudgetWorkload - this.xmIteration.actWorkload;
     },
     planProgress:function (){
-      let now = new Date();
-      let startTime = new Date(this.xmIteration.startTime);
-      let endTime = new Date(this.xmIteration.endTime);
-      if(now<=endTime){
-        let allDays=endTime-startTime;
-        return Math.round((now-startTime)/allDays*100)
-      }else{
-        return 100;
-      }
+        return Math.round(this.xmIteration.estimateWorkload/this.xmIteration.distBudgetWorkload*100)
     },
     realProgress:function (){
       if(this.xmIteration.actWorkload < this.xmIteration.distBudgetWorkload){
diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
index 387cdfab..c3a0166f 100644
--- a/src/views/xm/core/xmProduct/XmProductOverview.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -22,11 +22,8 @@
               </div>
               <el-row style="margin-bottom:18px">
                 <el-row>
-                  <span v-text="this.xmProduct.pmUsername"></span>
-                </el-row>
-                <el-row>
-                  <span>产品负责人</span>
-                </el-row>
+                  <span>产品负责人</span><span v-text="this.xmProduct.pmUsername"></span>
+                </el-row> 
               </el-row>
               <el-row style="margin-bottom:18px">
                 <el-col :span="8" @click="">
@@ -140,12 +137,12 @@
               <span>产品工时</span>
             </div>
             <div>
-              <el-row style="padding:25px;">
+              <el-row >
                 <div class="item">
                   <el-col :span="8">
                     <div>
                       <div style="text-align:center;">
-                        <span style="font-size:24px;" v-text="this.xmProductCpd.planWorkload"></span>
+                        <span style="font-size:24px;" v-text="this.xmProductCpd.estimateWorkload"></span>
                         <span style="font-size:5px;">h</span>
                       </div>
                       <div style="text-align:center;font-size:5px;">预估工时</div>
@@ -171,7 +168,7 @@
                   </el-col>
                 </div>
               </el-row>
-              <el-row style="padding:25px;">
+              <el-row >
                 <div class="item">
                   <el-col :span="8">
                     <div>
@@ -204,11 +201,11 @@
               </el-row>
               <el-row>
                 <span style="margin-left:20px;">工时预计进度</span>
-                <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;" :text-inside="true" :stroke-width="20" :percentage="planProgress"></el-progress>
+                <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;"   :stroke-width="14" :percentage="planProgress"></el-progress>
               </el-row>
               <el-row>
                 <span style="margin-left:20px;">工时实际进度</span>
-                <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;" :text-inside="true" :stroke-width="20" :percentage="realProgress"></el-progress>
+                <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;" color="#47CBF6" :stroke-width="14" :percentage="realProgress"></el-progress>
               </el-row>
             </div>
           </el-card>
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index 24881129..8ede92fb 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -24,11 +24,8 @@
               </div>
               <el-row style="margin-bottom:18px">
                 <el-row>
-                  <span v-text="taskMng"></span>
-                </el-row>
-                <el-row>
-                  <span>项目负责人</span>
-                </el-row>
+                  <span>项目负责人</span><span v-text="taskMng"></span>
+                </el-row> 
               </el-row>
               <el-row style="margin-bottom:18px">
                 <el-col :span="8" @click="">
@@ -152,12 +149,12 @@
                 <span>项目工时</span>
               </div>
               <div>
-                <el-row style="padding:25px;">
+                <el-row  >
                   <div class="item">
                     <el-col :span="8">
                       <div>
                         <div style="text-align:center;">
-                          <span style="font-size:24px;" v-text="this.selProject.totalPlanWorkload"></span>
+                          <span style="font-size:24px;" v-text="this.selProject.estimateWorkload"></span>
                           <span style="font-size:5px;">h</span>
                         </div>
                         <div style="text-align:center;font-size:5px;">预估工时</div>
@@ -183,7 +180,7 @@
                     </el-col>
                   </div>
                 </el-row>
-                <el-row style="padding:25px;">
+                <el-row  >
                   <div class="item">
                     <el-col :span="8">
                       <div>
@@ -216,11 +213,11 @@
                 </el-row>
                 <el-row>
                   <span style="margin-left:20px;">项目预计进度</span>
-                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;" :text-inside="true" :stroke-width="24" :percentage="planProgress"></el-progress>
+                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;margin-bottom: 20px;"   :stroke-width="14" :percentage="planProgress"></el-progress>
                 </el-row>
                 <el-row>
                   <span style="margin-left:20px;">项目实际进度</span>
-                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;" :text-inside="true" :stroke-width="24" :percentage="realProgress"></el-progress>
+                  <el-progress style="width: 90%;margin-left:20px;margin-top: 10px;"  color="#47CBF6" :stroke-width="14" :percentage="realProgress"></el-progress>
                 </el-row>
 
               </div>
@@ -297,32 +294,18 @@ export default {
       return Math.round(this.selProject.totalActWorkload/this.selProject.totalPlanWorkload*100);
     },
     deviation:function (){
-      let now = new Date();
-      let taskStartTime = new Date(this.selProject.startTime);
-      let taskEndTime = new Date(this.selProject.endTime);
-      if(now<=taskEndTime){
-        let allDays=taskEndTime-taskStartTime;
-        return this.selProject.totalActWorkload - Math.round((now-taskStartTime)/allDays*this.selProject.totalPlanWorkload)
-      }else{
-        return this.selProject.totalActWorkload - this.selProject.totalPlanWorkload;
-      }
+      
+        return this.selProject.totalActWorkload -  this.selProject.estimateWorkload
+       
     },
     deviationRate:function (){
-      return Math.round(this.deviation/this.selProject.totalPlanWorkload*100);
+      return Math.round(this.deviation/this.selProject.estimateWorkload*100);
     },
     remainWorkload:function (){
       return this.selProject.totalPlanWorkload - this.selProject.totalActWorkload;
     },
     planProgress:function (){
-      let now = new Date();
-      let taskStartTime = new Date(this.selProject.startTime);
-      let taskEndTime = new Date(this.selProject.endTime);
-      if(now<=taskEndTime){
-        let allDays=taskEndTime-taskStartTime;
-        return Math.round((now-taskStartTime)/allDays*100)
-      }else{
-        return 100;
-      }
+        return Math.round(this.selProject.estimateWorkload/this.selProject.totalPlanWorkload*100);
     },
     realProgress:function (){
       if(this.selProject.totalActWorkload < this.selProject.totalPlanWorkload){