projects/mes-test #132

Manually merged
gtz217 merged 281 commits from projects/mes-test into projects/mes 2023-11-30 09:11:34 +08:00
2 changed files with 15 additions and 12 deletions
Showing only changes of commit 1d9b97f1d0 - Show all commits

View File

@ -424,6 +424,7 @@ export default {
//
form: {
id: null,
files: []
},
showUploadComponents: false, //
};
@ -506,6 +507,7 @@ export default {
spec: undefined,
description: undefined,
remark: undefined,
files: []
};
this.resetForm('form');
},

View File

@ -127,8 +127,8 @@ export default {
lineData[it.recordTime + '_area'] = it.area
})
console.log('你好', this.monitorList)
if (this.monitorList.length > 0) {
this.monitorList.forEach(m => {
console.log('455', m)
if (m.lineName === lineData.proLineName) {
m.data.forEach(bad => {
//
@ -139,6 +139,7 @@ export default {
})
}
})
}
lineData['workOrderName'] = works.join(',')
lineData['spec'] = specs.join(',')
this.tableData.push(lineData)