From 2e6cfde0e6533c734bd5fe81a5d62b931098f6a3 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 05 十二月 2023 16:51:51 +0800
Subject: [PATCH] 人员，物料y轴超出文字点点点

---
 src/views/cockpitPage/index.vue |   93 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/src/views/cockpitPage/index.vue b/src/views/cockpitPage/index.vue
index 286e86a..e63f212 100644
--- a/src/views/cockpitPage/index.vue
+++ b/src/views/cockpitPage/index.vue
@@ -21,13 +21,16 @@
       <WorkOrderProgress :table-data="workOrderData"></WorkOrderProgress>
     </template>
     <template #leftBlock6>
-      <PerSonnelProductivity></PerSonnelProductivity>
+      <PerSonnelProductivity
+        ref="leftBlock6"
+        :chartData="perSonnelChartData"
+      ></PerSonnelProductivity>
     </template>
     <template #rightBlock1>
       <DeviceChart ref="rightBlock1" :chartData="deviceChartData"></DeviceChart>
     </template>
     <template #rightBlock2>
-      <MaterialChart></MaterialChart>
+      <MaterialChart :chartData="materialChartData"></MaterialChart>
     </template>
     <template #rightBlock3>
       <BarChart></BarChart>
@@ -88,38 +91,57 @@
       },
       // 宸ュ崟杩涘害缁熻
       workOrderData: [],
+      // 浜哄憳鐢熶骇鏁堢巼
+      perSonnelChartData: {
+        datax: [],
+        datay: [],
+      },
       // 璁惧璐熻嵎瀵规瘮
       deviceChartData: {
         datax: [],
         datay: [],
       },
-      dataindex: 0,
+      // 鐗╂枡闇�姹傜粺璁�
+      materialChartData: {
+        datax: [],
+        datay: [],
+      },
     };
   },
   mounted() {
     this.getDashboard();
-    setInterval(() => {
-      this.getDashboard();
-    }, 30000);
+    // setInterval(() => {
+    //   this.getDashboard();
+    // }, 30000);
   },
   watch: {},
   methods: {
     async getDashboard() {
-      await getDashboard().then((res) => {
-        console.log(res);
-        // 宸︿笂鏁板�肩粺璁℃暟鎹�
-        this.setLeftBlock1(res.data);
-        // 鏈哄櫒寮�鏈虹巼鏁版嵁
-        this.setleftBlock2(res.data);
-        //  宸︿腑鏁版嵁缁熻鍊�
-        this.setLeftBlock3(res.data);
-        // 璁㈠崟瀹屾垚姣旂巼
-        this.setLeftBlock4(res.data);
-        // 宸ュ崟杩涘害缁熻
-        this.setLeftBlock5(res.data);
-        // 璁惧璐熻嵎瀵规瘮
-        this.setRightBlock1(res.data);
-      });
+      await getDashboard()
+        .then((res) => {
+          console.log(res);
+          // 宸︿笂鏁板�肩粺璁℃暟鎹�
+          this.setLeftBlock1(res.data);
+          // 鏈哄櫒寮�鏈虹巼鏁版嵁
+          this.setleftBlock2(res.data);
+          //  宸︿腑鏁版嵁缁熻鍊�
+          this.setLeftBlock3(res.data);
+          // 璁㈠崟瀹屾垚姣旂巼
+          this.setLeftBlock4(res.data);
+          // 宸ュ崟杩涘害缁熻
+          this.setLeftBlock5(res.data);
+          // 浜哄憳鐢熸晥鏁堢巼姣� 浜哄憳鎶�鑳�
+          this.setLeftBlock6(res.data);
+          // 璁惧璐熻嵎瀵规瘮
+          this.setRightBlock1(res.data);
+          // 鐗╂枡闇�姹傜粺璁�
+          this.setRightBlock2(res.data);
+        })
+        .finally(() => {
+          setTimeout(() => {
+            this.getDashboard();
+          }, 30000);
+        });
     },
     // 澶勭悊宸︿笂鏁版嵁
     setLeftBlock1(data) {
@@ -216,6 +238,25 @@
       });
       this.workOrderData = list;
     },
+    // 浜哄憳鐢熸晥鏁堢巼姣� 浜哄憳鎶�鑳�
+    setLeftBlock6(data) {
+      this.perSonnelChartData.datax = [];
+      this.perSonnelChartData.datay = [];
+      data.PersonnelProductivity.map((item) => {
+        this.perSonnelChartData.datax.push(item.Name);
+        this.perSonnelChartData.datay.push(parseFloat(item.Value));
+      });
+      console.log(this.perSonnelChartData.datay);
+      // 浜哄憳鎶�鑳介ゼ鍥�
+      let chartData2 = [];
+      chartData2 = data.WorkerTypeStats.map((item) => {
+        return {
+          name: item.Name,
+          value: parseFloat(item.Value),
+        };
+      });
+      this.$refs.leftBlock6.getChartRight("chart2", chartData2);
+    },
     // 璁惧璐熻嵎瀵规瘮
     setRightBlock1(data) {
       this.deviceChartData.datax = [];
@@ -224,7 +265,15 @@
         this.deviceChartData.datax.push(item.Name);
         this.deviceChartData.datay.push(parseFloat(item.Value));
       });
-      // this.$refs.rightBlock1.pieChart("chart", this.deviceChartData);
+    },
+    // 鐗╂枡闇�姹傜粺璁�
+    setRightBlock2(data) {
+      this.materialChartData.datax = [];
+      this.materialChartData.datay = [];
+      data.MaterialRequirement.map((item) => {
+        this.materialChartData.datax.push(item.Name);
+        this.materialChartData.datay.push(parseFloat(item.Value));
+      });
     },
   },
 };

--
Gitblit v1.8.0