From 048a451e6e9b669704d6436173e22d5e673da423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 17 Sep 2024 20:16:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96=202.?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6=E6=B4=BE=E5=B7=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/jhzxgl/pgd.js | 1 + src/views/zyjhzx/components/SelectComp.vue | 9 +- src/views/zyjhzx/components/SliaoSearch.vue | 80 +++++ .../{sliao/comps => components}/search.js | 0 src/views/zyjhzx/hxianfkui/comps/pgd.js | 4 +- src/views/zyjhzx/hxianpgong/comps/pgd.js | 4 +- src/views/zyjhzx/ljian/comps/HxianPgd.vue | 48 --- src/views/zyjhzx/ljian/comps/LjianPgd.vue | 114 ++++++ src/views/zyjhzx/ljian/comps/baifang.js | 276 --------------- src/views/zyjhzx/ljian/comps/dw.js | 156 -------- src/views/zyjhzx/ljian/comps/person.js | 4 +- src/views/zyjhzx/ljian/comps/pgd.js | 202 ++++++++++- src/views/zyjhzx/ljian/comps/pgdTable.js | 333 +++++++++++++++--- src/views/zyjhzx/ljian/comps/sb.js | 41 --- src/views/zyjhzx/ljian/index.vue | 166 ++++----- src/views/zyjhzx/lliaofkui/comps/pgd.js | 4 +- src/views/zyjhzx/lliaopgong/comps/pgd.js | 4 +- src/views/zyjhzx/pwanfkui/comps/pgd.js | 4 +- src/views/zyjhzx/pwanpgong/comps/pgd.js | 4 +- src/views/zyjhzx/qgefkui/comps/dw.js | 2 +- src/views/zyjhzx/qgefkui/comps/pgd.js | 4 +- src/views/zyjhzx/qgepgong/comps/pgd.js | 4 +- src/views/zyjhzx/sliao/comps/SelectDemo.vue | 2 +- src/views/zyjhzx/sliao/comps/SliaoSearch.vue | 39 -- src/views/zyjhzx/sliao/index.vue | 5 +- 25 files changed, 765 insertions(+), 745 deletions(-) create mode 100644 src/views/zyjhzx/components/SliaoSearch.vue rename src/views/zyjhzx/{sliao/comps => components}/search.js (100%) delete mode 100644 src/views/zyjhzx/ljian/comps/HxianPgd.vue create mode 100644 src/views/zyjhzx/ljian/comps/LjianPgd.vue delete mode 100644 src/views/zyjhzx/ljian/comps/baifang.js delete mode 100644 src/views/zyjhzx/ljian/comps/dw.js delete mode 100644 src/views/zyjhzx/ljian/comps/sb.js delete mode 100644 src/views/zyjhzx/sliao/comps/SliaoSearch.vue diff --git a/src/api/jhzxgl/pgd.js b/src/api/jhzxgl/pgd.js index eabd5f1..7c10493 100644 --- a/src/api/jhzxgl/pgd.js +++ b/src/api/jhzxgl/pgd.js @@ -69,6 +69,7 @@ export function selectQmByQgAndJh(data) {return request({url: '/pgdQmjh/selectQm export function insertQmList(data) {return request({url: '/pgdQmjh/insertQmList', method: 'post', data})} export function removeQmList(data) {return request({url: '/pgdQmjh/removeQmList', method: 'post', data})} +export function ljpg(data) {return request({url: '/pgdQmjh/pg', method: 'post', data})} export function getPkPgd(data) {return request({url: '/pgdPkjh/getPkPgd', method: 'post', data})} diff --git a/src/views/zyjhzx/components/SelectComp.vue b/src/views/zyjhzx/components/SelectComp.vue index 7383027..c093449 100644 --- a/src/views/zyjhzx/components/SelectComp.vue +++ b/src/views/zyjhzx/components/SelectComp.vue @@ -31,6 +31,7 @@ export default { hxfk:{path:'/hxpg'}, qgpg:{path:'/qgfk'}, qgfk:{path:'/qgpg'}, + ljian:{path:''} }, } }, @@ -38,7 +39,7 @@ export default { this.data.zyType=this.$route.query.zyType||'0' const path=this.$route.path.replace('/','') this.nextPath=this.nextPathName[path].path - if (path==='llfk'){ + if (path==='llfk'||path==='ljian'){ this.zyRadioShow=false } }, @@ -46,12 +47,6 @@ export default { changePage(){ this.$emit('clear') this.$router.push(`${this.nextPath}?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}`) - // if (this.data.zyType==='0'){ - // this.$router.push(`/${this.nextPath}?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}`) - // } - // if (this.data.zyType==='1'){ - // this.$router.push(`/qgfk?zyq=${this.$route.query.zyq}&zyType=${this.data.zyType}`) - // } }, init(){ this.$emit('initWorkers',this.data.bzType) diff --git a/src/views/zyjhzx/components/SliaoSearch.vue b/src/views/zyjhzx/components/SliaoSearch.vue new file mode 100644 index 0000000..8607811 --- /dev/null +++ b/src/views/zyjhzx/components/SliaoSearch.vue @@ -0,0 +1,80 @@ + + + + diff --git a/src/views/zyjhzx/sliao/comps/search.js b/src/views/zyjhzx/components/search.js similarity index 100% rename from src/views/zyjhzx/sliao/comps/search.js rename to src/views/zyjhzx/components/search.js diff --git a/src/views/zyjhzx/hxianfkui/comps/pgd.js b/src/views/zyjhzx/hxianfkui/comps/pgd.js index 72db9c8..e7e3378 100644 --- a/src/views/zyjhzx/hxianfkui/comps/pgd.js +++ b/src/views/zyjhzx/hxianfkui/comps/pgd.js @@ -189,7 +189,7 @@ export default function (width,height){ width:(_width-60), height:30, fill:'#fff', - text:'回报', + text:'报工', fontSize:18, align:'center', verticalAlign:'middle' @@ -422,7 +422,7 @@ export default function (width,height){ const fdText=new Konva.Text({ x:(_width-188)/2, y:0, - width:(-width-188)/2, + width:(_width-188)/2, height:60, fill:'#fff', text:'分段:'+data.dcFd, diff --git a/src/views/zyjhzx/hxianpgong/comps/pgd.js b/src/views/zyjhzx/hxianpgong/comps/pgd.js index 72db9c8..e7e3378 100644 --- a/src/views/zyjhzx/hxianpgong/comps/pgd.js +++ b/src/views/zyjhzx/hxianpgong/comps/pgd.js @@ -189,7 +189,7 @@ export default function (width,height){ width:(_width-60), height:30, fill:'#fff', - text:'回报', + text:'报工', fontSize:18, align:'center', verticalAlign:'middle' @@ -422,7 +422,7 @@ export default function (width,height){ const fdText=new Konva.Text({ x:(_width-188)/2, y:0, - width:(-width-188)/2, + width:(_width-188)/2, height:60, fill:'#fff', text:'分段:'+data.dcFd, diff --git a/src/views/zyjhzx/ljian/comps/HxianPgd.vue b/src/views/zyjhzx/ljian/comps/HxianPgd.vue deleted file mode 100644 index 6657c19..0000000 --- a/src/views/zyjhzx/ljian/comps/HxianPgd.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - diff --git a/src/views/zyjhzx/ljian/comps/LjianPgd.vue b/src/views/zyjhzx/ljian/comps/LjianPgd.vue new file mode 100644 index 0000000..cccaf72 --- /dev/null +++ b/src/views/zyjhzx/ljian/comps/LjianPgd.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/views/zyjhzx/ljian/comps/baifang.js b/src/views/zyjhzx/ljian/comps/baifang.js deleted file mode 100644 index 290d1f9..0000000 --- a/src/views/zyjhzx/ljian/comps/baifang.js +++ /dev/null @@ -1,276 +0,0 @@ -import Konva from "konva"; -import {zx} from "@/api/zyjh"; -import { VXETable } from 'vxe-table' - -const baifang=function (option={}) { - const width=option.width,height=option.height,slList=option.dw,image=require('@/assets/gb.png') - const _width=width*0.32,_height=height*0.713 - const x=width*0.16+25,y=260 - const bg=function (){ - const group=new Konva.Group({ - x:x, - y:y, - width:_width, - height:_height - }) - - const imageObj = new Image(); - imageObj.src = require('@/assets/sliao/personbg.png'); - imageObj.onload = function () { - const shape = new Konva.Image({ - x: 0, - y: 0, - width: _width, - height:_height, - image: this, - }); - bgGroup.add(shape) - shape.zIndex(0) - } - return group - } - - const container=function (){ - return new Konva.Group({ - x:0, - y:0, - width:_width, - height:_height - }) - } - - const bgGroup=bg(); - const slGroup=container() - bgGroup.add(slGroup) - slGroup.zIndex(1) - - let currSlist=null - - const thatHeight=height - const gangban=function (index,item){ - const group=new Konva.Group({ - x:0, - y:thatHeight-310-index*40, - // draggable:true - }) - - group.setAttr('index',index) - group.setAttr('item',item) - - slGroup.add(group) - const {x}=group.absolutePosition() - group.dragBoundFunc(function (pos){ - return { - x:x, - y:pos.y - } - }) - let _index=0 - let touchingFlag=false; - group.on('mousedown touchstart',function (evt){ - const layer=this.parent.parent.parent - touchingFlag=true - const {x,y}=evt.evt - setTimeout(()=>{ - const moving=this.isDragging() - if (!moving){ - if (touchingFlag){ - this.draggable(false) - - const tmpGroup=this.clone() - tmpGroup.x(x-50) - tmpGroup.y(y-10) - layer.add(tmpGroup) - tmpGroup.draggable(true) - tmpGroup.dragBoundFunc(function (pos){ - return{...pos} - }) - tmpGroup.startDrag() - - const that=this - tmpGroup.on('dragend',function (){ - const {x:thisX,y:thisY}=this.absolutePosition() - for (const item of layer.children) { - if(item.attrs.id==='sb'){ - const {x,y}=item.absolutePosition() - const worker=JSON.parse(window.localStorage.getItem('worker')) - if ((thisX>=x&&thisY>=y&&thisX<=(x+item.attrs.width)&&thisY<=(y+item.attrs.height))&&!!worker){ - const info=this.getAttr('item') - const zyjh=JSON.parse(window.localStorage.getItem('hxfk')) - console.log(zyjh) - if (!zyjh){ - VXETable.modal.message({content: '请先选择待报工的派工单', status: 'warning'}) - this.remove() - that.visible(true) - return - } - if (zyjh.dcCh!==info.czbh&&zyjh.dcPl!==info.pl&&zyjh.dcFd!==info.fd&&zyjh.tzbh!==info.tlth){ - VXETable.modal.message({content: '板材与工单未对应', status: 'warning'}) - this.remove() - that.visible(true) - return - } - zx({ - field:'hxfkrq', - zxZtName:'HXFK', - list:[{ - id:zyjh.id, - hxfkry: worker.userCode - }], - ycldwInfo:info - }).then(res=>{ - if (res.success){ - window.localStorage.removeItem('hxfk') - this.remove() - that.remove() - }else{ - this.remove() - that.visible(true) - } - }) - }else{ - this.remove() - that.visible(true) - } - } - } - }) - this.visible(false) - } - } - },500) - - }) - - group.on('mouseup touchend',function (){ - touchingFlag=false - }) - - group.on('dragstart',function (){ - const {x,y}=this.absolutePosition() - this.startPos={ - x:x, - y:y - } - }) - group.on('dragmove',function (){ - if(_index===0){ - _index=this.getAttr('index') - } - this.zIndex(7) - const {y:thisY}=this.absolutePosition() - - const dir=thisY-this.startPos.y>0?-40:40 - - const children=slGroup.children - - for (const child of children) { - if (child===this){ - return - } - - const {y:thatY}=child.absolutePosition() - const moveDir=child.getAttr('moveDir')||0 - if (thisY>=thatY&&thisY<=thatY+40&&moveDir!==dir){ - child.setAttr('moveDir',dir); - _index+=dir>0?1:-1 - child.move({ - y:dir - }) - this.startPos={ - x:x, - y:thisY - } - } - - } - }) - - group.on('dragend',function (){ - const index=this.getAttr('index') - const element = currSlist.splice(index-1, 1)[0]; - currSlist.splice(_index-1, 0, element); - this.setAttr('index',_index) - _index=0 - slGroup.destroyChildren() - handler(currSlist) - }) - - const indexRect=new Konva.Rect({ - x:0, - y:0, - width:40, - height:40, - stroke:'black', - strokeWidth:1, - }) - //group.add(indexRect) - - const indexText=new Konva.Text({ - x:0, - y:0, - width:40, - height:40, - fill:'black', - text:index, - align:'center', - verticalAlign:'middle', - }) - group.add(indexText) - - //层 规格,套料图 船号,上料日期,计划切割日期 - const imageObj = new Image(); - const imgSize=200 - imageObj.src = image; - imageObj.onload = function () { - const shape = new Konva.Image({ - x: 40, - y: 0, - width: imgSize, - height:40, - image: imageObj, - }); - group.add(shape) - const gbText=new Konva.Text({ - x: 40, - y: 0, - width: imgSize, - height:40, - fill:'black', - text:`${item.wph||''},${item.wpgg}`, - align:'center', - verticalAlign:'middle', - }) - group.add(gbText) - } - - const concent=new Konva.Text({ - x: imgSize+60, - y: 0, - width: imgSize-20, - height:40, - fill:'black', - text:`${item.czbh},${item.pl},${item.fd}\n上料:${item.bfrq||''},切割:${item.qgjhrq||''}`, - align:'center', - verticalAlign:'middle', - }) - group.add(concent) - - return group - } - - function handler(slList){ - currSlist=slList; - for (let i = 1; i <= slList.length; i++) { - const item=slList[i-1] - const _group=gangban(i,item,item.length) - slGroup.add(_group) - } - } - - return { - container,slGroup,handler,bgGroup - } -} - -export default baifang diff --git a/src/views/zyjhzx/ljian/comps/dw.js b/src/views/zyjhzx/ljian/comps/dw.js deleted file mode 100644 index 1bfaf28..0000000 --- a/src/views/zyjhzx/ljian/comps/dw.js +++ /dev/null @@ -1,156 +0,0 @@ -import Konva from "konva"; - -export default function (width,height,callback){ - const _width=width*0.08,_height=height*0.73 - - const container=function (){ - const x=width*0.08+20,y=260 - - const group=new Konva.Group({ - x:0, - y:0, - width:_width, - height:_height, - draggable:true, - dragBoundFunc:function (pos){ - return { - x:x, - y:pos.y - } - }, - }) - - const bgGroup=new Konva.Group({ - x:x, - y:y, - width:_width, - height:_height - }) - bgGroup.add(group) - bgGroup.clipFunc(function(ctx) { - ctx.rect(0, 4, _width, _height*0.969); - }); - - const imageObj = new Image(); - imageObj.src = require('@/assets/sliao/personbg.png'); - imageObj.onload = function () { - const shape = new Konva.Image({ - x: 0, - y: 0, - width: _width, - height:_height*0.975, - image: this, - }); - bgGroup.add(shape) - shape.zIndex(0) - } - - return {bgGroup,group} - } - - let selectedShape=null; - const dw=function (index,item=[]){ - - const alignSize=1 - const width=((_width-5)/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({ - x:x, - y:y, - width:width, - height:height - }) - group.on('click touchstart',function (){ - if (selectedShape){ - selectedShape.hide() - if (selectedShape===selectShape){ - selectedShape=null - callback(null,null) - return - } - } - selectedShape=selectShape - selectedShape.show() - callback(index,item) - }) - - const bgObj = new Image(); - bgObj.src = require('@/assets/sliao/personbg1.png'); - bgObj.onload = function () { - const shape = new Konva.Image({ - x: 0, - y: 0, - offsetX:4, - width: width, - height:height, - image: this, - }); - group.add(shape) - shape.zIndex(0) - } - - const selectObj = new Image(); - selectObj.src = require('@/assets/sliao/selected.png'); - let selectShape=null - const setSelectShape=function (shape){ - selectShape=shape - } - selectObj.onload = function () { - const shape = new Konva.Image({ - x: width-width*0.31, - y: 4, - width: width*0.25, - height:width*0.25, - image: this, - visible:false - }); - group.add(shape) - shape.zIndex(0) - setSelectShape(shape) - } - - const formatName=()=>{ - for (const it of qgkw) { - if (it.bm===item.tzbh){ - return it.bmsm - } - } - } - - const text=new Konva.Text({ - x:0, - y:0, - width: width, - height: height, - fill:'black', - text:`${formatName()}\n${item.list.length}张`, - align:'center', - verticalAlign:'middle', - fontSize:14 - }) - group.add(text) - - return group - } - - const qgkw=[ - {"bmsm": "2跨超长超宽曲板", "bmlb": "QGKW", "bm": "10"}, - {"bmsm": "2跨T型材腹板", "bmlb": "QGKW", "bm": "11"}, - {"bmsm": "2跨激光切割板", "bmlb": "QGKW", "bm": "12"}, - {"bmsm": "3跨曲板", "bmlb": "QGKW", "bm": "13"}, - {"bmsm": "3跨厚板", "bmlb": "QGKW", "bm": "14"}, - {"bmsm": "4跨普通板", "bmlb": "QGKW", "bm": "15"}, - {"bmsm": "7跨型板", "bmlb": "QGKW", "bm": "16"}, - {"bmsm": "光电", "bmlb": "QGKW", "bm": "17"}, - {"bmsm": "2跨T型材面板", "bmlb": "QGKW", "bm": "5"}, - {"bmsm": "3跨平铁", "bmlb": "QGKW", "bm": "6"}, - {"bmsm": "1跨平直大板", "bmlb": "QGKW", "bm": "7"}, - {"bmsm": "1跨进线板", "bmlb": "QGKW", "bm": "8"}, - {"bmsm": "2跨超长超宽板", "bmlb": "QGKW", "bm": "9"} - ] - - return { - container,dw - } - -} diff --git a/src/views/zyjhzx/ljian/comps/person.js b/src/views/zyjhzx/ljian/comps/person.js index d3c5f4d..156b1cb 100644 --- a/src/views/zyjhzx/ljian/comps/person.js +++ b/src/views/zyjhzx/ljian/comps/person.js @@ -1,10 +1,10 @@ import Konva from "konva"; export default function (width,height){ - const _width=width*0.075,_height=height*0.73 + const _width=width*0.075,_height=height*0.942 const container=function (){ - const x=20,y=260 + const x=20,y=70 const group=new Konva.Group({ x:0, diff --git a/src/views/zyjhzx/ljian/comps/pgd.js b/src/views/zyjhzx/ljian/comps/pgd.js index 72db9c8..91d5b4a 100644 --- a/src/views/zyjhzx/ljian/comps/pgd.js +++ b/src/views/zyjhzx/ljian/comps/pgd.js @@ -2,7 +2,7 @@ import Konva from "konva"; import QRCode from 'qrcode' export default function (width,height){ - const x=width*0.66+40,y=40,_width=width*0.30,_height=height*0.95 + const x=width*0.66+40,y=70,_width=width*0.30,_height=height*0.917 const container=function (){ const group=new Konva.Group({ @@ -34,6 +34,8 @@ export default function (width,height){ } const formatWorker=function (code){ + console.log(code) + console.log(workers) for (const item of workers) { if(item.userCode===code){ return item.userName @@ -79,7 +81,7 @@ export default function (width,height){ lineHeight:1, fill:'#fff', strokeWidth:1, - text:'划线计划单', + text:'零件计划单', align:'center', fontSize:20, }) @@ -91,7 +93,7 @@ export default function (width,height){ width:_width-48, height:15, fill:'#fff', - text:`单号:${data.djh}`, + text:`单号:${data.qgdh?data.qgdh:''}`, align:'left', fontSize:12, }) @@ -115,6 +117,12 @@ export default function (width,height){ group0.add(group4) const group5=drawJs(data) group0.add(group5) + + const group51=drawJs1(data) + group0.add(group51) + const group52=drawJs2(data) + group0.add(group52) + const group6=drawHb(data) group0.add(group6) const group7=drawBz(data) @@ -189,7 +197,7 @@ export default function (width,height){ width:(_width-60), height:30, fill:'#fff', - text:'回报', + text:'报工', fontSize:18, align:'center', verticalAlign:'middle' @@ -212,7 +220,7 @@ export default function (width,height){ width:(_width-60)/2, height:30, fill:'#fff', - text:data.jsr, + text:data.qjgFkrq, fontSize:18, align:'center', verticalAlign:'middle' @@ -246,6 +254,172 @@ export default function (width,height){ return group } const drawJs=function (data){ + const group=new Konva.Group({ + x:0, + y:150, + width:(_width-60), + height:30, + }) + + const jsRect=new Konva.Rect({ + x:0, + y:0, + width:(_width-60), + height:30, + stroke:'#4991E5', + strokeWidth:1, + }) + group.add(jsRect) + + const jsText=new Konva.Text({ + x:0, + y:0, + width:(_width-60), + height:30, + fill:'#fff', + text:'坡口施工', + fontSize:18, + align:'center', + verticalAlign:'middle' + }) + group.add(jsText) + + const plRect=new Konva.Rect({ + x:0, + y:30, + width:(_width-60), + height:30, + stroke:'#4991E5', + strokeWidth:1, + }) + group.add(plRect) + + const pscry=formatWorker(data.pscry) + const qscry=formatWorker(data.qscry) + const dscry=formatWorker(data.dscry) + + const plText=new Konva.Text({ + x:0, + y:30, + width:(_width-60)/2, + height:30, + fill:'#fff', + text:pscry, + fontSize:18, + align:'center', + verticalAlign:'middle' + }) + + const fdRect=new Konva.Rect({ + x:(_width-60)/2, + y:30, + width:(_width-60)/2, + height:30, + stroke:'#4991E5', + strokeWidth:1, + }) + group.add(fdRect) + + const fdText=new Konva.Text({ + x:(_width-60)/2, + y:30, + width:(_width-60)/2, + height:30, + fill:'#fff', + text:data.pkXfrq||'', + fontSize:18, + align:'center', + verticalAlign:'middle' + }) + group.add(fdText) + + group.add(plText) + + return group + } + const drawJs1=function (data){ + const group=new Konva.Group({ + x:0, + y:250, + width:(_width-60), + height:30, + }) + + const jsRect=new Konva.Rect({ + x:0, + y:0, + width:(_width-60), + height:30, + stroke:'#4991E5', + strokeWidth:1, + }) + group.add(jsRect) + + const jsText=new Konva.Text({ + x:0, + y:0, + width:(_width-60), + height:30, + fill:'#fff', + text:'曲面施工', + fontSize:18, + align:'center', + verticalAlign:'middle' + }) + group.add(jsText) + + const plRect=new Konva.Rect({ + x:0, + y:30, + width:(_width-60), + height:30, + stroke:'#4991E5', + strokeWidth:1, + }) + group.add(plRect) + + const qscry=formatWorker(data.qscry) + + const plText=new Konva.Text({ + x:0, + y:30, + width:(_width-60)/2, + height:30, + fill:'#fff', + text:qscry, + fontSize:18, + align:'center', + verticalAlign:'middle' + }) + + const fdRect=new Konva.Rect({ + x:(_width-60)/2, + y:30, + width:(_width-60)/2, + height:30, + stroke:'#4991E5', + strokeWidth:1, + }) + group.add(fdRect) + + const fdText=new Konva.Text({ + x:(_width-60)/2, + y:30, + width:(_width-60)/2, + height:30, + fill:'#fff', + text:data.qjgXfrq||'', + fontSize:18, + align:'center', + verticalAlign:'middle' + }) + group.add(fdText) + + group.add(plText) + + return group + } + const drawJs2=function (data){ const group=new Konva.Group({ x:0, y:350, @@ -269,7 +443,7 @@ export default function (width,height){ width:(_width-60), height:30, fill:'#fff', - text:'接收', + text:'打磨施工', fontSize:18, align:'center', verticalAlign:'middle' @@ -286,7 +460,7 @@ export default function (width,height){ }) group.add(plRect) - const name=formatWorker(data.pwry) + const dscry=formatWorker(data.dscry) const plText=new Konva.Text({ x:0, @@ -294,7 +468,7 @@ export default function (width,height){ width:(_width-60)/2, height:30, fill:'#fff', - text:name, + text:dscry, fontSize:18, align:'center', verticalAlign:'middle' @@ -316,7 +490,7 @@ export default function (width,height){ width:(_width-60)/2, height:30, fill:'#fff', - text:data.pwpgrq||'', + text:data.dmXfrq||'', fontSize:18, align:'center', verticalAlign:'middle' @@ -370,7 +544,7 @@ export default function (width,height){ width:(_width-60), height:30, fill:'#fff', - text:data.tzbh, + text:data.tlth, fontSize:18, align:'center', verticalAlign:'middle' @@ -402,7 +576,7 @@ export default function (width,height){ width:(_width-188)/2, height:60, fill:'#fff', - text:'批量:'+data.dcPl, + text:'批量:'+data.pl, fontSize:18, align:'center', verticalAlign:'middle' @@ -422,10 +596,10 @@ export default function (width,height){ const fdText=new Konva.Text({ x:(_width-188)/2, y:0, - width:(-width-188)/2, + width:(_width-188)/2, height:60, fill:'#fff', - text:'分段:'+data.dcFd, + text:'分段:'+data.fd, fontSize:18, align:'center', verticalAlign:'middle' @@ -459,7 +633,7 @@ export default function (width,height){ width:(_width-188), height:60, fill:'#fff', - text:'船号:'+data.dcCh, + text:'船号:'+data.czbh, fontSize:18, align:'center', verticalAlign:'middle' diff --git a/src/views/zyjhzx/ljian/comps/pgdTable.js b/src/views/zyjhzx/ljian/comps/pgdTable.js index 0d2176d..0ee4349 100644 --- a/src/views/zyjhzx/ljian/comps/pgdTable.js +++ b/src/views/zyjhzx/ljian/comps/pgdTable.js @@ -1,7 +1,7 @@ export default function () { const options={ - height:215, + height:835, align:'center', border: true, resizable: true, @@ -26,56 +26,293 @@ export default function () { } } } - const gdhFormat=function ({cellValue}){ - if (cellValue){ - return 'PW'+cellValue - } - return '' - } - const dwFormat=function ({cellValue}){ - console.log(cellValue) - console.log(options.ycldw) - for (const item of options.ycldw) { - if (cellValue===(item.id+"")){ - for (const it of ycldw){ - if (it.bm===item.tzbh){ - return it.bmsm - } - } - } - } - } const columns = [ { type: 'checkbox', width: 40 }, - { type: 'seq',title:'序号', width: 50 }, - { field: 'djh',title:'派工单号', width: 120,}, - {field: 'lldw', title: '垛位', width: 80,formatter: dwFormat}, - {field: 'llcs', title: '层数', width: 60}, - {field: 'dcCh', title: '船号', width: 80}, - {field: 'dcPl', title: '批量', width: 80}, - {field: 'wpgg', title: '材质', width: 80}, - {field: 'wpxh', title: '规格', width: 70}, - {field: 'slwlh', title: '炉批号', width: 100}, - {field: 'tzbh', title: '套料图号', width: 100}, - {field: 'hxry', title: '接收人', width: 80,formatter: nameFormat}, - {field: 'hxpgry', title: '派工人', width: 80,formatter: nameFormat}, - {field: 'hxpgrq', title: '派工时间', width: 100}, - ] + { type: 'seq', width: 50, title: '序号' }, + { field: 'pkbs', title: '坡口标识', width: 90, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pscry', title: '坡口施工', width: 90,formatter:nameFormat, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qbs', title: '曲面标识', width: 90, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qscry', title: '曲面施工', width: 90,formatter:nameFormat, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmbs', title: '打磨标识', width: 90, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dscry', title: '打磨施工', width: 90,formatter:nameFormat, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + // { field: 'qjgZt', title: '状态', width: 120,formatter: ['dictFormat','PGZT'], + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }, + // }, + { field: 'czbh', title: '船号', width: 70, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pl', title: '批量', width: 70, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'fd', title: '分段', width: 70, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'kw', title: '跨位', width: 70,formatter: ['dictFormat', 'QGKW'], + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'zl', title: '组立', width: 70, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'tlth', title: '套料图号', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ljbh', title: '零件编号', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ljmc', title: '零件名称', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ljgg', title: '零件规格', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'ljcz', title: '零件材质', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'wpfl', title: '物品分类', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'jldw', title: '计量单位', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'sl', title: '数量', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qfxqrqxz', title: '前方需求小组期', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qfxqrqdz', title: '前方需求大组期', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qjgjhrq', title: '曲加工计划期', width: 120,editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qsbbh', title: '曲设备编号', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qjgXfry', title: '曲派工人员', width: 120,editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qjgXfrq', title: '曲派工日期', width: 120,editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qjgFkry', title: '曲反馈人', width: 120,editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'qjgFkrq', title: '曲反馈日期', width: 120,editRender: { name: 'input' }, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pghd', title: '坡口工单号', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pkjhrq', title: '坡口计划日期', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pksbbh', title: '坡口设备编号', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pklx', title: '坡口类型', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + + { field: 'pkcd', title: '坡口长度', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pkXfry', title: '坡口派工人员', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pkXfrq', title: '坡口派工日期', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pkFkrq', title: '坡口反馈日期', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'pkFkry', title: '坡口反馈人', width: 120, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dgdh', title: '打磨工单号', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmsbbh', title: '打磨设备编号', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmcd', title: '打磨打磨长度', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmXfry', title: '打磨派工人', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmXfrq', title: '打磨派工日期', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmFkry', title: '打磨反馈人', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dmFkrq', title: '打磨反馈日期', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { + field: 'slfkry', + title: '上料反馈人', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'slfkrq', + title: '上料反馈日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'pwfkry', + title: '抛丸反馈人', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'pwfkrq', + title: '抛丸反馈日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'llfkry', + title: '理料反馈人', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'llfkrq', + title: '理料反馈日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + + { + field: 'hxfkrq', + title: '划线反馈日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'hxfkry', + title: '划线反馈人员', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, - const ycldw=[ - {"bmsm": "2跨超长超宽曲板", "bmlb": "QGKW", "bm": "10"}, - {"bmsm": "2跨T型材腹板", "bmlb": "QGKW", "bm": "11"}, - {"bmsm": "2跨激光切割板", "bmlb": "QGKW", "bm": "12"}, - {"bmsm": "3跨曲板", "bmlb": "QGKW", "bm": "13"}, - {"bmsm": "3跨厚板", "bmlb": "QGKW", "bm": "14"}, - {"bmsm": "4跨普通板", "bmlb": "QGKW", "bm": "15"}, - {"bmsm": "7跨型板", "bmlb": "QGKW", "bm": "16"}, - {"bmsm": "光电", "bmlb": "QGKW", "bm": "17"}, - {"bmsm": "2跨T型材面板", "bmlb": "QGKW", "bm": "5"}, - {"bmsm": "3跨平铁", "bmlb": "QGKW", "bm": "6"}, - {"bmsm": "1跨平直大板", "bmlb": "QGKW", "bm": "7"}, - {"bmsm": "1跨进线板", "bmlb": "QGKW", "bm": "8"}, - {"bmsm": "2跨超长超宽板", "bmlb": "QGKW", "bm": "9"} + { + field: 'qgfkry', + title: '切割反馈人', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'qgfkrq', + title: '切割反馈日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'sljhrq', + title: '上料计划日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'pwjhrq', + title: '抛丸计划日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'lljhrq', + title: '理料计划日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'hxjhrq', + title: '划线计划日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, + { + field: 'qgjhrq', + title: '切割计划日期', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' } + }, ] return { diff --git a/src/views/zyjhzx/ljian/comps/sb.js b/src/views/zyjhzx/ljian/comps/sb.js deleted file mode 100644 index 4aa29ee..0000000 --- a/src/views/zyjhzx/ljian/comps/sb.js +++ /dev/null @@ -1,41 +0,0 @@ -import Konva from "konva"; - -export default function (width,height){ - const x=width*0.495,y=260,_width=width*0.186,_height=height*0.713 - const container=new Konva.Group({ - id:'sb', - x:x, - y:y, - width:_width, - height:_height - }) - - const imageObj = new Image(); - imageObj.src = require('@/assets/sliao/personbg.png'); - imageObj.onload = function () { - const shape = new Konva.Image({ - x: 0, - y: 0, - width: _width, - height:_height, - image: this, - }); - container.add(shape) - shape.zIndex(0) - } - - const text=new Konva.Text({ - x: 0, - y: 0, - width: _width, - height:_height, - fill:'black', - text:'划线设备', - align:'center', - verticalAlign:'middle', - }) - - container.add(text) - - return container -} diff --git a/src/views/zyjhzx/ljian/index.vue b/src/views/zyjhzx/ljian/index.vue index 21efe6e..5859d63 100644 --- a/src/views/zyjhzx/ljian/index.vue +++ b/src/views/zyjhzx/ljian/index.vue @@ -1,7 +1,8 @@ @@ -10,44 +11,37 @@ 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 drawSb from './comps/sb' -import baifang from "./comps/baifang"; -import {getPgd, getYcldw} from "@/api/zyjh"; import {getBzryList} from "@/api/sjzx/bzzGL"; -import HxianPgd from "@/views/zyjhzx/hxianfkui/comps/HxianPgd.vue"; import ZyjhSelectComp from "@/views/zyjhzx/components/SelectComp.vue"; +import LjianPgd from "@/views/zyjhzx/ljian/comps/LjianPgd.vue"; +import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue"; +import {getQmPgd} from "@/api/jhzxgl/pgd"; +import initSearch from "@/views/zyjhzx/components/search"; +import {startLoading} from "@/utils"; export default { name:'PWanFKui', - components: {ZyjhSelectComp, HxianPgd}, + components: {SliaoSearch, LjianPgd, ZyjhSelectComp}, data(){ return { - title:'零 件 作 业 报 工', + title:'零 件 作 业 派 工', width:0, height:0, stage:null, layer:null, - sljhGroup:null, pgdGroup:null, drawGd:null, - dw:[], pgd:[], - slGroup:null, - currentDw:null, - currentDwIndex:null, currentWorker:null, setWorkers:null, workers:null, - dwGroup:null, workerGroup:null, person:null, + show:false } }, mounted() { - this.$socket.open() - this.wsSubscribe() this.initKonvaStage(); }, created(){ @@ -55,77 +49,16 @@ export default { }, sockets:{}, methods:{ - wsSubscribe(){ - this.sockets.subscribe('hxComplete', data => { - if (this.currentDw&&this.currentDw.id===data.dwId) { - if (this.slGroup){ - this.slGroup.destroyChildren() - } - for (let i = 0; i < this.currentDw.list.length; i++) { - const item=this.currentDw.list[i] - if (item.czbh===data.czbh&&item.pl===data.pl&&item.tlth===data.tlth){ - this.currentDw.list.splice(i,1) - break - } - } - this.drawBaiFang(this.dw[this.currentDwIndex].list) - this.initDw() - this.$refs.hxpgd.initData(this.currentWorker.userCode,'51') - } - }) - this.sockets.subscribe('zyjhzx', data => { - if (this.zt===data.zt){ - const tmpArr=[{ - id:data.zyjh.id, - hxfkry:data.zyjh.hxry - }] - this.$refs.hxpgd.paigong0(tmpArr) - }else{ - this.$message.error(`工单号错误:${data.gdh}`) - } - }) + plGylx(gylx,worker){ + this.$refs.hxpgd.plGylx(gylx,worker) + }, + paigong(){ + this.$refs.hxpgd.paigong(this.currentWorker) }, initPgd(pgd={}){ const group=this.drawGd(pgd) this.pgdGroup.add(group) }, - pagClick(){ - - }, - initDwInfo(index,dw){ - if (this.slGroup){ - this.slGroup.destroyChildren() - } - this.canSl=true - this.currentDw=dw - this.currentDwIndex=index - !!dw&&this.drawBaiFang(dw.list) - }, - initBaiFang(){ - const {slGroup,handler,bgGroup:slBgGroup}= baifang({width:this.width,height:this.height}) - this.slGroup=slGroup - this.layer.add(slBgGroup) - this.drawBaiFang=handler - }, - initDw(){ - if (this.dwGroup){ - this.dwGroup.destroyChildren() - } - const that=this - getYcldw({type:'llj'}).then(res=>{ - const {container,dw}=drawDw(this.width,this.height,that.initDwInfo) - const {bgGroup,group}=container() - this.dwGroup=group - this.dw=res.data - this.layer.add(bgGroup) - - for (let i=0;i{ this.workers=res.data + this.show=true this.setWorkers(res.data) const that=this for (let i=0;i { + this.$refs.hxpgd.initData(res.data) + }) + }, initKonvaStage(){ this.width=this.$refs.pwpg.clientWidth this.height=this.$refs.pwpg.clientHeight @@ -165,18 +125,14 @@ export default { this.initWorkers(this.$refs.selRef.getData().bzType) - this.initDw() - const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height) this.setWorkers=setWorkers this.drawGd=drawGd this.pgdGroup=pgdContainer() this.layer.add(this.pgdGroup) - const csdGroup = drawSb(this.width, this.height) - this.layer.add(csdGroup) - - this.initBaiFang() + const {group}=initSearch() + this.layer.add(group) }, } } @@ -184,6 +140,30 @@ export default { diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue index 45b6c21..666f664 100644 --- a/src/views/zyjhzx/sliao/index.vue +++ b/src/views/zyjhzx/sliao/index.vue @@ -9,10 +9,10 @@ import Konva from "konva"; import container from "@/views/zyjhzx/sliao/comps/container"; import drawTitle from "@/views/zyjhzx/sliao/comps/title"; -import initSearch from "@/views/zyjhzx/sliao/comps/search"; +import initSearch from "@/views/zyjhzx/components/search"; import {sljh} from "@/views/zyjhzx/sliao/comps/sljh"; import workers from "@/views/zyjhzx/sliao/comps/person"; -import SliaoSearch from "@/views/zyjhzx/sliao/comps/SliaoSearch.vue"; +import SliaoSearch from "@/views/zyjhzx/components/SliaoSearch.vue"; import liliao from "@/views/zyjhzx/sliao/comps/liliao"; import baifang from "@/views/zyjhzx/sliao/comps/baifang"; import {dict, getSljhPgd, getYcldw, shangLiao} from "@/api/zyjh"; @@ -433,7 +433,6 @@ export default { this.layer.add(title) const {group}=initSearch() - this.layer.add(group) this.search(this.$refs.sliaoSearch.getQueryParam())