This commit is contained in:
2024-03-04 16:01:16 +08:00
parent 73b76e79b7
commit d41b965db0
2 changed files with 259 additions and 40 deletions

File diff suppressed because one or more lines are too long

View File

@@ -88,19 +88,19 @@
<ul class="scroll-ul_2"> <ul class="scroll-ul_2">
<li v-for="(e, i) in ProductionTask" :key="i"> <li v-for="(e, i) in ProductionTask" :key="i">
<div class="scroll-ul_2_div">{{e.device}}</div> <div class="scroll-ul_2_div">{{e.device}}</div>
<div class="scroll-ul_2_div">{{e.workorder_code}}</div> <div class="scroll-ul_2_div">{{e.workorderCode}}</div>
<div class="scroll-ul_2_div">{{e.team}}</div> <div class="scroll-ul_2_div">{{e.team}}</div>
<div class="scroll-ul_2_div">{{e.material_name}}</div> <div class="scroll-ul_2_div">{{e.materialName}}</div>
<div class="scroll-ul_2_div">{{e.customer || '新余钢铁'}}</div> <div class="scroll-ul_2_div">{{e.customer}}</div>
<div class="scroll-ul_2_div">{{e.planproducestart_date}}</div> <div class="scroll-ul_2_div">{{e.planproducestartDate}}</div>
<div class="scroll-ul_2_div">{{e.plan_qty}}</div> <div class="scroll-ul_2_div">{{e.planQty}}</div>
<div class="scroll-ul_2_div">{{e.real_qty}}</div> <div class="scroll-ul_2_div">{{e.realQty}}</div>
<div class="scroll-ul_2_div">{{e.unqualified_qty}}</div> <div class="scroll-ul_2_div">{{e.unqualifiedQty}}</div>
<div class="scroll-ul_2_div">{{e.qualified_rate}}</div> <div class="scroll-ul_2_div">{{e.qualifiedRate}}</div>
<div class="scroll-ul_2_div">{{e.workorder_status}}</div> <div class="scroll-ul_2_div">{{e.workorderStatus}}</div>
<div class="scroll-ul_2_div">{{e.operator || '工人1'}}</div> <div class="scroll-ul_2_div">{{e.operator}}</div>
<div class="scroll-ul_2_div">{{e.createTime || '10-11 09:01'}}</div> <div class="scroll-ul_2_div">{{e.realproducestartDate}}</div>
<div class="scroll-ul_2_div">{{e.createTime|| '10-11 19:11'}}</div> <div class="scroll-ul_2_div">{{e.realproduceendDate}}</div>
</li> </li>
</ul> </ul>
</vue-seamless-scroll> </vue-seamless-scroll>
@@ -137,16 +137,17 @@ export default {
materData: [], materData: [],
deviceData: [], deviceData: [],
PersonnelMonthlyProduction: [], PersonnelMonthlyProduction: [],
PressOrderList: [],
// MonthlyWorkOrder: [], // MonthlyWorkOrder: [],
MonthlyWorkOrder: [ // MonthlyWorkOrder: [
{guada_num: 1200, name: 'XC-0', order_num: 1655, residue_num: 455}, // {guada_num: 1200, name: 'XC-0', order_num: 1655, residue_num: 455},
{guada_num: 1200, name: 'XC-1', order_num: 1655, residue_num: 455}, // {guada_num: 1200, name: 'XC-1', order_num: 1655, residue_num: 455},
{guada_num: 1200, name: 'XC-2', order_num: 1655, residue_num: 455}, // {guada_num: 1200, name: 'XC-2', order_num: 1655, residue_num: 455},
{guada_num: 1200, name: 'XC-3', order_num: 1655, residue_num: 455}, // {guada_num: 1200, name: 'XC-3', order_num: 1655, residue_num: 455},
{guada_num: 1200, name: 'XC-4', order_num: 1655, residue_num: 455}, // {guada_num: 1200, name: 'XC-4', order_num: 1655, residue_num: 455},
{guada_num: 1200, name: 'XC-5', order_num: 1655, residue_num: 455}, // {guada_num: 1200, name: 'XC-5', order_num: 1655, residue_num: 455},
{guada_num: 1200, name: 'XC-6', order_num: 1655, residue_num: 455} // {guada_num: 1200, name: 'XC-6', order_num: 1655, residue_num: 455}
], // ],
// MonthlyWorkOrder: [ // MonthlyWorkOrder: [
// { // {
// name: 'A1', // name: 'A1',
@@ -233,12 +234,13 @@ export default {
// this.showNum1 = '3020' // this.showNum1 = '3020'
// this.showNum2 = '3000' // this.showNum2 = '3000'
// this.showNum3 = '220' // this.showNum3 = '220'
this.showText = res.DayShift this.showText = res.DayShiftInfo[0].team
this.showNum1 = (res.DayShiftList[0].plan_qty + '').split('') this.showNum1 = (res.DayShiftInfo[0].planQty + '').split('')
this.showNum2 = (res.DayShiftList[0].real_qty + '').split('') this.showNum2 = (res.DayShiftInfo[0].realQty + '').split('')
this.showNum3 = (res.DayShiftList[0].unqualified_qty + '').split('') this.showNum3 = (res.DayShiftInfo[0].unqualifiedQty + '').split('')
// this.PersonnelMonthlyProduction = res.PersonnelMonthlyProduction // this.PersonnelMonthlyProduction = res.PersonnelMonthlyProduction
// this.MonthlyWorkOrder = res.MonthlyWorkOrder // this.MonthlyWorkOrder = res.MonthlyWorkOrder
this.PressOrderList = res.PressOrderList
this.ProductionTask = res.ProductionTask this.ProductionTask = res.ProductionTask
this.ShiftProductionList = res.ShiftProductionList this.ShiftProductionList = res.ShiftProductionList
this.setEchart01() this.setEchart01()
@@ -250,10 +252,10 @@ export default {
let data3 = [] let data3 = []
let device = [] let device = []
this.ShiftProductionList.map(e => { this.ShiftProductionList.map(e => {
data1.push(e.qualified_qty) data1.push(e.qualifiedQty)
data2.push(e.unqualified_qty) data2.push(e.unqualifiedQty)
data3.push(e.total_difference) data3.push(e.lastQty)
device.push(e.column_name) device.push(e.columnName)
}) })
let option = { let option = {
grid: { grid: {
@@ -429,10 +431,18 @@ export default {
}, },
setEchart02 () { setEchart02 () {
let max = 1 let max = 1
this.MonthlyWorkOrder.map(el => { // this.MonthlyWorkOrder.map(el => {
if (Number(el.order_num) >= Number(max)) { // if (Number(el.order_num) >= Number(max)) {
max = Number(el.order_num) // max = Number(el.order_num)
// }
// })
this.PressOrderList.map(el => {
if ((Number(el.planQty) + Number(el.realQty)) >= Number(max)) {
max = Number(el.planQty) + Number(el.realQty)
} }
// if ((Number(el.rate) + 1) >= Number(max)) {
// max = Number(el.rate) + 1
// }
}) })
let option = { let option = {
grid: { grid: {
@@ -500,7 +510,8 @@ export default {
fontSize: 14 fontSize: 14
} }
}, },
data: this.MonthlyWorkOrder.map((it) => it.name) // data: this.MonthlyWorkOrder.map((it) => it.name)
data: this.PressOrderList.map((it) => it.orderNumber)
}, },
series: [ series: [
{ {
@@ -531,7 +542,8 @@ export default {
} }
}, },
// data: [8, 10, 20, 20, 10, 10, 20], // data: [8, 10, 20, 20, 10, 10, 20],
data: this.MonthlyWorkOrder.map((it) => it.guada_num) // data: this.MonthlyWorkOrder.map((it) => it.guada_num)
data: this.PressOrderList.map((it) => it.planQty)
}, },
{ {
name: '订单2', name: '订单2',
@@ -560,7 +572,8 @@ export default {
} }
}, },
// data: [10, 20, 10, 10, 20, 20, 20], // data: [10, 20, 10, 10, 20, 20, 20],
data: this.MonthlyWorkOrder.map((it) => it.residue_num) // data: this.MonthlyWorkOrder.map((it) => it.residue_num)
data: this.PressOrderList.map((it) => it.realQty)
} }
// { // {
// type: 'bar', // type: 'bar',