Merge pull request 'projects/mesxc-zhp' (#233) from projects/mesxc-zhp into projects/mesxc-test

Reviewed-on: #233
This commit is contained in:
朱菊兰 2024-03-06 11:06:58 +08:00
commit 79394affb5

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-02-23 16:11:48 * @LastEditTime: 2024-03-06 10:57:52
* @Description: * @Description:
--> -->
<template> <template>
@ -637,7 +637,7 @@ export default {
this.SJGInitWebSocket() this.SJGInitWebSocket()
this.getTimes() this.getTimes()
// this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321]) // this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
// this.$refs.productLineChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321]) this.$refs.productLineChart.initChart(['D61', 'D62', 'D63', 'D64', 'D65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
const _this = this; const _this = this;
_this.beilv2 = document.documentElement.clientWidth / 1920 _this.beilv2 = document.documentElement.clientWidth / 1920
window.onresize = () => { window.onresize = () => {
@ -699,22 +699,22 @@ export default {
]) ])
this.processConfig.data = processArr this.processConfig.data = processArr
this.$refs['processScrollBoard'].updateRows(processArr) this.$refs['processScrollBoard'].updateRows(processArr)
if (res.data.length !==0) { // if (res.data.length !==0) {
let processArr = res.data.map((item, index) => [ // let processArr = res.data.map((item, index) => [
// console.log(item) // // console.log(item)
`<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''} // `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
</span>`, // </span>`,
// formatDate(item.planStartTime) || '', // // formatDate(item.planStartTime) || '',
` // `
<span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''} // <span style="color:rgba(255,255,255,0.5)" >${item.productionLineName || ''}
</span>`, // </span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`, // `<span style="color:rgba(255,255,255,0.5)">${item.sectionName || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`, // `<span style="color:rgba(255,255,255,0.5)">${item.count || ''}</span>`,
`<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`, // `<span style="color:rgba(255,255,255,0.5)">${item.inspectionTypeName || ''}</span>`,
]) // ])
this.processConfig.data = processArr // this.processConfig.data = processArr
this.$refs['processScrollBoard'].updateRows(processArr) // this.$refs['processScrollBoard'].updateRows(processArr)
} // }
}) })
}, },
getTimes() { getTimes() {