Merge pull request 'projects/mesxc-dy' (#191) from projects/mesxc-dy into projects/mesxc-test

Reviewed-on: #191
Cette révision appartient à :
高天泽 2024-01-26 09:33:12 +08:00
révision 7a98ee1d0c
2 fichiers modifiés avec 861 ajouts et 804 suppressions

Voir le fichier

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

1653
yarn.lock

Fichier diff supprimé car celui-ci est trop grand Voir la Diff