From f5976f38c33048020de1b116ffa004b0d889a14d Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期二, 05 十二月 2023 17:38:45 +0800
Subject: [PATCH] 车间正品率、工单进度统计、其他样式处理

---
 src/views/cockpitPage/index.vue |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/views/cockpitPage/index.vue b/src/views/cockpitPage/index.vue
index e63f212..2c88af8 100644
--- a/src/views/cockpitPage/index.vue
+++ b/src/views/cockpitPage/index.vue
@@ -18,7 +18,10 @@
       ></OrderCompleteRadio>
     </template>
     <template #leftBlock5>
-      <WorkOrderProgress :table-data="workOrderData"></WorkOrderProgress>
+      <WorkOrderProgress
+        :work-order-finish-rate="workOrderFinishRate"
+        :table-data="workOrderData"
+      ></WorkOrderProgress>
     </template>
     <template #leftBlock6>
       <PerSonnelProductivity
@@ -33,7 +36,7 @@
       <MaterialChart :chartData="materialChartData"></MaterialChart>
     </template>
     <template #rightBlock3>
-      <BarChart></BarChart>
+      <BarChart :chartData="barChartData"></BarChart>
     </template>
   </BackgroundBoardLayout>
 </template>
@@ -91,6 +94,7 @@
       },
       // 宸ュ崟杩涘害缁熻
       workOrderData: [],
+      workOrderFinishRate: "",
       // 浜哄憳鐢熶骇鏁堢巼
       perSonnelChartData: {
         datax: [],
@@ -106,13 +110,18 @@
         datax: [],
         datay: [],
       },
+      // 杞﹂棿姝e搧鐜�
+      barChartData: {
+        total: 0,
+        rate: "0",
+        datax: [],
+        datay: [],
+        datay2: [],
+      },
     };
   },
   mounted() {
     this.getDashboard();
-    // setInterval(() => {
-    //   this.getDashboard();
-    // }, 30000);
   },
   watch: {},
   methods: {
@@ -136,11 +145,13 @@
           this.setRightBlock1(res.data);
           // 鐗╂枡闇�姹傜粺璁�
           this.setRightBlock2(res.data);
+          // 杞﹂棿姝e搧鐜�
+          this.setRightBlock3(res.data);
         })
         .finally(() => {
           setTimeout(() => {
             this.getDashboard();
-          }, 30000);
+          }, 300000);
         });
     },
     // 澶勭悊宸︿笂鏁版嵁
@@ -215,6 +226,7 @@
     },
     // 宸ュ崟杩涘害缁熻
     setLeftBlock5(data) {
+      this.workOrderFinishRate = data?.WorkOrderFinishRate.toString() ?? "0";
       let list = data.WorkOrderStats.map((item) => {
         let completeProgerss = [];
         for (let i = 0; i < item.ProcedureNum; i++) {
@@ -246,7 +258,6 @@
         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) => {
@@ -275,6 +286,19 @@
         this.materialChartData.datay.push(parseFloat(item.Value));
       });
     },
+    // 杞﹂棿姝e搧鐜�
+    setRightBlock3(data) {
+      this.barChartData.total = data.TodayFinishAmount;
+      this.barChartData.rate = data.TodayQualifiedRate;
+      this.barChartData.datax = [];
+      this.barChartData.datay = [];
+      this.barChartData.datay2 = [];
+      data.WorkshopStats.map((item) => {
+        this.barChartData.datax.push(item.Name);
+        this.barChartData.datay.push(parseFloat(item.Qualified));
+        this.barChartData.datay2.push(parseFloat(item.Defective));
+      });
+    },
   },
 };
 </script>

--
Gitblit v1.8.0