From b97353c5ed075d2b47552fba46afa4781dcaa39a 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, 6 Apr 2022 10:46:18 +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 | 8 +++-----
 src/views/xm/core/xmProduct/XmProductOverview.vue     | 8 +++-----
 src/views/xm/core/xmProject/XmProjectOverview.vue     | 8 +++-----
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index d768c4d0..259eafe0 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -53,7 +53,7 @@
                       <i class="el-icon-check"></i>
                     </div>
                     <div class="info">
-                      <div v-text="this.xmIteration.taskFinishCnt" >
+                      <div v-text="this.xmIteration.taskCnt-notStart" >
                       </div>
                       <div class="title">已完成</div>
                     </div>
@@ -243,7 +243,7 @@ export default {
   computed: {
     ...mapGetters(["userInfo"]),
     notStart: function() {
-      return this.xmIteration.taskCnt-this.xmIteration.taskFinishCnt;
+      return this.xmIteration.taskUnstartCnt+this.xmIteration.taskExecCnt;
     },
     taskProgress: function (){
       return this.xmIteration.finishRate||0;
@@ -394,9 +394,7 @@ export default {
           trigger: 'item',
           formatter: '{b} : {c} ({d}%)'
         },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
+        legend: { 
         },
         series: [
           {
diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
index ee650656..e7039bee 100644
--- a/src/views/xm/core/xmProduct/XmProductOverview.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -55,7 +55,7 @@
                       <i class="el-icon-check"></i>
                     </div>
                     <div class="info">
-                      <div v-text="this.xmProduct.taskFinishCnt" >
+                      <div v-text="this.xmProduct.taskCnt-this.notStart" >
                       </div>
                       <div class="title">已完成</div>
                     </div>
@@ -245,7 +245,7 @@ export default {
   computed: {
     ...mapGetters(["userInfo"]),
     notStart: function() {
-      return this.xmProduct.taskCnt-this.xmProduct.taskFinishCnt;
+      return this.xmProduct.taskUnstartCnt+this.xmProduct.taskExecCnt;
     },
     taskProgress: function (){
       return this.xmProduct.finishRate?parseInt(this.xmProduct.finishRate):0;
@@ -415,9 +415,7 @@ export default {
           trigger: 'item',
           formatter: '{b} : {c} ({d}%)'
         },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
+        legend: { 
         },
         series: [
           {
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index ff86800f..f8d34355 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -270,10 +270,10 @@ export default {
   computed: {
     ...mapGetters(["userInfo"]),
     finish: function (){
-      return this.selProject.taskCloseCnt;
+      return this.selProject.taskCnt-this.selProject.taskUnstartCnt-this.selProject.taskExecCnt;
     },
     notStart: function() {
-      return this.selProject.taskCnt-this.selProject.taskCloseCnt;
+      return  this.selProject.taskUnstartCnt+this.selProject.taskExecCnt;
     },
     totalTask: function() {
       return this.selProject.taskCnt;
@@ -495,9 +495,7 @@ export default {
           trigger: 'item',
           formatter: '{b} : {c} ({d}%)'
         },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
+        legend: { 
         },
         series: [
           {