From 5ac5da1bf5d3d353cddf24c0c87bf9d557ceeb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 28 Jun 2024 16:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/components/produceLineYieldBarTarget.vue  |  6 +++---
 src/views/report/produceConversion.vue               | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/report/components/produceLineYieldBarTarget.vue b/src/views/report/components/produceLineYieldBarTarget.vue
index 3138e68..fcbd44d 100644
--- a/src/views/report/components/produceLineYieldBarTarget.vue
+++ b/src/views/report/components/produceLineYieldBarTarget.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-06-28 13:46:00
+ * @LastEditTime: 2024-06-28 15:53:14
  * @LastEditors: zhp
  * @Description:
 -->
@@ -56,7 +56,7 @@ export default {
             var res = ``;
             // for (var i = 0, l = params.length; i < l; i++) {
             // console.log()
-            if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量') {
+            if (params[0].axisValue === 'FTO投入' || params[0].axisValue === '芯片产量' || params[0].axisValue === '标准组件产量' || params[0].axisValue === '芯片总功率' || params[0].axisValue === '标准组件总功率') {
               res +=
                 `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[0].color}'></span>` +
               `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[0].axisValueLabel}</span>` +
@@ -79,7 +79,7 @@ export default {
                 : params[1].name === "转化效率"
                   ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
                   : params[1].seriesName.search('总功率') != -1
-                    ? (params[i].value ? params[1].value : 0) + "MW"
+                    ? (params[1].value ? params[1].value : 0) + "MW"
                     : (params[1].value ? params[1].value : 0) + "片"
                 }</span>`;
             }
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 9e76ce9..fa4abab 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -674,6 +674,18 @@ export default {
             })
           }
         }
+        this.chartMsg.series[0].data.push({
+          name: '芯片总功率',
+          value: dataArr[0]['dayData'] === 0 ? null : dataArr[0]['dayData']
+        })
+        this.chartMsg.series[1].data.push({
+          name: '标准组件总功率',
+          value: dataArr[1]['dayData'] === 0 ? null : dataArr[1]['dayData']
+        })
+        this.chartMsg.series[2].data.push({
+          name: '转化效率',
+          value: dataArr[2]['dayData'] === 0 ? null : dataArr[2]['dayData']
+        })
       } else {
         this.chartMsgYearTarget.series[0].data = []
         this.chartMsgYearTarget.series[1].data = []