xins
/
HwMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.5.9

Browse Source 
看板修改
master
xs 3 months ago
parent 7fd4908f10
commit 28af5e1d08
7 changed files with 76 additions and 52 deletions
Show Stats Download Patch File Download Diff File

19
hw-ui/src/views/board/fifthFloor/index.vue
Unescape Escape View File

@ -866,14 +866,14 @@ export default {
// });
// }, 60 * 1000)
getLoginStationInfo().then(e => {
// if(!e.data){
// this.$modal.msgError("登录工位有误");
// return;
// }
// this.loginStationInfo = e.data;
if(!e.data){
this.$modal.msgError("登录工位有误");
return;
}
this.loginStationInfo = e.data;
//TODO
this.loginStationInfo = {stationId: "1", stationCode: "ZP_02"}
// this.loginStationInfo = {stationId: "1", stationCode: "ZP_02"}
this.getProductPlans();
this.getChartData();
});
@ -1963,9 +1963,14 @@ export default {
},
setSerialData() {
if (this.rawBackVisible) {
this.rawBackForm.materialBarcode = this.serialData;
} else {
} else if(this.printModel){
this.$set(this.PrintData, "productBarcode", this.serialData);
console.log("printdata:"+this.PrintData.productBarcode)
}
else {
this.input1 = this.serialData;
}
// console.log(this.serialData)

29
hw-ui/src/views/board/production/fifthFloor.vue
Unescape Escape View File

@ -9,16 +9,19 @@
</div>
<div class="table1">
<div style="background-color: #1077bc19;height: 50px;line-height: 50px;">
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 12%">
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 10%">
编号
</div>
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 36%">
生产工单
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 20%">
生产任务
</div>
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 22%">
成品名称
</div>
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 14%">
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 12%">
计划数量
</div>
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 14%">
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 12%">
实际数量
</div>
<div class="scrollTableItem" style="padding:0;color:#65c2f3;font-weight: bold;width: 12%">
@ -40,22 +43,27 @@
>
<div :style='"background-color:" + ((index % 2 === 0)? "#1077bc19":"#1077bc05") '>
<div
class="scrollTableItem" style="width: 12%"
class="scrollTableItem" style="width: 10%"
>
{{ item.no }}
</div>
<div
class="scrollTableItem" style="width: 36%"
class="scrollTableItem" style="width: 20%"
>
{{ item.orderCode }}
</div>
<div
class="scrollTableItem" style="width: 14%"
class="scrollTableItem" style="width: 22%"
>
{{ item.materialName }}
</div>
<div
class="scrollTableItem" style="width: 12%"
>
{{ item.planAmount }}
</div>
<div
class="scrollTableItem" style="width: 14%"
class="scrollTableItem" style="width: 12%"
>
{{ item.completeAmount }}
</div>
@ -196,7 +204,7 @@ export default {
rate: [0, 0, 0]
},
title: [
'工单生产进度',
'生产任务信息',
'工位生产效率TOP',
' ',
'计划数量:',
@ -265,6 +273,7 @@ export default {
orderCode: v.orderCode,
planAmount: v.planAmount,
completeAmount: v.completeAmount,
materialName:v.materialName,
quantityAmount: parseFloat(v.planAmount) - parseFloat(v.completeAmount),
finishingRate: parseFloat(v.completeAmount) === 0 ? 0 : (parseFloat(v.completeAmount) / parseFloat(v.completeAmount)) * 100
}

4
hw-ui/src/views/board/production/firstFloor.vue
Unescape Escape View File

@ -174,8 +174,8 @@ export default {
},
time: parseTime(new Date(), '{y}-{m}-{d} 星期{a} {h}:{i}:{s}'),
title: [
'工序生产进度',
'提升机状态',
'生产任务信息',
'提升机信息',
' ',
' ',
' ',

10
hw-ui/src/views/board/production/fourthFloor.vue
Unescape Escape View File

@ -82,9 +82,9 @@ export default {
time: parseTime(new Date(), '{y}-{m}-{d} 星期{a} {h}:{i}:{s}'),
title: [
'工序生产进度',
'工序名称对比',
'七日产量对比',
' ',
'工序对比信息',
'',
'能源占比信息',
' ',
' ',
' ',
@ -105,8 +105,8 @@ export default {
left: 5.5
},
{
top: 63,
left: 30.5
top: 11.8,
left: 37.5
},
{
top: 63,

28
hw-ui/src/views/board/production/secondFloor.vue
Unescape Escape View File

@ -9,13 +9,13 @@
</div>
<div class="table1">
<div style="background-color: #094170;font-size: 0.7vw">
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 10%">
编号
</div>
<!-- <div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 10%">-->
<!-- 编号-->
<!-- </div>-->
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 23%">
生产工单
生产任务
</div>
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 23%">
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 28%">
成品名称
</div>
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 12%">
@ -27,7 +27,7 @@
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 10%">
差异值
</div>
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 10%">
<div class="scrollTableItem" style="color:#fff;font-weight: bold;width: 15%">
完成率
</div>
</div>
@ -42,18 +42,18 @@
:key="index"
>
<div :style='"background-color:" + ((index % 2 === 0)? "#053460":"#032d57") '>
<div
class="scrollTableItem" style="width: 10%"
>
{{ item.no }}
</div>
<!-- <div-->
<!-- class="scrollTableItem" style="width: 10%"-->
<!-- >-->
<!-- {{ item.no }}-->
<!-- </div>-->
<div
class="scrollTableItem" style="width:23%;font-size: 0.5vw"
>
{{ item.orderCode }}
</div>
<div
class="scrollTableItem" style="width:23%;font-size: 0.6vw"
class="scrollTableItem" style="width:28%;font-size: 0.6vw"
>
{{ item.materialName }}
</div>
@ -73,7 +73,7 @@
{{ item.quantityAmount }}
</div>
<div
class="scrollTableItem" style="width: 10%"
class="scrollTableItem" style="width: 15%"
>
{{ item.finishingRate }}%
</div>
@ -138,7 +138,7 @@ export default {
diff: [0, 0, 0, 0]
},
title: [
'工单计划',
'生产任务',
'小时产量',
'七日产量对比',
'粉尘数据走势',

10
hw-ui/src/views/board/warehouse/firstFloor.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div class="headTitle">京源智能仓储监控平台</div>
<div class="headTitle">京源智能能源监控平台</div>
<div v-for="(i,k) in title"
:style="'top:'+(titlePosition[k]&&titlePosition[k].top||0)+'%;left:'+(titlePosition[k]&&titlePosition[k].left||0)+'%'"
class="title"
@ -142,8 +142,8 @@ export default {
num3: [0, 0, 0, 0]
},
title: [
' ',
' ',
'能源数据信息',
'能源对比信息',
' ',
' ',
' ',
@ -155,8 +155,8 @@ export default {
left: 7.5
},
{
top: 11.5,
left: 40.3
top: 55.8,
left: 7.5
},
{
top: 11.5,

28
hw-ui/src/views/board/warehouse/fourthFloor.vue
Unescape Escape View File

@ -91,7 +91,7 @@
style="height: calc(100% - 30px);overflow: hidden;"
>
<div
v-for="(item, index) in scrollTableData"
v-for="(item, index) in scrollTableData1"
:key="index"
>
<div :style='"background-color:" + ((index % 2 === 0)? "#1077bc19":"#1077bc05") '>
@ -169,12 +169,14 @@ export default {
num3: [0, 0, 0, 0]
},
title: [
'原料库入库数量:',
'原料库出库数量:',
'半成品入库数量:',
' ',
' ',
'库存占比'
'板材入库数量:',
'板材出库数量:',
'成品入库数量:',
'',
'库存信息 ',
'出入库信息',
'板材库存',
'辅料库存',
],
titlePosition: [
{
@ -194,12 +196,20 @@ export default {
left: 60.3
},
{
top: 11.5,
left: 79.1
top: 19.4,
left: 53.1
},
{
top: 19.4,
left: 5.5
},
{
top: 59.9,
left: 5.5
},
{
top: 59.9,
left: 53.1
}
],
scrollTableOption: {

Write Preview
Loading…
Cancel
Save