wangh
/
aucma-benchmarking-factory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改数据请求

Browse Source
master
夜笙歌 4 years ago
parent e1f545c560
commit 8b1a296bd3
1 changed files with 77 additions and 74 deletions
Show Stats Download Patch File Download Diff File

151
ruoyi-admin/src/main/resources/templates/broad/fp.html
Unescape Escape View File

@ -450,7 +450,7 @@
// 当班计划/实际产量/当班差异
autoUpdate('/broad/fp/selectOrderInfo', INTERVAL, data => {
// let p = [data[1], data[0][2], data[0][3]]
let p = [data.plan_shift, data.planned_number, data.plan_shift - data.planned_number]
let p = [data.planned_number, data.quantity_number, data.planned_number - data.quantity_number]
for (let i in p) {
updateSplitBlocks(p[i], selectors[i])
@ -493,39 +493,39 @@
//data.map(value => [value.orderType, value.plannedProduction, value.actualProduction, value.plannedProduction - value.actualProduction, `${(value.actualProduction / value.plannedProduction * 100).toFixed(2)}%`]
})
autoUpdate('/system/FoamerMes/getPlanHourInfo2', INTERVAL, data => {
// orderInf.loadData(data, Object.keys(orderInfColumns))
let consolidatedRow = ["", "合计", ""]
for (let i = 3; i < 19; i++) {
if (i === 6) {
consolidatedRow.push(`${(consolidatedRow[5] / consolidatedRow[4] * 100).toFixed(1)}%`)
continue
}
let sum = 0
for (let j = 1; j < data.length; j++) {
let d = data[j][i]
if (!d || d === '') {
continue
}
if (typeof d === 'string') {
d = parseInt(d)
}
sum += d
}
consolidatedRow.push(sum.toString())
}
data.push(consolidatedRow)
planInfo2.loadData(data, 19, {
includeHead: true,
})
})
// autoUpdate('/system/FoamerMes/getPlanHourInfo2', INTERVAL, data => {
// // orderInf.loadData(data, Object.keys(orderInfColumns))
// let consolidatedRow = ["", "合计", ""]
//
// for (let i = 3; i < 19; i++) {
// if (i === 6) {
// consolidatedRow.push(`${(consolidatedRow[5] / consolidatedRow[4] * 100).toFixed(1)}%`)
// continue
// }
//
// let sum = 0
//
// for (let j = 1; j < data.length; j++) {
// let d = data[j][i]
// if (!d || d === '') {
// continue
// }
// if (typeof d === 'string') {
// d = parseInt(d)
// }
//
// sum += d
// }
//
// consolidatedRow.push(sum.toString())
// }
//
// data.push(consolidatedRow)
//
// planInfo2.loadData(data, 19, {
// includeHead: true,
// })
// })
// 右侧压力 + 右侧温度
@ -557,9 +557,12 @@
xAxis: {
data: data[`xAxisInfo`],
axisLabel: {
rotate: -30,
// rotate: -30,
},
},
yAxis:{
max:Math.max(...data[`xAxisInfo`])
}
series: [
{
name: '数量',
@ -584,46 +587,46 @@
updateStatus("status-sys2", data.status2)
})
autoUpdate('/system/FoamerMes/getFoamTemp', INTERVAL, res => {
myEcharts(res, document.getElementById("top-right"));
})
// autoUpdate('/system/FoamerMes/getFoamTemp', INTERVAL, res => {
// myEcharts(res, document.getElementById("top-right"));
// })
autoUpdate("/system/FoamerMes/flawRate", INTERVAL, data => {
const total = data[0]
const flaw = data[1]
const rate = flaw / total
rejectRatioChart.setOption({
series: [
{
name: '不良率',
data: [
{value: 22, name: `3%`},
{value: 78, name: ''},
],
}
]
})
})
autoUpdate("/system/FoamerMes/flawInfo", INTERVAL, data => {
let d = {}
for (let entry of data) {
if (!d[entry.itemName]) {
d[entry.itemName] = 0
}
d[entry.itemName] += parseFloat(entry.count)
}
data = []
for (let entry of Object.entries(d)) {
data.push({
name: entry[0],
value: entry[1],
})
}
})
// autoUpdate("/system/FoamerMes/flawRate", INTERVAL, data => {
// const total = data[0]
// const flaw = data[1]
// const rate = flaw / total
//
// rejectRatioChart.setOption({
// series: [
// {
// name: '不良率',
// data: [
// {value: 22, name: `3%`},
// {value: 78, name: ''},
// ],
// }
// ]
// })
// })
//
// autoUpdate("/system/FoamerMes/flawInfo", INTERVAL, data => {
// let d = {}
// for (let entry of data) {
// if (!d[entry.itemName]) {
// d[entry.itemName] = 0
// }
//
// d[entry.itemName] += parseFloat(entry.count)
// }
//
// data = []
// for (let entry of Object.entries(d)) {
// data.push({
// name: entry[0],
// value: entry[1],
// })
// }
// })
})
const modelChart = echarts.init(document.getElementById("mid-left"))

Write Preview
Loading…
Cancel
Save