Compare commits

..

No commits in common. "7a98ee1d0cef2c916d7907a49f053a3dd802acb7" and "029a2fa6d797db80fa8f1457002e9b1e167a3361" have entirely different histories.

2 changed files with 787 additions and 844 deletions

View File

@ -120,12 +120,8 @@ export default {
lineData['proLineName'] = item[0].lineName lineData['proLineName'] = item[0].lineName
let works = [], specs = [] let works = [], specs = []
item.forEach(it => { item.forEach(it => {
if (it.workOrderName) { works.push(it.workOrderName)
works.push(it.workOrderName) specs.push(it.specifications)
}
if (it.specifications) {
specs.push(it.specifications)
}
lineData[it.recordTime + '_up'] = it.inputNum lineData[it.recordTime + '_up'] = it.inputNum
lineData[it.recordTime + '_down'] = it.outputNum lineData[it.recordTime + '_down'] = it.outputNum
lineData[it.recordTime + '_area'] = it.area lineData[it.recordTime + '_area'] = it.area
@ -144,8 +140,8 @@ export default {
} }
}) })
} }
lineData['workOrderName'] = Array.from(new Set(works)).join(',') lineData['workOrderName'] = works.join(',')
lineData['spec'] = Array.from(new Set(specs)).join(',') lineData['spec'] = specs.join(',')
this.tableData.push(lineData) this.tableData.push(lineData)
}) })
console.log('打印', this.tableData) console.log('打印', this.tableData)

1619
yarn.lock

File diff suppressed because it is too large Load Diff