diff --git a/src/views/zyjhzx/bfang/comps/BFangTable.vue b/src/views/zyjhzx/bfang/comps/BFangTable.vue index 525ed63..855179d 100644 --- a/src/views/zyjhzx/bfang/comps/BFangTable.vue +++ b/src/views/zyjhzx/bfang/comps/BFangTable.vue @@ -60,14 +60,15 @@ export default { }, initData() { const params=this.dataInitParam; - if(!params.dcCh){ - this.$message.warning('请选择船号') - return; - } + // if(!params.dcCh){ + // this.$message.warning('请选择船号') + // return; + // } params.zyq=this.zyq wbfList(params).then((res) => { res.data.forEach(item => { item.selected = false + item.ljsl=item.ljList.length for (const dw of this.dwxx) { if (item.dwxxId === dw.id) { item.qy = dw.qy diff --git a/src/views/zyjhzx/bfang/comps/table.js b/src/views/zyjhzx/bfang/comps/table.js index 0cee3f7..3cec181 100644 --- a/src/views/zyjhzx/bfang/comps/table.js +++ b/src/views/zyjhzx/bfang/comps/table.js @@ -36,6 +36,10 @@ export default function () { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { field: 'ljsl', title: '零件数量', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, ] return {options,columns} diff --git a/src/views/zyjhzx/bfang/index.vue b/src/views/zyjhzx/bfang/index.vue index 0a3f41c..a373e72 100644 --- a/src/views/zyjhzx/bfang/index.vue +++ b/src/views/zyjhzx/bfang/index.vue @@ -53,7 +53,7 @@ export default { } getBzryByBz({zyq:this.$route.query.zyq,zt:bzType}).then(res=>{ - res.data=res.data.filter(item=>item.position==='数控'||item.position==='龙门'||item.position==='班长') + res.data=res.data.filter(item=>item.position==='配套工'||item.position==='班长') this.workers=res.data const that=this for (let i=0;i<res.data.length;i++){ diff --git a/src/views/zyjhzx/hxianfkui/comps/person.js b/src/views/zyjhzx/hxianfkui/comps/person.js index 308c3aa..7078964 100644 --- a/src/views/zyjhzx/hxianfkui/comps/person.js +++ b/src/views/zyjhzx/hxianfkui/comps/person.js @@ -1,7 +1,7 @@ import Konva from "konva"; export default function (width,height){ - const _width=width*0.075,_height=height*0.73 + const _width=width*0.445,_height=height*0.73 const container=function (){ const x=20,y=260 @@ -56,11 +56,11 @@ export default function (width,height){ } const person=function (index,persons={}){ - const alignSize=1 - const width=(_width-5)/alignSize,height=110 + const alignSize=6 + const width=(_width-14)/alignSize,height=110 const x=index%alignSize*width+index%alignSize+5,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10 const group=new Konva.Group({ - x:x, + x:x+4, y:y, width:width, height:height diff --git a/src/views/zyjhzx/hxianfkui/comps/sb.js b/src/views/zyjhzx/hxianfkui/comps/sb.js index 3db74f6..aa5fc1a 100644 --- a/src/views/zyjhzx/hxianfkui/comps/sb.js +++ b/src/views/zyjhzx/hxianfkui/comps/sb.js @@ -1,7 +1,7 @@ import Konva from "konva"; export default function (width,height,zyq){ - const x=width*0.495,y=260,_width=width*0.186,_height=height*0.713 + const x=width*0.455,y=260,_width=width*0.227,_height=height*0.713 const bg=new Konva.Group({ x:x, y:y, diff --git a/src/views/zyjhzx/hxianfkui/index.vue b/src/views/zyjhzx/hxianfkui/index.vue index 5731c70..db6c486 100644 --- a/src/views/zyjhzx/hxianfkui/index.vue +++ b/src/views/zyjhzx/hxianfkui/index.vue @@ -201,7 +201,7 @@ export default { this.initWorkers(this.$refs.selRef.getData().bzType) - this.initDw() + // this.initDw() const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height) this.setWorkers=setWorkers @@ -213,7 +213,7 @@ export default { this.getSelectSbbm=getSelectSbbm this.layer.add(bgGroup) - this.initBaiFang() + // this.initBaiFang() }, } } diff --git a/src/views/zyjhzx/qgefkui/comps/person.js b/src/views/zyjhzx/qgefkui/comps/person.js index 308c3aa..7078964 100644 --- a/src/views/zyjhzx/qgefkui/comps/person.js +++ b/src/views/zyjhzx/qgefkui/comps/person.js @@ -1,7 +1,7 @@ import Konva from "konva"; export default function (width,height){ - const _width=width*0.075,_height=height*0.73 + const _width=width*0.445,_height=height*0.73 const container=function (){ const x=20,y=260 @@ -56,11 +56,11 @@ export default function (width,height){ } const person=function (index,persons={}){ - const alignSize=1 - const width=(_width-5)/alignSize,height=110 + const alignSize=6 + const width=(_width-14)/alignSize,height=110 const x=index%alignSize*width+index%alignSize+5,y=height*(Math.floor(index/alignSize))+(Math.floor(index/alignSize)+1)*10 const group=new Konva.Group({ - x:x, + x:x+4, y:y, width:width, height:height diff --git a/src/views/zyjhzx/qgefkui/index.vue b/src/views/zyjhzx/qgefkui/index.vue index 108054b..aafa110 100644 --- a/src/views/zyjhzx/qgefkui/index.vue +++ b/src/views/zyjhzx/qgefkui/index.vue @@ -203,7 +203,7 @@ export default { this.initWorkers(this.$refs.selRef.getData().bzType) - this.initDw() + // this.initDw() const {container:pgdContainer,drawGd,setWorkers}=drawPgd(this.width,this.height) this.setWorkers=setWorkers @@ -215,7 +215,7 @@ export default { this.getSelectSbbm=getSelectSbbm this.layer.add(bgGroup) - this.initBaiFang() + // this.initBaiFang() this.pgdShow=true },