From 994d6b1bef2cfb3c4c2350b688beda7eb1303177 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, 27 Aug 2024 14:32:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=96=99=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/zyjh.js | 3 +- src/views/zyjhzx/sliao/comps/SliaoSearch.vue | 3 ++ src/views/zyjhzx/sliao/comps/baifang.js | 37 ++++++++++++-------- src/views/zyjhzx/sliao/comps/container.js | 6 ++-- src/views/zyjhzx/sliao/comps/sljh.js | 20 ++++++----- src/views/zyjhzx/sliao/index.vue | 15 ++++---- 6 files changed, 51 insertions(+), 33 deletions(-) diff --git a/src/api/zyjh.js b/src/api/zyjh.js index 8e7dd42..8d3c2ec 100644 --- a/src/api/zyjh.js +++ b/src/api/zyjh.js @@ -16,10 +16,11 @@ export const shangLiao=function(data){ }) } -export const getSljhPgd=function(){ +export const getSljhPgd=function(data={}){ return request({ url: '/zyjh/sljh', method: 'post', + data:data }) } diff --git a/src/views/zyjhzx/sliao/comps/SliaoSearch.vue b/src/views/zyjhzx/sliao/comps/SliaoSearch.vue index b41259f..7755658 100644 --- a/src/views/zyjhzx/sliao/comps/SliaoSearch.vue +++ b/src/views/zyjhzx/sliao/comps/SliaoSearch.vue @@ -27,6 +27,9 @@ export default { search(){ this.queryParam.dcCh=this.$refs.projectSelectRef.getDcch() this.$emit('search',this.queryParam) + }, + getQueryParam(){ + return this.queryParam } } } diff --git a/src/views/zyjhzx/sliao/comps/baifang.js b/src/views/zyjhzx/sliao/comps/baifang.js index 47a3fd9..dd846a3 100644 --- a/src/views/zyjhzx/sliao/comps/baifang.js +++ b/src/views/zyjhzx/sliao/comps/baifang.js @@ -87,9 +87,6 @@ const baifang=function (option={}) { child.move({ y:dir }) - const item=child.getAttr('item') - item.ceng+=dir>0?1:-1 - child.setAttr('item',item) const movedIndex=movedList.indexOf(child) if (movedIndex===-1){ movedList.push(child) @@ -108,25 +105,35 @@ const baifang=function (option={}) { group.on('dragend',function (){ const index=this.getAttr('index') const item=this.getAttr('item') + const mList=[] + for (const it of movedList) { + mList.push(it.getAttr('item')) + } + console.log(mList) const data={ id:item.id, lastCeng:item.ceng, lastDuo:item.dwId, ceng:_index, duo:item.dwId, - movedList:movedList + movedList:mList } - daoduo(data).then(res=>{ - if (res.success){ - const element = slList.splice(index-1, 1)[0]; - slList.splice(_index-1, 0, element); - this.setAttr('index',_index) - _index=0 - handler(slList) - }else { - - } - }) + const element = slList.splice(index-1, 1)[0]; + slList.splice(_index-1, 0, element); + this.setAttr('index',_index) + _index=0 + handler(slList) + // daoduo(data).then(res=>{ + // if (res.success){ + // const element = slList.splice(index-1, 1)[0]; + // slList.splice(_index-1, 0, element); + // this.setAttr('index',_index) + // _index=0 + // handler(slList) + // }else { + // + // } + // }) }) const indexRect=new Konva.Rect({ diff --git a/src/views/zyjhzx/sliao/comps/container.js b/src/views/zyjhzx/sliao/comps/container.js index 6df3bde..be1455b 100644 --- a/src/views/zyjhzx/sliao/comps/container.js +++ b/src/views/zyjhzx/sliao/comps/container.js @@ -7,9 +7,11 @@ const container=function (width=0,height=0,container){ height: height, }); - const layer = new Konva.Layer(); + const layer = new Konva.Layer({ + id:"1" + }); stage.add(layer) - layer.draw(); + // layer.draw(); return { stage,layer diff --git a/src/views/zyjhzx/sliao/comps/sljh.js b/src/views/zyjhzx/sliao/comps/sljh.js index e17f571..92fe406 100644 --- a/src/views/zyjhzx/sliao/comps/sljh.js +++ b/src/views/zyjhzx/sliao/comps/sljh.js @@ -1,20 +1,22 @@ import Konva from "konva"; -let _width=0,_height=0 export const sljh=function (width,height){ - _width=width - _height=height - const layer=new Konva.Layer() - layer.draw() - - const group=new Konva.Group({ + const layer=new Konva.Layer({ + id:'2', x:15, y:65, + }) + layer.clipFunc(function(ctx) { + ctx.rect(0, 0, width-30, height*0.2-60); + }); + //layer.draw() + + const group=new Konva.Group({ + x:0, + y:0, width: width-30, height: height*0.2-60, - stroke:'blue', - strokeWidth:1, draggable: true, dragBoundFunc:function (pos){ return { diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue index 23180cb..0ba5b8b 100644 --- a/src/views/zyjhzx/sliao/index.vue +++ b/src/views/zyjhzx/sliao/index.vue @@ -1,7 +1,7 @@ @@ -64,7 +64,10 @@ export default { }) }, search(queryParam){ - console.log(queryParam) + getSljhPgd(queryParam).then(res=>{ + this.sljhItemList=res.data + this.drawSljhItem(this.sljhItemList) + }) }, initBaiFang(index,dw){ if (this.slGroup){ @@ -79,6 +82,9 @@ export default { this.layer.add(slGroup) }, drawSljhItem(list){ + if (this.sljhGroup){ + this.sljhGroup.destroyChildren() + } const itemWith=85; const itemHeight=108 for (let i = 0; i < list.length; i++) { @@ -231,10 +237,7 @@ export default { this.layer.add(group) - getSljhPgd().then(res=>{ - this.sljhItemList=res.data - this.drawSljhItem(this.sljhItemList) - }) + this.search(this.$refs.sliaoSearch.getQueryParam()) const {layer:sljhLayer,group:sljhGroup}=sljh(this.width,this.height) this.sljhGroup=sljhGroup