src/views/produce/data/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-23 18:00:55
- * @LastEditors: DY
+ * @LastEditTime: 2024-07-17 08:55:15
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
@@ -392,8 +392,8 @@ export default {
       // 工厂名称 this.factoryListabbr
       const factoryNameArray = (this.listQuery.factory.length === 0 || this.listQuery.factory.length === this.factoryListabbr.length) ? [0, 1] : this.listQuery.factory
       const seriesArray = []
-      factoryNameArray.forEach((fac, facIndex) => {
       typeArray.forEach((type, typeIndex) => {
+        factoryNameArray.forEach((fac, facIndex) => {
           const series = {
             data: Array(xAxisData.length).fill(0),
             type: 'bar',
@@ -407,26 +407,27 @@ export default {
           seriesArray.push(series)
         })
       })
-
-      // 按工厂分
-      const arrayByFacArray = Object.groupBy(dataList, (member) => member.factory)
-      // const seriesDataArray = []
-      let n = 0
-      Object.values(arrayByFacArray).forEach((item) => {
-        typeArray.forEach(type => {
-          const typeName = ['chipYield', 'componentYield', 'bipvProductOutput'][type]
-          let seriesData = Array(xAxisData.length).fill(0)
+      // 构造series的data
+      const seriesDataArray = []
+      Object.values(data).forEach((item) => {
+        let seriesData = []
+        // item[0].datestr 为日期
+        typeArray.forEach(t => {
+          const zidr = ['chipYield', 'componentYield', 'bipvProductOutput'][t]
           item.forEach(it => {
-            xAxisData.forEach((x, xindex) => {
-              if (x === it['datestr']) {
-                seriesData[xindex] = it[typeName]
+            seriesData.push(it[zidr])
+          })
+        })
+        seriesDataArray.push(seriesData)
+      })
+      for (let y = 0; y < seriesArray.length; y ++) {
+        const days = []
+        seriesDataArray.forEach(a => {
+          days.push(a[y])
+        })
+        // 赋值完成
+        seriesArray[y].data = days
       }
-            })
-          })
-          seriesArray[n].data = seriesData
-          n ++
-        })
-      })
 
       // 添加工厂
       const validSeriesArray = []