From d950a89b2ff5da5b2e0f6db759899a1065404d94 Mon Sep 17 00:00:00 2001
From: Jack <1638169491@qq.com>
Date: Thu, 4 Aug 2022 16:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=96=E9=87=8C=E5=A4=A7=E5=B1=8F=EF=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=20jChart/bar/JBarChart.vue=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectHuScreen/jChart/bar/JBarChart.vue  |  23 ++--
 .../laborManage/leftBottom.vue                | 127 +++++++-----------
 2 files changed, 59 insertions(+), 91 deletions(-)

diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
index b674067c..1c88d2fa 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/jChart/bar/JBarChart.vue
@@ -26,7 +26,10 @@ export default {
       default: () => []
     },
     yData: {
-      required: true,
+      type: Array,
+      default: () => []
+    },
+    series: {
       type: Array,
       default: () => []
     }
@@ -40,7 +43,15 @@ export default {
   },
   methods: {
     createChart() {
-      const { title, grid, color, xData, yData } = this
+      const { title, grid, color, xData, yData, series } = this
+      const configSeries = (series => {
+        if (series.length) {
+          return series.map(item => ({ data: item.data, type: 'bar', barWidth: 15 }))
+        } else {
+          return [{ data: yData, type: 'bar', barWidth: 15 }]
+        }
+      })(series)
+
       const option = {
         title: {
           text: title.text,
@@ -104,13 +115,7 @@ export default {
             show: false
           }
         },
-        series: [
-          {
-            data: yData,
-            type: 'bar',
-            barWidth: 15
-          }
-        ]
+        series: configSeries
       }
       this.jBarChart.setOption(option)
     }
diff --git a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue
index 131a6b5c..ff3fa32d 100644
--- a/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue
+++ b/src/views/projectAdmin/dataBoard/projectHuScreen/laborManage/leftBottom.vue
@@ -1,112 +1,75 @@
 <template>
-  <!-- 年龄结构 -->
-  <div class="containerBox">
-    <div class="titleTxt">{{ title }}</div>
+  <Card :title="title">
     <div class="topTit">
-      <div class="blue"></div><span>在场</span>
-      <div class="purple"></div><span>在职</span>
+      <div class="blue"></div>
+      <span>在场</span>
+      <div class="purple"></div>
+      <span>在职</span>
       <div class="topright">
         <p>在职平均年龄： <a>42</a></p>
         <p>在场平均年龄： <a>42</a></p>
       </div>
     </div>
     <div class="mychart">
-      <JBarChart :xData="xData" :yData="yData" :color="color" :grid="grid"  />
+      <JBarChart :xData="xData" :series="series" :color="color" :grid="grid" />
     </div>
-  </div>
+  </Card>
 </template>
 
 <script>
-import JBarChart from "../jChart/bar/JBarChart.vue";
+import Card from '../components/Card.vue'
+import JBarChart from '../jChart/bar/JBarChart.vue'
 export default {
-  components: { JBarChart },
+  components: { Card, JBarChart },
 
   props: {
     title: {
       type: String,
-      default: "default title"
+      default: 'default title'
     }
   },
   data() {
     return {
-      xData: ["18岁及下", "18-45岁", "45-59岁", "60岁以上"],
-      yData: [
-        {
-          value: 170,
-          itemStyle: {
-            color: "#a9adb6"
-          }
-        },
-        {
-          value: 320,
-          itemStyle: {
-            color: "#557dee"
-          }
-        },
-        {
-          value: 270,
-          itemStyle: {
-            color: "#43d7b5"
-          }
-        },
-        {
-          value: 310,
-          itemStyle: {
-            color: "#ff6c7f"
-          }
-        }
-      ],
-      color: ["#5be2f6", "#5281f7"],
-      grid: ["10%", "5%", "15%", "5%"]
-    };
+      xData: ['18岁及下', '18-45岁', '45-59岁', '60岁以上'],
+      series: [{ data: [22, 33, 22, 56] }, { data: [32, 22, 32, 15] }],
+      color: ['#5be2f6', '#5281f7'],
+      grid: ['10%', '5%', '15%', '5%']
+    }
   }
-};
+}
 </script>
 
 <style lang="less" scoped>
-.containerBox {
-  width: 100%;
-  height: 100%;
-  border: 1px solid #0081c3;
-
-  .titleTxt {
-    font-size: 18px;
-    color: #6ee4f0;
-    margin-top: 5px;
-    margin-left: 5px;
-  }
-  .topTit{
-     font-size: 12px;
-     color: #5d6674;
-    .blue , .purple{
-      display: inline-block;
-      width: 15px;
-      height: 5px;
-      border-radius: 10px;
-      margin-left: 30px;
-      margin-right: 5px;
-      background-color: #5be2f6;
-    }
-    .purple{
-      background-color: #5181f7;
-    }
-    // span{
-    //   margin-right: 30px;
-    //   height: 15px;
-    //   line-height: 15px;
-    // }
-  }
-  .topright{
+.topTit {
+  font-size: 12px;
+  color: #5d6674;
+  .blue,
+  .purple {
     display: inline-block;
-    p {
-      margin-left: 110px;
-    }
+    width: 15px;
+    height: 5px;
+    border-radius: 10px;
+    margin-left: 30px;
+    margin-right: 5px;
+    background-color: #5be2f6;
   }
-  .mychart {
-    width: 100%;
-    height: 90%;
+  .purple {
+    background-color: #5181f7;
+  }
+  // span{
+  //   margin-right: 30px;
+  //   height: 15px;
+  //   line-height: 15px;
+  // }
+}
+.topright {
+  display: inline-block;
+  p {
+    margin-left: 110px;
   }
 }
+.mychart {
+  width: 100%;
+  height: calc(100% - 28px);
+}
 </style>
-
-