修改界面

master
夜笙歌 3 years ago
parent 39bcab13e2
commit 8cf7d9b2dc

@ -24,7 +24,7 @@
height: 20%;
top: 14.85%;
left: 3.4%;
/*font-size: 12%;*/
font-size: 8%;
/*padding-left: 1%;
padding-top: 0.7%;*/
}
@ -226,7 +226,9 @@
-->
<!--订单执行-->
<div id="top-left">
<div class="topLeftDiv" id="topLeftDiv">
<div id="top-left">
</div>
</div>
<!--生产统计-->
@ -358,17 +360,17 @@
//夹具生产计划切换
let tableData = []
let classes = 0
let dayClass = ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '7:30','8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30']
let nightClass = ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '19:30','20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30']
let dayClass = ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '7:30', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30']
let nightClass = ['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '19:30', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30']
let tableWidth = ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%", "4%"]
showalert();
setTimeout(() => {
window.setInterval(showalert, 1000 * 15);
},1000)
}, 1000)
let isFirst = true
let times = 1
const getTable = (state,data) => {
const getTable = (state, data) => {
if (state === 0) {
planInfo = new AutoScrollTable(document.getElementById("my-transition"), dayClass, {
width: tableWidth,
@ -377,8 +379,8 @@
planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), dayClass, {
width: tableWidth,
}, 7)
planInfo.loadData(data.map(value => [value.station_no, value.name, value.status === '未生产' ? `<span style="color: yellow">${value.status}</span>` : value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys(['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '7:30' ,'8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30']))
planInfo2.loadData(data.map(value => [value.station_no, value.name, value.status === '未生产' ? `<span style="color: yellow">${value.status}</span>` : value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys(['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '7:30' ,'8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30']))
planInfo.loadData(data.map(value => [value.station_no, value.name, value.status === '未生产' ? `<span style="color: yellow">${value.status}</span>` : value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys(['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '7:30', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30']))
planInfo2.loadData(data.map(value => [value.station_no, value.name, value.status === '未生产' ? `<span style="color: yellow">${value.status}</span>` : value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys(['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '7:30', '8:30', '9:30', '10:30', '11:30', '12:30', '13:30', '14:30', '15:30', '16:30', '17:30', '18:30']))
} else {
planInfo = new AutoScrollTable(document.getElementById("my-transition"), nightClass, {
width: tableWidth,
@ -387,7 +389,7 @@
planInfo2 = new AutoScrollTable(document.getElementById("my-transition2"), nightClass, {
width: tableWidth,
}, 7)
planInfo.loadData(data.map(value => [value.station_no, value.name, value.status === '未生产' ? `<span style="color: yellow">${value.status}</span>` : value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys(['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '19:30','20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30',]))
planInfo.loadData(data.map(value => [value.station_no, value.name, value.status === '未生产' ? `<span style="color: yellow">${value.status}</span>` : value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys(['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '19:30', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30',]))
planInfo2.loadData(data.map(value => [value.station_no, value.name, value.status === '未生产' ? `<span style="color: yellow">${value.status}</span>` : value.status, value.target, value.plan_number, value.qty, `${value.rate}%`, value.h1, value.h2, value.h3, value.h4, value.h5, value.h6, value.h7, value.h8, value.h9, value.h10, value.h11, value.h12]), Object.keys(['工位', '型号', '状态', '目标', '计划', '累计', '达成率', '19:30', '20:30', '21:30', '22:30', '23:30', '0:30', '1:30', '2:30', '3:30', '4:30', '5:30', '6:30']))
}
}
@ -404,7 +406,7 @@
}
if (tableData.length === 0) return
let dataTwo = tableData.slice(times * 7, times * 7 + 7)
getTable(classes,dataTwo)
getTable(classes, dataTwo)
if (times < 3) {
times += 1
} else {
@ -420,9 +422,9 @@
"差异数",
"执行进度"
];
const orderInf = new AutoScrollTable(document.getElementById("top-left"), orderInfColumns, {
width: ['30%', '14.5%', '14.5%', '14.5%', '14.5%']
})
// const orderInf = new AutoScrollTable(document.getElementById("top-left"), orderInfColumns, {
// width: ['30%', '14.5%', '14.5%', '14.5%', '14.5%']
// })
let selectors = []
let tmp = []
@ -474,9 +476,46 @@
})
// 订单执行 + 生产统计
autoUpdate('/broad/fp/selectOrderExecutionPlan', INTERVAL, data => {
orderInf.loadData(data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate == 0 ? value.rate : value.rate + '%'}`]), Object.keys(orderInfColumns))
const tableFun = () => {
const tableRes = {
data: data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate == 0 ? value.rate : value.rate + '%'}`]),
header: [
"型号",
"计划数",
"完成数",
"差异数",
"执行进度"
]
}
const getTable = () => {
$('#top-left').remove()
$('.topLeftDiv').html('<div class="top-left" id="top-left"></div>')
dynamicTable({
el: '#top-left',
rowNum: 4,
timeout: 0,
header: tableRes.header,
data: tableRes.data,
index: false,
fontColor: '#B4B7BF ',
indexBGC: '#86F3FF',
headerBGC: 'rgba(8,36,75,0.2)',
oddRowBGC: 'rgba(8,36,75,0.2)',
evenRowBGC: 'rgba(8,36,75,0.2)',
colWidth: ['30%', '14%', '15%', '14%', '15%']
});
}
getTable()
setInterval(() => {
getTable()
}, 10000);
}
tableFun()
// orderInf.loadData(data.map(value => [value.name, value.plan_number, value.actual_number, value.plan_number - value.actual_number, `${value.rate == 0 ? value.rate : value.rate + '%'}`]), Object.keys(orderInfColumns))
})
tableAnimation('#top-left')
autoUpdate('/broad/fp/selectOrderExecution', INTERVAL, data => {
modelChart.setOption({
xAxis: {
@ -507,12 +546,12 @@
dataOne = data.slice(times * 7, times * 7 + 7)
times++
}
getTable(classes,dataOne)
getTable(classes, dataOne)
total(
Number((data.filter(val => val.status === '生产中').length / 28) * 100).toFixed(2) + '%',
totalNum,
eval(data.map(val => val.qty).join('+')),
(Number(eval(data.map(val => val.qty).join('+')) / totalNum) * 100).toFixed(2)+ '%',
(Number(eval(data.map(val => val.qty).join('+')) / totalNum) * 100).toFixed(2) + '%',
eval(data.map(val => val.h1).join('+')),
eval(data.map(val => val.h2).join('+')),
eval(data.map(val => val.h3).join('+')),
@ -780,7 +819,7 @@
})
function resize() {
orderInf.resize()
// orderInf.resize()
// planInfo.resize()
// planInfo2.resize()
modelChart.resize()

Loading…
Cancel
Save