Compare commits

..

No commits in common. "e82ee4e542f40b44a6523a100aef350d4d6f08cb" and "cfaa17ee286ecc4dcc7ffda6c2bbf2a5f3214a9a" have entirely different histories.

2 changed files with 12 additions and 15 deletions

View File

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

View File

@ -127,19 +127,18 @@ export default {
lineData[it.recordTime + '_area'] = it.area lineData[it.recordTime + '_area'] = it.area
}) })
console.log('你好', this.monitorList) console.log('你好', this.monitorList)
if (this.monitorList.length > 0) { this.monitorList.forEach(m => {
this.monitorList.forEach(m => { console.log('455', m)
if (m.lineName === lineData.proLineName) { if (m.lineName === lineData.proLineName) {
m.data.forEach(bad => { m.data.forEach(bad => {
// //
// console.log('233', Date.parse(bad.dynamicName)) // console.log('233', Date.parse(bad.dynamicName))
const stamp = Date.parse(bad.dynamicName) const stamp = Date.parse(bad.dynamicName)
lineData[stamp + '_bad'] = bad.dynamicValue lineData[stamp + '_bad'] = bad.dynamicValue
lineData[stamp + '_percent'] = (lineData[stamp + '_bad'] / lineData[stamp + '_down'] * 100).toFixed(2) + '%' lineData[stamp + '_percent'] = (lineData[stamp + '_bad'] / lineData[stamp + '_down'] * 100).toFixed(2) + '%'
}) })
} }
}) })
}
lineData['workOrderName'] = works.join(',') lineData['workOrderName'] = works.join(',')
lineData['spec'] = specs.join(',') lineData['spec'] = specs.join(',')
this.tableData.push(lineData) this.tableData.push(lineData)