diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index fe84094..557ec6d 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -71,8 +71,11 @@ export class CanvasShareDataService { public getLinkCarName(car: any): any[] { const linkCar = []; car.assetData.Pipelines.forEach(pipeline => { - const icon = pipeline.assetData.LinkedObjects.find(i => i !== car); - if (icon.assetData.Type === 1) { + const icon = pipeline.assetData.LinkedObjects.find(i => i !== car); + if (icon.assetData.Type === 1 + || icon.assetData.Type === 2 + || icon.assetData.Type === 3 + || icon.assetData.Type === 4) { linkCar.push(icon.assetData.Name); } }); diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 67253f6..4070d2d 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -252,9 +252,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV icon.assetData.Type === 3 || icon.assetData.Type === 4 )) { - console.log(this.backgroundImage.position); - this.backgroundImage.pivot.set(icon.x, icon.y); - this.backgroundImage.position.set(771, 404); + // console.log(this.backgroundImage.position); + // this.backgroundImage.pivot.set(icon.x, icon.y); + // this.backgroundImage.position.set(771, 404); clearTimeout(this.animationTime); this.animation?.pause(); this.animationIcon?.scale.set(1); @@ -2307,6 +2307,7 @@ export class SinglePointIcon extends PIXI.Container { this.assetData.Pipelines.push(this.workingArea.paintingPipeline); this.workingArea.paintingPipeline.refresh(); this.workingArea.paintingPipelineFinish(); + this.workingArea.emit('select', this); } } } @@ -2350,6 +2351,21 @@ export class SinglePointIcon extends PIXI.Container { event.currentTarget.parent.y = newPosition.y; this.assetData.Point = new PIXI.Point(this.x, this.y); this.workingArea.canvasData.isChange = true; + // // 拖动过程中判断车辆放置区域是否包含当前图标位置 + // let b = false; + // this.workingArea.backgroundImage.children.forEach(item => { + // if (item instanceof PutCarArea) { + // console.log(item.polygonGraphics._bounds) + // if (item.polygonGraphics.containsPoint(newPosition)) { + // b = true; + // } + // } + // }); + // if (b) { + // console.log('当前点可以创建'); + // } else { + // console.log('当前点不可以创建'); + // } } }) .on('rightclick', event => {