From 1c432ff8b13bd431e8560d12f601b57a59bfa74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 4 Aug 2022 10:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F(=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E5=88=92):=E7=8A=B6=E6=80=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{jChart/pie => components}/progress.vue   |  0
 .../projectHuScreen/jChart/bar/JBarChart.vue  |  1 +
 .../{problemChart.vue => JProblemChart.vue}   |  0
 .../planProgress/centerBottom.vue             |  2 +-
 .../planProgress/leftBottom.vue               |  6 +--
 .../planProgress/leftCenter.vue               | 42 +++++++++++++++++--
 .../projectHuli/constructProgress.vue         |  2 +-
 .../projectHuli/qualityProblem.vue            |  2 +-
 8 files changed, 46 insertions(+), 9 deletions(-)
 rename src/views/projectAdmin/dataBoard/projectHuScreen/{jChart/pie => components}/progress.vue (100%)
 rename src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/{problemChart.vue => JProblemChart.vue} (100%)

diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/progress.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/components/progress.vue
similarity index 100%
rename from src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/progress.vue
rename to src/views/projectAdmin/dataBoard/projectHuScreen/components/progress.vue
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
index ad0d1a73..b674067c 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
@@ -80,6 +80,7 @@ export default {
         },
         yAxis: {
           type: 'value',
+          splitNumber: 4,
           splitLine: {
             show: true,
             lineStyle: {
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/problemChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/JProblemChart.vue
similarity index 100%
rename from src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/problemChart.vue
rename to src/views/projectAdmin/dataBoard/projectHuScreen/jChart/pie/JProblemChart.vue
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue
index 040961fa..bb8de9f2 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/centerBottom.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import conProgress from '../jChart/pie/progress.vue'
+import conProgress from '../components/progress.vue'
 export default {
   components:{conProgress},
   props: {
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftBottom.vue
index 7938cc91..1557f782 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftBottom.vue
@@ -4,7 +4,7 @@
     <div class="titleTxt">{{ title }}</div>
     <div class="myChart">
       <problemChart 
-      :title="{ text: 654, subTitle: '本周总任务' }" 
+      :title="{ text: 654, subTitle: '本周总任务' ,y:'35%'}" 
       :color="['#3cabfd','#57ec72','#f294c6','#f43a8d','#6ee4f0']"
       :data="[
             { value: 45, name: '未开始' },
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import problemChart from '../jChart/pie/problemChart.vue'
+import problemChart from '../jChart/pie/JProblemChart'
 export default {
 components:{problemChart},
   props: {
@@ -51,7 +51,7 @@ components:{problemChart},
   }
   .myChart{
     width: 100%;
-    height: 100%;
+    height: 90%;
   }
 }
 </style>
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftCenter.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftCenter.vue
index 23eb5562..02179d5e 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftCenter.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/planProgress/leftCenter.vue
@@ -1,13 +1,18 @@
 <template>
 <!-- 状态统计 -->
-<div class="container">
+<div class="containerBox">
     <div class="titleTxt">{{ title }}</div>
+    <div class="mychart">
+      <JBarChart :xData="xData" :yData="yData" :color="color" :grid="grid" :title="{ text: '全部' }" />
+    </div>
 
 </div>
 </template>
 
 <script>
+import JBarChart from '../jChart/bar/JBarChart.vue'
 export default {
+  components: { JBarChart },
 
   props: {
     title: {
@@ -17,7 +22,34 @@ export default {
   },
   data() {
     return {
-
+      xData:['未开始','进行中','已完成','延期'],
+      yData:[
+        {
+          value: 170,
+          itemStyle: {
+            color: '#a9adb6'
+          }
+        },
+        {
+          value: 320,
+          itemStyle: {
+            color: '#557dee'
+          }
+        },
+        {
+          value: 270,
+          itemStyle: {
+            color: '#43d7b5'
+          }
+        },
+        {
+          value: 310,
+          itemStyle: {
+            color: '#ff6c7f'
+          }
+        }],
+      color:['#a9adb6','#557dee','#43d7b5','#ff6c7f'],
+      grid:['10%','5%','7%','5%']
     };
   },
 
@@ -26,7 +58,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.container {
+.containerBox {
   width: 100%;
   height: 100%;
   border: 1px solid #0081c3;
@@ -37,6 +69,10 @@ export default {
     margin-top: 5px;
     margin-left: 5px;
   }
+  .mychart{
+    width: 100%;
+    height: 95%;
+  }
 }
 </style>
 
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue
index 83610f0e..876b4c46 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/constructProgress.vue
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import conProgress from '../jChart/pie/progress.vue'
+import conProgress from '../components/progress.vue'
 export default {
   components:{conProgress},
   data() {
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/qualityProblem.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/qualityProblem.vue
index a415e98a..6bc8e5e1 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/qualityProblem.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/projectHuli/qualityProblem.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import problemChart from '../jChart/pie/problemChart.vue'
+import problemChart from '../jChart/pie/JProblemChart'
 export default {
   components:{problemChart},
   props: {