1.临时提交

master
董哲奇 8 months ago
parent 859cc45c8a
commit 5c3ff1f9bd

@ -10,7 +10,7 @@ export const daoduo=function(data){
export const zx=function(data){
return request({
url: '/zyjh/pgfk',
url: '/zyjh/zx',
method: 'post',
data: data
})

@ -870,7 +870,7 @@ export default {
created() {
window.addEventListener("resize", this.getHeight);
this.getHeight();
this.initList();
// this.initList();
this.getCzxx();
},
methods: {

@ -1219,15 +1219,22 @@ export default {
formData.set('isupload', '02')
uploadBom(formData).then(res => {
console.log(res.data)
if (res.data.zt == "01") {
this.$message({ message: '导入成功', type: 'success' })
this.dialogVisible=false;
this.tableData=res.data.data;
}
this.$message({ message: '导入成功', type: 'success' })
this.dialogVisible=false;
this.tableData=res.data.data;
// if (res.data.zt == "01") {
// this.$message({ message: '', type: 'success' })
// this.dialogVisible=false;
// this.tableData=res.data.data;
// }
})
})
}else if (res.data.zt == "03") {
this.$message.error('上传的套料图PDF格式错误请联系开发人员');
//fixme
this.dialogVisible=false;
this.tableData=res.data.data;
//fixme
//this.$message.error('PDF');
}
this.fileList = []
this.tltList=[]

@ -2,9 +2,9 @@ import Konva from "konva";
const baifang=function (option={}) {
const width=option.width,height=option.height,slList=option.dw,image=require('@/assets/gb.png')
const _width=width*0.232,_height=height*0.67
const _width=width*0.25,_height=height*0.67
const container=function (){
const x=width*0.22+30,y=300
const x=width*0.30+30,y=300
const group=new Konva.Group({
x:x,

@ -2,7 +2,7 @@ import Konva from "konva";
export default function (width,height,callback){
console.log(callback)
const x=0,y=0,_width=width*0.08,_height=height*0.67
const x=0,y=0,_width=width*0.16,_height=height*0.67
const container=function (){
const x=width*0.134+30,y=300
@ -30,7 +30,7 @@ export default function (width,height,callback){
const dw=function (index,item=[]){
const alignSize=1
const alignSize=2
const width=((_width-20)/alignSize),height=150
const x=index%alignSize*width+index%alignSize*10+5,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10
const group=new Konva.Group({

@ -53,7 +53,7 @@ export default function (width,height){
y:0,
width:width,
height:height,
text: persons.name,
text: persons.userName,
align: 'center',
verticalAlign:'middle',
fontSize:12

@ -66,7 +66,7 @@ export default function (width,height){
lineHeight:1,
stroke:'black',
strokeWidth:1,
text:'划线施工单',
text:'抛丸施工单',
align:'center',
fontSize:20,
})
@ -78,7 +78,7 @@ export default function (width,height){
width:_width-48,
height:15,
lineHeight:1,
text:'单号:HX_'+data.gdh,
text:'单号:PW_'+data.gdh,
align:'right',
fontSize:12,
})

@ -9,13 +9,11 @@ export default function () {
size:'mini',
showOverflow: true,
scrollY:{enable:true},
data:[
{dcCh:'G175K-6',gdh:'20240812101',dcPl:'002',dcFd:'2302','tzbh':'1231232'}
]
data:[]
}
const gdhFormat=function ({cellValue}){
if (cellValue){
return 'HX'+cellValue
return 'PW'+cellValue
}
return ''
}
@ -23,7 +21,8 @@ export default function () {
{ type: 'checkbox', width: 40 },
{ type: 'seq',title:'序号', width: 60 },
{ field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
{field: '', title: '理料垛位', width: 80},
{field: '', title: '抛丸位置', width: 80},
{field: '', title: '垛位', width: 60},
{field: '', title: '层数', width: 60},
{field: 'dcCh', title: '船号', width: 80},
{field: 'dcPl', title: '批量', width: 80},

@ -1,7 +1,7 @@
<template>
<div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div>
<HxianPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
<HxianPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :pgd="pgd" />
</div>
</template>
@ -12,32 +12,25 @@ import workers from "./comps/person";
import drawDw from './comps/dw'
import drawPgd from './comps/pgd'
import baifang from "./comps/baifang";
import drawSb from './comps/sb'
import {getPgd, getYcldw} from "@/api/zyjh";
import {getBzryList} from "@/api/sjzx/bzzGL";
import HxianPgd from "@/views/zyjhzx/hxianfkui/comps/HxianPgd.vue";
export default {
name:'PWanFKui',
components: {HxianPgd,},
components: {HxianPgd},
data(){
return {
title:'划 线 作 业 反 馈',
title:'抛 丸 作 业 反 馈',
width:0,
height:0,
stage:null,
layer:null,
pgdGroup:null,
drawGd:null,
dw:[
{name:'理料垛位\n垛位1\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
{name:'理料垛位\n垛位2\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
{name:'理料垛位\n垛位2\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
]
dw:[],
pgd:[],
currentWorker:null,
}
},
mounted() {
@ -61,35 +54,34 @@ export default {
},
initDw(){
const that=this
new Promise(resolve => {
return resolve(this.dw)
}).then(res=>{
console.log(this)
getYcldw().then(res=>{
const {container,dw}=drawDw(this.width,this.height,that.initBaiFang)
const group=container()
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const dwGroup=dw(i,item)
group.add(dwGroup)
}
})
},
initWorkers(){
new Promise(resolve => {
return resolve([
{name:'张三1'},{name:'张三2'},
{name:'张三1'},{name:'张三2'},
])
}).then(res=>{
const {container,person}=workers(this.width,this.height,res)
const that=this
getBzryList({resourcesCode:'4KB002'}).then(res=>{
const {container,person}=workers(this.width,this.height)
const group=container()
group.on('click touchstart',function (){
that.currentWorker=person
getPgd({field:'',jhrqField:'',user:that.currentWorker.userCode}).then(res=>[
that.pgd=res.data
])
})
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const worker=person(i,item)
group.add(worker)
}
@ -114,7 +106,7 @@ export default {
this.pgdGroup=pgdContainer()
this.layer.add(this.pgdGroup)
const csdGroup=drawSb(this.width,this.height)
const csdGroup=drawCsd(this.width,this.height)
this.layer.add(csdGroup)
},
}
@ -124,7 +116,7 @@ export default {
<style>
#pwpgd {
width:66%;
width:55%;
height: auto;
position: absolute;
top:45px;

@ -1,17 +1,20 @@
import Konva from "konva";
export default function (width,height){
const x=0,y=0,_width=width*0.5,_height=120
const _width=width*0.5,_height=120
const container=function (){
const x=20,y=45
const group=new Konva.Group({
const layer=new Konva.Layer({
x:x,
y:y,
width:_width,
height:_height
})
layer.clipFunc(function(ctx) {
ctx.rect(0, 0, _width, _height);
});
const rect=new Konva.Rect({
x:0,
@ -22,9 +25,31 @@ export default function (width,height){
strokeWidth:1,
})
group.add(rect)
layer.add(rect)
return group
const group=new Konva.Group({
x:0,
y:0,
width:_width,
height:_height,
draggable: true,
dragBoundFunc:function (pos){
return {
x:pos.x,
y:y
}
},
})
layer.add(group)
return {layer,group}
}
let currentWork=null;
const getCurrentWorker=function (){
return currentWork
}
const person=function (index,persons={}){
@ -38,6 +63,10 @@ export default function (width,height){
height:height
})
group.on('click touchstart',function (){
currentWork=persons
})
const rect=new Konva.Rect({
x:0,
y:0,
@ -53,7 +82,7 @@ export default function (width,height){
y:0,
width:width,
height:height,
text: persons.name,
text: persons.userName,
align: 'center',
verticalAlign:'middle',
fontSize:12
@ -64,6 +93,6 @@ export default function (width,height){
}
return{
container,person
container,person,getCurrentWorker
}
}

@ -66,7 +66,7 @@ export default function (width,height){
lineHeight:1,
stroke:'black',
strokeWidth:1,
text:'划线施工单',
text:'抛丸施工单',
align:'center',
fontSize:20,
})
@ -78,7 +78,7 @@ export default function (width,height){
width:_width-48,
height:15,
lineHeight:1,
text:'单号:HX_'+data.gdh,
text:'单号:PW_'+data.gdh,
align:'right',
fontSize:12,
})

@ -9,13 +9,11 @@ export default function () {
size:'mini',
showOverflow: true,
scrollY:{enable:true},
data:[
{dcCh:'G175K-6',gdh:'20240812101',dcPl:'001',dcFd:'2302','tzbh':'1231232'}
]
data:[]
}
const gdhFormat=function ({cellValue}){
if (cellValue){
return 'HX'+cellValue
return 'PW'+cellValue
}
return ''
}
@ -23,7 +21,8 @@ export default function () {
{ type: 'checkbox', width: 40 },
{ type: 'seq',title:'序号', width: 60 },
{ field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
{field: '', title: '理料垛位', width: 80},
{field: '', title: '抛丸位置', width: 80},
{field: '', title: '垛位', width: 60},
{field: '', title: '层数', width: 60},
{field: 'dcCh', title: '船号', width: 80},
{field: 'dcPl', title: '批量', width: 80},

@ -1,7 +1,7 @@
<template>
<div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div>
<HxianPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
<HxianPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" />
</div>
</template>
@ -11,6 +11,8 @@ import drawTitle from './comps/title'
import workers from "./comps/person";
import drawDw from './comps/dw'
import drawPgd from './comps/pgd'
import {getBzryList} from "@/api/sjzx/bzzGL";
import {getYcldw} from "@/api/zyjh";
import HxianPgd from "@/views/zyjhzx/hxianpgong/comps/HxianPgd.vue";
export default {
@ -25,6 +27,7 @@ export default {
layer:null,
pgdGroup:null,
drawGd:null,
getCurrentWorker:null,
}
},
mounted() {
@ -32,41 +35,34 @@ export default {
},
methods:{
initPgd(pgd={}){
console.log(pgd)
const group=this.drawGd(pgd)
this.pgdGroup.add(group)
},
initDw(){
new Promise(resolve => {
return resolve([
{name:'理料垛位1\n预览信息'},{name:'理料垛位2\n预览信息'},
{name:'理料垛位3\n预览信息'},{name:'理料垛位4\n预览信息'},
])
}).then(res=>{
const {container,dw}=drawDw(this.width,this.height,res)
getYcldw().then(res=>{
const {container,dw}=drawDw(this.width,this.height)
const group=container()
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const dwGroup=dw(i,item)
group.add(dwGroup)
}
})
},
getWorker(){
return this.getCurrentWorker()
},
initWorkers(){
new Promise(resolve => {
return resolve([
{name:'张三1'},{name:'张三2'},
{name:'张三1'},{name:'张三2'},
])
}).then(res=>{
const {container,person}=workers(this.width,this.height,res)
const group=container()
this.layer.add(group)
getBzryList({resourcesCode:'4KB002'}).then(res=>{
const {container,person,getCurrentWorker}=workers(this.width,this.height)
this.getCurrentWorker=getCurrentWorker
const {layer,group}=container()
this.stage.add(layer)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const worker=person(i,item)
group.add(worker)
}

@ -53,7 +53,7 @@ export default function (width,height){
y:0,
width:width,
height:height,
text: persons.name,
text: persons.userName,
align: 'center',
verticalAlign:'middle',
fontSize:12

@ -66,7 +66,7 @@ export default function (width,height){
lineHeight:1,
stroke:'black',
strokeWidth:1,
text:'理料施工单',
text:'抛丸施工单',
align:'center',
fontSize:20,
})
@ -78,7 +78,7 @@ export default function (width,height){
width:_width-48,
height:15,
lineHeight:1,
text:'单号:LL_'+data.gdh,
text:'单号:PW_'+data.gdh,
align:'right',
fontSize:12,
})

@ -9,13 +9,11 @@ export default function () {
size:'mini',
showOverflow: true,
scrollY:{enable:true},
data:[
{dcCh:'G175K-6',gdh:'20240812101',dcPl:'002',dcFd:'2302','tzbh':'1231232'}
]
data:[]
}
const gdhFormat=function ({cellValue}){
if (cellValue){
return 'LL'+cellValue
return 'PW'+cellValue
}
return ''
}
@ -23,12 +21,11 @@ export default function () {
{ type: 'checkbox', width: 40 },
{ type: 'seq',title:'序号', width: 60 },
{ field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
{field: '', title: '抛丸位置', width: 80},
{field: '', title: '垛位', width: 60},
{field: '', title: '层数', width: 60},
{field: 'dcCh', title: '船号', width: 80},
{field: 'dcPl', title: '批量', width: 80},
{field: 'kw', title: '跨位', width: 80},
{field: 'zl', title: '组立', width: 80},
{field: '', title: '材质', width: 80},
{field: '', title: '规格', width: 100},
{field: '', title: '炉批号', width: 100},

@ -1,7 +1,7 @@
<template>
<div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div>
<LliaoPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
<LliaoPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :pgd="pgd" />
</div>
</template>
@ -13,6 +13,8 @@ import drawDw from './comps/dw'
import drawPgd from './comps/pgd'
import baifang from "./comps/baifang";
import drawCsd from './comps/csd'
import {getPgd, getYcldw} from "@/api/zyjh";
import {getBzryList} from "@/api/sjzx/bzzGL";
import LliaoPgd from "@/views/zyjhzx/lliaofkui/comps/LliaoPgd.vue";
export default {
@ -20,24 +22,16 @@ export default {
components: {LliaoPgd},
data(){
return {
title:'理料 作 业 反 馈',
title:'抛 丸 作 业 反 馈',
width:0,
height:0,
stage:null,
layer:null,
pgdGroup:null,
drawGd:null,
dw:[
{name:'理料垛位\n垛位1\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
{name:'理料垛位\n垛位2\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
{name:'理料垛位\n垛位2\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
]
dw:[],
pgd:[],
currentWorker:null,
}
},
mounted() {
@ -61,35 +55,34 @@ export default {
},
initDw(){
const that=this
new Promise(resolve => {
return resolve(this.dw)
}).then(res=>{
console.log(this)
getYcldw().then(res=>{
const {container,dw}=drawDw(this.width,this.height,that.initBaiFang)
const group=container()
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const dwGroup=dw(i,item)
group.add(dwGroup)
}
})
},
initWorkers(){
new Promise(resolve => {
return resolve([
{name:'张三1'},{name:'张三2'},
{name:'张三1'},{name:'张三2'},
])
}).then(res=>{
const {container,person}=workers(this.width,this.height,res)
const that=this
getBzryList({resourcesCode:'4KB002'}).then(res=>{
const {container,person}=workers(this.width,this.height)
const group=container()
group.on('click touchstart',function (){
that.currentWorker=person
getPgd({field:'',jhrqField:'',user:that.currentWorker.userCode}).then(res=>[
that.pgd=res.data
])
})
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const worker=person(i,item)
group.add(worker)
}

@ -1,17 +1,20 @@
import Konva from "konva";
export default function (width,height){
const x=0,y=0,_width=width*0.5,_height=120
const _width=width*0.5,_height=120
const container=function (){
const x=20,y=45
const group=new Konva.Group({
const layer=new Konva.Layer({
x:x,
y:y,
width:_width,
height:_height
})
layer.clipFunc(function(ctx) {
ctx.rect(0, 0, _width, _height);
});
const rect=new Konva.Rect({
x:0,
@ -22,9 +25,31 @@ export default function (width,height){
strokeWidth:1,
})
group.add(rect)
layer.add(rect)
return group
const group=new Konva.Group({
x:0,
y:0,
width:_width,
height:_height,
draggable: true,
dragBoundFunc:function (pos){
return {
x:pos.x,
y:y
}
},
})
layer.add(group)
return {layer,group}
}
let currentWork=null;
const getCurrentWorker=function (){
return currentWork
}
const person=function (index,persons={}){
@ -38,6 +63,10 @@ export default function (width,height){
height:height
})
group.on('click touchstart',function (){
currentWork=persons
})
const rect=new Konva.Rect({
x:0,
y:0,
@ -53,7 +82,7 @@ export default function (width,height){
y:0,
width:width,
height:height,
text: persons.name,
text: persons.userName,
align: 'center',
verticalAlign:'middle',
fontSize:12
@ -64,6 +93,6 @@ export default function (width,height){
}
return{
container,person
container,person,getCurrentWorker
}
}

@ -66,7 +66,7 @@ export default function (width,height){
lineHeight:1,
stroke:'black',
strokeWidth:1,
text:'理料施工单',
text:'抛丸施工单',
align:'center',
fontSize:20,
})
@ -78,7 +78,7 @@ export default function (width,height){
width:_width-48,
height:15,
lineHeight:1,
text:'单号:LL_'+data.gdh,
text:'单号:PW_'+data.gdh,
align:'right',
fontSize:12,
})

@ -9,13 +9,11 @@ export default function () {
size:'mini',
showOverflow: true,
scrollY:{enable:true},
data:[
{dcCh:'G175K-6',gdh:'20240812101',dcPl:'001',dcFd:'2302','tzbh':'1231232'}
]
data:[]
}
const gdhFormat=function ({cellValue}){
if (cellValue){
return 'LL'+cellValue
return 'PW'+cellValue
}
return ''
}
@ -23,10 +21,11 @@ export default function () {
{ type: 'checkbox', width: 40 },
{ type: 'seq',title:'序号', width: 60 },
{ field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
{field: '', title: '抛丸位置', width: 80},
{field: '', title: '垛位', width: 60},
{field: '', title: '层数', width: 60},
{field: 'dcCh', title: '船号', width: 80},
{field: 'dcPl', title: '批量', width: 80},
{field: 'kw', title: '跨位', width: 80},
{field: 'zl', title: '组立', width: 80},
{field: '', title: '材质', width: 80},
{field: '', title: '规格', width: 100},
{field: '', title: '炉批号', width: 100},

@ -1,7 +1,7 @@
<template>
<div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div>
<LliaoPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
<LliaoPgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" />
</div>
</template>
@ -11,6 +11,8 @@ import drawTitle from './comps/title'
import workers from "./comps/person";
import drawDw from './comps/dw'
import drawPgd from './comps/pgd'
import {getBzryList} from "@/api/sjzx/bzzGL";
import {getYcldw} from "@/api/zyjh";
import LliaoPgd from "@/views/zyjhzx/lliaopgong/comps/LliaoPgd.vue";
export default {
@ -18,13 +20,14 @@ export default {
components: {LliaoPgd},
data(){
return {
title:'理 料 作 业 派 工',
title:'划 线 作 业 派 工',
width:0,
height:0,
stage:null,
layer:null,
pgdGroup:null,
drawGd:null,
getCurrentWorker:null,
}
},
mounted() {
@ -32,41 +35,34 @@ export default {
},
methods:{
initPgd(pgd={}){
console.log(pgd)
const group=this.drawGd(pgd)
this.pgdGroup.add(group)
},
initDw(){
new Promise(resolve => {
return resolve([
{name:'垛位1\n预览信息'},{name:'垛位2\n预览信息'},
{name:'垛位3\n预览信息'},{name:'垛位4\n预览信息'},
])
}).then(res=>{
const {container,dw}=drawDw(this.width,this.height,res)
getYcldw().then(res=>{
const {container,dw}=drawDw(this.width,this.height)
const group=container()
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const dwGroup=dw(i,item)
group.add(dwGroup)
}
})
},
getWorker(){
return this.getCurrentWorker()
},
initWorkers(){
new Promise(resolve => {
return resolve([
{name:'张三1'},{name:'张三2'},
{name:'张三1'},{name:'张三2'},
])
}).then(res=>{
const {container,person}=workers(this.width,this.height,res)
const group=container()
this.layer.add(group)
getBzryList({resourcesCode:'4KB002'}).then(res=>{
const {container,person,getCurrentWorker}=workers(this.width,this.height)
this.getCurrentWorker=getCurrentWorker
const {layer,group}=container()
this.stage.add(layer)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const worker=person(i,item)
group.add(worker)
}

@ -74,17 +74,17 @@ export default {
getBzryList({resourcesCode:'4KB002'}).then(res=>{
const {container,person}=workers(this.width,this.height)
const group=container()
group.on('click touchstart',function (){
that.currentWorker=person
getPgd({field:'',jhrqField:'',user:that.currentWorker.userName}).then(res=>[
that.pgd=res.data
])
})
this.layer.add(group)
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const worker=person(i,item)
worker.on('click touchstart',function (){
that.currentWorker=item
getPgd({field:'pwry',jhrqField:'pwjhrq',user:that.currentWorker.userCode}).then(res=>[
that.pgd=res.data
])
})
group.add(worker)
}
})

@ -5,7 +5,7 @@
<script>
import { VXETable } from 'vxe-table'
import paoWanPgdConfig from './pgdTable'
import {zx} from "@/api/zyjh";
import {getPgd, zx} from "@/api/zyjh";
export default {
name:'PwanPgd',
@ -26,8 +26,14 @@ export default {
const {options,columns}=paoWanPgdConfig()
this.gridOptions=options
this.gridOptions.columns=columns
this.initData()
},
methods:{
initData(){
getPgd({jhrqField:'sljhrq',zt:'21'}).then(res=>{
this.gridOptions.data=res.data
})
},
checkboxAll({checked}){
const worker=this.$props.worker()
if (!worker){
@ -54,12 +60,14 @@ export default {
for (const item of list) {
const data={
id:item.id,
pwsgr:worker.userName,//
pwsgr:worker.userCode,//
}
tmpArr.push(data)
}
const data={
type:this.type,
field:'pwpgrq',
zxZtName:'PWPG',
list:tmpArr
}
VXETable.modal.confirm('您确定派工吗?').then(res=>{

@ -30,10 +30,10 @@ export default function () {
{field: '', title: '规格', width: 100},
{field: '', title: '炉批号', width: 100},
{field: 'tzbh', title: '套料图号', width: 100},
{field: '', title: '接收人', width: 80},
{field: '', title: '接收时间', width: 100},
{field: '', title: '反馈人', width: 80},
{field: '', title: '反馈时间', width: 100},
{field: 'pwry', title: '接收人', width: 80},
{field: 'pwjssj', title: '接收时间', width: 100},
{field: 'pwfkry', title: '反馈人', width: 80},
{field: 'pwfkrq', title: '反馈时间', width: 100},
{field: '', title: '状态', width: 60},
]

@ -2,9 +2,9 @@ import Konva from "konva";
const baifang=function (option={}) {
const width=option.width,height=option.height,slList=option.dw,image=require('@/assets/gb.png')
const _width=width*0.232,_height=height*0.67
const _width=width*0.25,_height=height*0.67
const container=function (){
const x=width*0.22+30,y=300
const x=width*0.30+30,y=300
const group=new Konva.Group({
x:x,

@ -2,7 +2,7 @@ import Konva from "konva";
export default function (width,height,callback){
console.log(callback)
const x=0,y=0,_width=width*0.08,_height=height*0.67
const x=0,y=0,_width=width*0.16,_height=height*0.67
const container=function (){
const x=width*0.134+30,y=300
@ -30,7 +30,7 @@ export default function (width,height,callback){
const dw=function (index,item=[]){
const alignSize=1
const alignSize=2
const width=((_width-20)/alignSize),height=150
const x=index%alignSize*width+index%alignSize*10+5,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10
const group=new Konva.Group({

@ -53,7 +53,7 @@ export default function (width,height){
y:0,
width:width,
height:height,
text: persons.name,
text: persons.userName,
align: 'center',
verticalAlign:'middle',
fontSize:12

@ -66,7 +66,7 @@ export default function (width,height){
lineHeight:1,
stroke:'black',
strokeWidth:1,
text:'切割施工单',
text:'抛丸施工单',
align:'center',
fontSize:20,
})
@ -78,7 +78,7 @@ export default function (width,height){
width:_width-48,
height:15,
lineHeight:1,
text:'单号:QG_'+data.gdh,
text:'单号:PW_'+data.gdh,
align:'right',
fontSize:12,
})

@ -9,13 +9,11 @@ export default function () {
size:'mini',
showOverflow: true,
scrollY:{enable:true},
data:[
{dcCh:'G175K-6',gdh:'20240812101',dcPl:'002',dcFd:'2302','tzbh':'1231232'}
]
data:[]
}
const gdhFormat=function ({cellValue}){
if (cellValue){
return 'QG'+cellValue
return 'PW'+cellValue
}
return ''
}
@ -23,7 +21,8 @@ export default function () {
{ type: 'checkbox', width: 40 },
{ type: 'seq',title:'序号', width: 60 },
{ field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
{field: '', title: '理料垛位', width: 80},
{field: '', title: '抛丸位置', width: 80},
{field: '', title: '垛位', width: 60},
{field: '', title: '层数', width: 60},
{field: 'dcCh', title: '船号', width: 80},
{field: 'dcPl', title: '批量', width: 80},

@ -27,7 +27,7 @@ export default function (width,height){
width: _width,
height:_height,
fill:'black',
text:'传送带',
text:'设备',
align:'center',
verticalAlign:'middle',
})

@ -1,24 +1,24 @@
<template>
<div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div>
<QgePgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
<QgePgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :pgd="pgd" />
</div>
</template>
<script>
import PWanPgd from "./comps/QgePgd.vue";
import container from "./comps/container";
import drawTitle from './comps/title'
import workers from "./comps/person";
import drawDw from './comps/dw'
import drawPgd from './comps/pgd'
import baifang from "./comps/baifang";
import drawCsd from './comps/sb'
import {getPgd, getYcldw} from "@/api/zyjh";
import {getBzryList} from "@/api/sjzx/bzzGL";
import QgePgd from "@/views/zyjhzx/qgefkui/comps/QgePgd.vue";
export default {
name:'PWanFKui',
components: {QgePgd, PWanPgd},
components: {QgePgd},
data(){
return {
title:'切 割 作 业 反 馈',
@ -28,17 +28,9 @@ export default {
layer:null,
pgdGroup:null,
drawGd:null,
dw:[
{name:'理料垛位\n垛位1\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
{name:'理料垛位\n垛位2\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
{name:'理料垛位\n垛位2\n摆放预览',
list:['板材1','板材2','板材3','板材4','板材5','板材6','板材7','板材8','板材9','板材10','板材11','板材12','板材13','板材14',]
},
]
dw:[],
pgd:[],
currentWorker:null,
}
},
mounted() {
@ -62,35 +54,34 @@ export default {
},
initDw(){
const that=this
new Promise(resolve => {
return resolve(this.dw)
}).then(res=>{
console.log(this)
getYcldw().then(res=>{
const {container,dw}=drawDw(this.width,this.height,that.initBaiFang)
const group=container()
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const dwGroup=dw(i,item)
group.add(dwGroup)
}
})
},
initWorkers(){
new Promise(resolve => {
return resolve([
{name:'张三1'},{name:'张三2'},
{name:'张三1'},{name:'张三2'},
])
}).then(res=>{
const {container,person}=workers(this.width,this.height,res)
const that=this
getBzryList({resourcesCode:'4KB002'}).then(res=>{
const {container,person}=workers(this.width,this.height)
const group=container()
group.on('click touchstart',function (){
that.currentWorker=person
getPgd({field:'',jhrqField:'',user:that.currentWorker.userCode}).then(res=>[
that.pgd=res.data
])
})
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const worker=person(i,item)
group.add(worker)
}
@ -125,7 +116,7 @@ export default {
<style>
#pwpgd {
width:66%;
width:55%;
height: auto;
position: absolute;
top:45px;

@ -1,17 +1,20 @@
import Konva from "konva";
export default function (width,height){
const x=0,y=0,_width=width*0.5,_height=120
const _width=width*0.5,_height=120
const container=function (){
const x=20,y=45
const group=new Konva.Group({
const layer=new Konva.Layer({
x:x,
y:y,
width:_width,
height:_height
})
layer.clipFunc(function(ctx) {
ctx.rect(0, 0, _width, _height);
});
const rect=new Konva.Rect({
x:0,
@ -22,9 +25,31 @@ export default function (width,height){
strokeWidth:1,
})
group.add(rect)
layer.add(rect)
return group
const group=new Konva.Group({
x:0,
y:0,
width:_width,
height:_height,
draggable: true,
dragBoundFunc:function (pos){
return {
x:pos.x,
y:y
}
},
})
layer.add(group)
return {layer,group}
}
let currentWork=null;
const getCurrentWorker=function (){
return currentWork
}
const person=function (index,persons={}){
@ -38,6 +63,10 @@ export default function (width,height){
height:height
})
group.on('click touchstart',function (){
currentWork=persons
})
const rect=new Konva.Rect({
x:0,
y:0,
@ -53,7 +82,7 @@ export default function (width,height){
y:0,
width:width,
height:height,
text: persons.name,
text: persons.userName,
align: 'center',
verticalAlign:'middle',
fontSize:12
@ -64,6 +93,6 @@ export default function (width,height){
}
return{
container,person
container,person,getCurrentWorker
}
}

@ -66,7 +66,7 @@ export default function (width,height){
lineHeight:1,
stroke:'black',
strokeWidth:1,
text:'切割施工单',
text:'抛丸施工单',
align:'center',
fontSize:20,
})
@ -78,7 +78,7 @@ export default function (width,height){
width:_width-48,
height:15,
lineHeight:1,
text:'单号:QG_'+data.gdh,
text:'单号:PW_'+data.gdh,
align:'right',
fontSize:12,
})

@ -15,7 +15,7 @@ export default function () {
}
const gdhFormat=function ({cellValue}){
if (cellValue){
return 'QG'+cellValue
return 'PW'+cellValue
}
return ''
}
@ -23,7 +23,8 @@ export default function () {
{ type: 'checkbox', width: 40 },
{ type: 'seq',title:'序号', width: 60 },
{ field: 'gdh',title:'派工单号', width: 120,formatter: gdhFormat},
{field: '', title: '理料垛位', width: 80},
{field: '', title: '抛丸位置', width: 80},
{field: '', title: '垛位', width: 60},
{field: '', title: '层数', width: 60},
{field: 'dcCh', title: '船号', width: 80},
{field: 'dcPl', title: '批量', width: 80},

@ -1,7 +1,7 @@
<template>
<div class="container">
<div id="pwpg" class="pwpg" ref="pwpg"></div>
<QgePgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" />
<QgePgd id="pwpgd" ref="pwpgd" @initPgd="initPgd" :worker="getWorker" />
</div>
</template>
@ -11,6 +11,8 @@ import drawTitle from './comps/title'
import workers from "./comps/person";
import drawDw from './comps/dw'
import drawPgd from './comps/pgd'
import {getBzryList} from "@/api/sjzx/bzzGL";
import {getYcldw} from "@/api/zyjh";
import QgePgd from "@/views/zyjhzx/qgepgong/comps/QgePgd.vue";
export default {
@ -25,6 +27,7 @@ export default {
layer:null,
pgdGroup:null,
drawGd:null,
getCurrentWorker:null,
}
},
mounted() {
@ -32,41 +35,34 @@ export default {
},
methods:{
initPgd(pgd={}){
console.log(pgd)
const group=this.drawGd(pgd)
this.pgdGroup.add(group)
},
initDw(){
new Promise(resolve => {
return resolve([
{name:'理料垛位1\n预览信息'},{name:'理料垛位2\n预览信息'},
{name:'理料垛位3\n预览信息'},{name:'理料垛位4\n预览信息'},
])
}).then(res=>{
const {container,dw}=drawDw(this.width,this.height,res)
getYcldw().then(res=>{
const {container,dw}=drawDw(this.width,this.height)
const group=container()
this.layer.add(group)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const dwGroup=dw(i,item)
group.add(dwGroup)
}
})
},
getWorker(){
return this.getCurrentWorker()
},
initWorkers(){
new Promise(resolve => {
return resolve([
{name:'张三1'},{name:'张三2'},
{name:'张三1'},{name:'张三2'},
])
}).then(res=>{
const {container,person}=workers(this.width,this.height,res)
const group=container()
this.layer.add(group)
getBzryList({resourcesCode:'4KB002'}).then(res=>{
const {container,person,getCurrentWorker}=workers(this.width,this.height)
this.getCurrentWorker=getCurrentWorker
const {layer,group}=container()
this.stage.add(layer)
for (let i=0;i<res.length;i++){
const item=res[i]
for (let i=0;i<res.data.length;i++){
const item=res.data[i]
const worker=person(i,item)
group.add(worker)
}

@ -146,7 +146,7 @@ export default {
wpgg:item.wpgg,
sljhrq:item.sljhrq,
qgjhrq:item.qgjhrq,
bfr:that.getCurrentWorker()?.userName
bfr:that.getCurrentWorker()?.userCode
}
shangLiao(data).then(res=>{

Loading…
Cancel
Save