From 164c8c069e2854d1400e2420adbdc5b674c5de47 Mon Sep 17 00:00:00 2001
From: chentaiyu <chentaiyu>
Date: Tue, 20 Jul 2021 18:24:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E3=80=81=E8=BF=AD=E4=BB=A3=E8=87=AA=E9=80=82=E5=BA=94=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/xmIteration/XmIterationOverview.vue  | 29 +++++++++------
 .../xm/core/xmProduct/XmProductOverview.vue   | 29 +++++++++------
 .../xm/core/xmProject/XmProjectOverview.vue   | 37 +++++++++++--------
 3 files changed, 58 insertions(+), 37 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue
index 0afa9d3a..824c823b 100644
--- a/src/views/xm/core/xmIteration/XmIterationOverview.vue
+++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue
@@ -90,10 +90,10 @@
                     <i class="el-icon-alarm-clock"></i>
                   </div>
                   <div>
-                    <div class="info">
+                    <div class="progress-item">
                       <el-progress :percentage="taskProgress"></el-progress>
+                      <div class="title">任务进度</div>
                     </div>
-                    <div class="title">任务进度</div>
                   </div>
                 </div>
               </el-row>
@@ -105,7 +105,7 @@
                 <span>所有工作项及其完成情况</span>
               </div>
               <div>
-                <div id="allChart" :style="{width: '425px', height: '350px'}"></div>
+                <div id="allChart" :style="{width: '100%', height: '350px'}"></div>
               </div>
             </el-card>
           </el-col>
@@ -115,7 +115,7 @@
                 <span>缺陷情况</span>
               </div>
               <div>
-                <div id="bugPieChart" :style="{width: '440px', height: '400px'}"></div>
+                <div id="bugPieChart" :style="{width: '100%', height: '410px'}"></div>
               </div>
             </el-card>
           </el-col>
@@ -207,7 +207,7 @@
               <span>迭代相关联产品与项目数</span>
             </div>
             <div>
-              <div id="productAndProject" :style="{width: '450px', height: '350px'}"></div>
+              <div id="productAndProject" :style="{width: '100%', height: '350px'}"></div>
             </div>
           </el-card>
         </el-col>
@@ -217,7 +217,7 @@
               <span>案例情况</span>
             </div>
             <div>
-              <div id="casePie" :style="{width: '400px', height: '415px'}"></div>
+              <div id="casePie" :style="{width: '100%', height: '410px'}"></div>
             </div>
           </el-card>
         </el-col>
@@ -329,6 +329,13 @@ export default {
         },
         series: [
           {
+            label: {
+              normal:{
+                show: true,
+                position: 'top',
+                color:'#000000',
+              }
+            },
             data: [
               {
                 value: this.xmIteration.menuCnt,
@@ -458,7 +465,7 @@ export default {
           label: {
             normal:{
               show: true,
-              position: 'inside',
+              position: 'top',
               color:'#000000',
             }
           },
@@ -607,6 +614,10 @@ export default {
 .item {
   display: flex;
   justify-content: flex-start;
+  position: relative;
+  .progress-item{
+    position:absolute; width:80%;
+  }
 }
 
 .card-font {
@@ -649,10 +660,6 @@ export default {
   cursor: pointer;
 }
 
-.el-progress {
-  width: 350px;
-}
-
 .value {
   cursor: pointer;
 }
diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
index 2ba11af5..7e4e9fbc 100644
--- a/src/views/xm/core/xmProduct/XmProductOverview.vue
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -90,10 +90,10 @@
                     <i class="el-icon-alarm-clock"></i>
                   </div>
                   <div>
-                    <div class="info">
+                    <div class="progress-item">
                       <el-progress  :percentage="taskProgress"></el-progress>
+                      <div class="title" style="width: 100%">任务进度</div>
                     </div>
-                    <div class="title" style="width: 100%">任务进度</div>
                   </div>
                 </div>
               </el-row>
@@ -105,7 +105,7 @@
                 <span>所有工作项及其完成情况</span>
               </div>
               <div>
-                <div id="allChart" :style="{width: '400px', height: '370px'}"></div>
+                <div id="allChart" :style="{width: '100%', height: '350px'}"></div>
               </div>
             </el-card>
           </el-col>
@@ -115,7 +115,7 @@
                 <span>缺陷情况</span>
               </div>
               <div>
-                <div id="bugPieChart" :style="{width: '450px', height: '410px'}"></div>
+                <div id="bugPieChart" :style="{width: '100%', height: '410px'}"></div>
               </div>
             </el-card>
           </el-col>
@@ -206,7 +206,7 @@
               <span>产品相关联项目与迭代数</span>
             </div>
             <div>
-              <div id="projectAndIteration" :style="{width: '450px', height: '350px'}"></div>
+              <div id="projectAndIteration" :style="{width: '100%', height: '350px'}"></div>
             </div>
           </el-card>
         </el-col>
@@ -216,7 +216,7 @@
               <span>案例情况</span>
             </div>
             <div>
-              <div id="casePie" :style="{width: '400px', height: '415px'}"></div>
+              <div id="casePie" :style="{width: '100%', height: '410px'}"></div>
             </div>
           </el-card>
         </el-col>
@@ -337,6 +337,13 @@ export default {
         },
         series: [
           {
+            label: {
+              normal:{
+                show: true,
+                position: 'top',
+                color:'#000000',
+              }
+            },
             data: [
               {
                 value: this.xmProduct.menuCnt,
@@ -466,7 +473,7 @@ export default {
           label: {
             normal:{
               show: true,
-              position: 'inside',
+              position: 'top',
               color:'#000000',
             }
           },
@@ -615,6 +622,10 @@ export default {
 .item {
   display: flex;
   justify-content: flex-start;
+  position: relative;
+  .progress-item{
+    position:absolute; width:80%;
+  };
 }
 
 .card-font {
@@ -657,10 +668,6 @@ export default {
   cursor: pointer;
 }
 
-.el-progress {
-  width: 350px;
-}
-
 .value {
   cursor: pointer;
 }
diff --git a/src/views/xm/core/xmProject/XmProjectOverview.vue b/src/views/xm/core/xmProject/XmProjectOverview.vue
index 0323005e..acdb394b 100644
--- a/src/views/xm/core/xmProject/XmProjectOverview.vue
+++ b/src/views/xm/core/xmProject/XmProjectOverview.vue
@@ -90,10 +90,10 @@
                     <i class="el-icon-alarm-clock"></i>
                   </div>
                   <div>
-                    <div class="info">
-                      <el-progress v-if="progress1" :percentage="progress1"></el-progress>
+                    <div class="progress-item">
+                      <el-progress :percentage="taskProgress"></el-progress>
+                      <div class="title">任务进度</div>
                     </div>
-                    <div class="title">任务进度</div>
                   </div>
                 </div>
               </el-row>
@@ -105,7 +105,7 @@
                 <span>所有工作项及其完成情况</span>
               </div>
               <div>
-                <div id="allChart" :style="{width: '425px', height: '350px'}"></div>
+                <div id="allChart" :style="{width: '100%', height: '350px'}"></div>
               </div>
             </el-card>
           </el-col>
@@ -115,7 +115,7 @@
                 <span>缺陷情况</span>
               </div>
               <div>
-                <div id="bugPieChart" :style="{width: '400px', height: '415px'}"></div>
+                <div id="bugPieChart" :style="{width: '100%', height: '410px'}"></div>
               </div>
             </el-card>
           </el-col>
@@ -127,7 +127,7 @@
                 <span>任务每日状态趋势</span>
               </div>
               <div>
-                <div id="taskChart" :style="{width: '630px', height: '320px'}"></div>
+                <div id="taskChart" :style="{width: '100%', height: '320px'}"></div>
               </div>
             </el-card>
           </el-col>
@@ -219,7 +219,7 @@
               <span>总预算情况</span>
             </div>
             <div>
-              <div id="planTotalCostPie" :style="{width: '400px', height: '415px'}"></div>
+              <div id="planTotalCostPie" :style="{width: '100%', height: '410px'}"></div>
             </div>
           </el-card>
         </el-col>
@@ -229,7 +229,7 @@
               <span>工作量分布</span>
             </div>
             <div>
-              <div id="workloadDistribution" :style="{width: '400px', height: '415px'}"></div>
+              <div id="workloadDistribution" :style="{width: '100%', height: '410px'}"></div>
             </div>
           </el-card>
         </el-col>
@@ -239,7 +239,7 @@
               <span>所含产品和迭代情况</span>
             </div>
             <div>
-              <div id="iterationAndProduct" :style="{width: '450px', height: '350px'}"></div>
+              <div id="iterationAndProduct" :style="{width: '100%', height: '350px'}"></div>
             </div>
           </el-card>
         </el-col>
@@ -284,7 +284,7 @@ export default {
     totalTask: function() {
       return this.selProject.totalTaskCnt;
     },
-    progress1: function (){
+    taskProgress: function (){
       return Math.round(this.selProject.totalCompleteTaskCnt/this.selProject.totalTaskCnt*100);
     },
     taskStartTime: function (){
@@ -403,6 +403,13 @@ export default {
         },
         series: [
           {
+            label: {
+              normal:{
+                show: true,
+                position: 'top',
+                color:'#000000',
+              }
+            },
             data: [
               {
                 value: this.selProject.menuCnt,
@@ -727,7 +734,7 @@ export default {
           label: {
             normal:{
               show: true,
-              position: 'inside',
+              position: 'top',
               color:'#000000',
             }
           },
@@ -820,6 +827,10 @@ export default {
 .item {
   display: flex;
   justify-content: flex-start;
+  position: relative;
+  .progress-item{
+    position:absolute; width:80%;
+  }
 }
 
 .card-font {
@@ -862,10 +873,6 @@ export default {
   cursor: pointer;
 }
 
-.el-progress {
-  width: 350px;
-}
-
 .value {
   cursor: pointer;
 }