Merge pull request 'projects/mescc/dy' (#104) from projects/mescc/dy into projects/mescc/develop
ステータスチェックはすべて成功しました
continuous-integration/drone/push Build is passing

Reviewed-on: #104
このコミットが含まれているのは:
朱菊兰 2024-07-24 13:07:28 +08:00
コミット ec5e47a416

ファイルの表示

@ -1,8 +1,8 @@
<!--
* @Author: zhp
* @Date: 2024-04-15 10:49:13
* @LastEditTime: 2024-07-17 08:55:15
* @LastEditors: zhp
* @LastEditTime: 2024-07-23 18:00:55
* @LastEditors: DY
* @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 = []
typeArray.forEach((type, typeIndex) => {
factoryNameArray.forEach((fac, facIndex) => {
factoryNameArray.forEach((fac, facIndex) => {
typeArray.forEach((type, typeIndex) => {
const series = {
data: Array(xAxisData.length).fill(0),
type: 'bar',
@ -407,27 +407,26 @@ export default {
seriesArray.push(series)
})
})
// seriesdata
const seriesDataArray = []
Object.values(data).forEach((item) => {
let seriesData = []
// item[0].datestr
typeArray.forEach(t => {
const zidr = ['chipYield', 'componentYield', 'bipvProductOutput'][t]
//
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)
item.forEach(it => {
seriesData.push(it[zidr])
xAxisData.forEach((x, xindex) => {
if (x === it['datestr']) {
seriesData[xindex] = it[typeName]
}
})
})
seriesArray[n].data = seriesData
n ++
})
seriesDataArray.push(seriesData)
})
for (let y = 0; y < seriesArray.length; y ++) {
const days = []
seriesDataArray.forEach(a => {
days.push(a[y])
})
//
seriesArray[y].data = days
}
//
const validSeriesArray = []