From 36eda8e325e2286724f0aa9481e3d07c6bdcfb51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Tue, 15 Dec 2020 10:48:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BB=BA=E7=AD=91=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/canvas-share-data.service.ts | 2 +- src/app/working-area/working-area.component.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index e03808c..bca405e 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -16,7 +16,7 @@ export class CanvasShareDataService { // 总平面图/建筑 楼层 selectStorey: any = {area: '', details: ''}; // 选择当前 楼层 数据 - // originalcompanyBuildingData: any; // 单位/建筑 数据 + originalcompanyBuildingData: any; // 单位/建筑 数据 originaleveryStoreyData: any; // 总平面图/楼层/区域 楼层数据 // 总平面图/建筑 楼层 diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 523ecdb..55bd311 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -1129,7 +1129,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV private enterPaint(): void { this.previewLineSegment.visible = false; this.enterPaintEndButton.visible = false; + console.log(this.paintMode); switch (this.paintMode) { + case PaintMode.singlePointIcon: + break; case PaintMode.lineIcon: if (this.paintPoints.length >= 2) { this.emit('createIcon', this.paintingIcon); @@ -1172,10 +1175,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV const polygonIcon = new PolygonIcon(assetData, this); this.emit('createIcon', polygonIcon); } + break; case PaintMode.Pipeline: if (this.canvasData.selectTemplateData.name !== '水带') { this.emit('createIcon', this.paintingShape); - console.log("1"); this.paintingShape = null; } break;