mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'projects/mes-dy' (#93) from projects/mes-dy into projects/mes-test

Browse Source 
Reviewed-on: #93
This commit is contained in:
高天泽 2023-11-17 10:38:28 +08:00
commit e82ee4e542
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/base/coreEquipment/index.vue
View File

@ -424,6 +424,7 @@ export default {
// 表单参数 // 表单参数
form: { form: {
id: null, id: null,
files: []
}, },
showUploadComponents: false, // 是否显示上传组件 showUploadComponents: false, // 是否显示上传组件
}; };
@ -506,6 +507,7 @@ export default {
spec: undefined, spec: undefined,
description: undefined, description: undefined,
remark: undefined, remark: undefined,
files: []
}; };
this.resetForm('form'); this.resetForm('form');
}, },

25
src/views/core/monitoring/data24/index.vue
View File

@ -127,18 +127,19 @@ export default {
lineData[it.recordTime + '_area'] = it.area lineData[it.recordTime + '_area'] = it.area
}) })
console.log('你好', this.monitorList) console.log('你好', this.monitorList)
this.monitorList.forEach(m => { if (this.monitorList.length > 0) {
console.log('455', m) this.monitorList.forEach(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)