projects/mesxc-dy #191

Merged
gtz217 merged 2 commits from projects/mesxc-dy into projects/mesxc-test 2024-01-26 09:33:12 +08:00
2 changed files with 861 additions and 804 deletions
Showing only changes of commit 59c62fcb9c - Show all commits

View File

@ -120,8 +120,12 @@ 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)
}
if (it.specifications) {
specs.push(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
@ -140,8 +144,8 @@ export default {
} }
}) })
} }
lineData['workOrderName'] = works.join(',') lineData['workOrderName'] = Array.from(new Set(works)).join(',')
lineData['spec'] = specs.join(',') lineData['spec'] = Array.from(new Set(specs)).join(',')
this.tableData.push(lineData) this.tableData.push(lineData)
}) })
console.log('打印', this.tableData) console.log('打印', this.tableData)

1653
yarn.lock

File diff suppressed because it is too large Load Diff