Merge pull request 'projects/mes-dy' (#93) from projects/mes-dy into projects/mes-test
Reviewed-on: #93
This commit is contained in:
commit
e82ee4e542
@ -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');
|
||||
},
|
||||
|
@ -127,18 +127,19 @@ export default {
|
||||
lineData[it.recordTime + '_area'] = it.area
|
||||
})
|
||||
console.log('你好', this.monitorList)
|
||||
this.monitorList.forEach(m => {
|
||||
console.log('455', m)
|
||||
if (m.lineName === lineData.proLineName) {
|
||||
m.data.forEach(bad => {
|
||||
// 转成时间戳
|
||||
// console.log('233', Date.parse(bad.dynamicName))
|
||||
const stamp = Date.parse(bad.dynamicName)
|
||||
lineData[stamp + '_bad'] = bad.dynamicValue
|
||||
lineData[stamp + '_percent'] = (lineData[stamp + '_bad'] / lineData[stamp + '_down'] * 100).toFixed(2) + '%'
|
||||
})
|
||||
}
|
||||
})
|
||||
if (this.monitorList.length > 0) {
|
||||
this.monitorList.forEach(m => {
|
||||
if (m.lineName === lineData.proLineName) {
|
||||
m.data.forEach(bad => {
|
||||
// 转成时间戳
|
||||
// console.log('233', Date.parse(bad.dynamicName))
|
||||
const stamp = Date.parse(bad.dynamicName)
|
||||
lineData[stamp + '_bad'] = bad.dynamicValue
|
||||
lineData[stamp + '_percent'] = (lineData[stamp + '_bad'] / lineData[stamp + '_down'] * 100).toFixed(2) + '%'
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
lineData['workOrderName'] = works.join(',')
|
||||
lineData['spec'] = specs.join(',')
|
||||
this.tableData.push(lineData)
|
||||
|
Loading…
Reference in New Issue
Block a user