From 104ad4d29fc34f75a80b75e2e9b5fa19c008f95a Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Tue, 22 Sep 2020 19:33:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E7=BB=98=E5=88=B6?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../working-area/working-area.component.ts | 948 ++++++++++++++++-- 1 file changed, 878 insertions(+), 70 deletions(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index ee2107b..54fa75f 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -276,6 +276,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // this.createEnterPaintEndButton(); // this.backgroundImage.addChild(this.paintingLine); this.on('select', obj => { + console.log(obj); this.moveIconToScreenCenter(obj); if (this.allowEdit) { if (obj instanceof MultipointIcon) { @@ -462,16 +463,545 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV const single = new SinglePointIcon(element, this); }); - this.setNameVisible(false, GameMode.BasicInformation); - - const tempData = { + const tempData = [ + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 2139, + y: 399 + }, + { + x: 2194, + y: 399 + }, + { + x: 2194, + y: 1217 + }, + { + x: 2139, + y: 1217 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 5148 - 4000, + y: 3133 - 2830 + }, + { + x: 6093 - 4000, + y: 3133 - 2830 + }, + { + x: 6093 - 4000, + y: 3188 - 2830 + }, + { + x: 5148 - 4000, + y: 3188 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 5061 - 4000, + y: 3263 - 2830 + }, + { + x: 5116 - 4000, + y: 3263 - 2830 + }, + { + x: 5116 - 4000, + y: 4047 - 2830 + }, + { + x: 5061 - 4000, + y: 4047 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 5149 - 4000, + y: 4097 - 2830 + }, + { + x: 6094 - 4000, + y: 4097 - 2830 + }, + { + x: 6094 - 4000, + y: 4152 - 2830 + }, + { + x: 5149 - 4000, + y: 4152 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 6191 - 4000, + y: 3133 - 2830 + }, + { + x: 6942 - 4000, + y: 3133 - 2830 + }, + { + x: 6942 - 4000, + y: 3188 - 2830 + }, + { + x: 6191 - 4000, + y: 3188 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 6139 - 4000, + y: 2378 - 2830 + }, + { + x: 6194 - 4000, + y: 2378 - 2830 + }, + { + x: 6194 - 4000, + y: 3095 - 2830 + }, + { + x: 6139 - 4000, + y: 3095 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 7060 - 4000, + y: 2340 - 2830 + }, + { + x: 7115 - 4000, + y: 2340 - 2830 + }, + { + x: 7115 - 4000, + y: 3057 - 2830 + }, + { + x: 7060 - 4000, + y: 3057 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 6189 - 4000, + y: 2291 - 2830 + }, + { + x: 7219 - 4000, + y: 2291 - 2830 + }, + { + x: 7219 - 4000, + y: 2346 - 2830 + }, + { + x: 6189 - 4000, + y: 2346 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 5061 - 4000, + y: 2488 - 2830 + }, + { + x: 5116 - 4000, + y: 2488 - 2830 + }, + { + x: 5116 - 4000, + y: 3083 - 2830 + }, + { + x: 5061 - 4000, + y: 3083 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 3259 - 4000, + y: 3097 - 2830 + }, + { + x: 5006 - 4000, + y: 3097 - 2830 + }, + { + x: 5006 - 4000, + y: 3210 - 2830 + }, + { + x: 3259 - 4000, + y: 3210 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, - Color: '#066eed80', + Color: '#00ff0080', Point: { - x: 2139, - y: 399 + x: 0, + y: 0 }, Width: 32, Border: { @@ -485,7 +1015,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 1, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -495,84 +1025,362 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV BuildingId: '5f6704859e91f4410005f55f', MultiPoint: [ { - x: 2139, - y: 399 + x: 4354 - 4000, + y: 4097 - 2830 }, { - x: 2194, - y: 399 + x: 5020 - 4000, + y: 4097 - 2830 }, { - x: 2194, - y: 1217 + x: 5020 - 4000, + y: 4152 - 2830 }, { - x: 2139, - y: 1217 + x: 4354 - 4000, + y: 4152 - 2830 }, ], TemplateId: '5e7b38610137e12020bd7f7b', FireElementId: '5e7967f30814180f1c1ecaab', - PropertyInfos: [ - { - Tag: '', - Order: 0, - Enabled: true, - Visible: true, - Required: false, - RuleName: '', - RuleValue: '', - PhysicalUnit: '', - PropertyName: '名称/编号', - PropertyType: 0, - PropertyValue: '15' - }, - { - Tag: '', - Order: 0, - Enabled: true, - Visible: true, - Required: false, - RuleName: '', - RuleValue: '', - PhysicalUnit: '', - PropertyName: '压力', - PropertyType: 0, - PropertyValue: '0.1Mpa' - }, - { - Tag: '', - Order: 0, - Enabled: true, - Visible: true, - Required: false, - RuleName: '', - RuleValue: '', - PhysicalUnit: '张', - PropertyName: '图片', - PropertyType: 4, - PropertyValue: '5' - }, - { - Tag: null, - Order: 0, - Enabled: false, - Visible: false, - Required: false, - RuleName: null, - RuleValue: null, - PhysicalUnit: null, - PropertyName: '图片', - PropertyType: 3, - PropertyValue: '/api/Objects/WebPlan2D/5f67042b9e91f4410005f55c/5f6717b48db9a325049fa975.jpg' - } + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 4273 - 4000, + y: 3936 - 2830 + }, + { + x: 4323 - 4000, + y: 3936 - 2830 + }, + { + x: 4323 - 4000, + y: 4296 - 2830 + }, + { + x: 4273 - 4000, + y: 4296 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 3193 - 4000, + y: 4241 - 2830 + }, + { + x: 4273 - 4000, + y: 4241 - 2830 + }, + { + x: 4273 - 4000, + y: 4296 - 2830 + }, + { + x: 3193 - 4000, + y: 4296 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 3193 - 4000, + y: 3936 - 2830 + }, + { + x: 4273 - 4000, + y: 3936 - 2830 + }, + { + x: 4273 - 4000, + y: 3991 - 2830 + }, + { + x: 3193 - 4000, + y: 3991 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 3109 - 4000, + y: 3936 - 2830 + }, + { + x: 3164 - 4000, + y: 3936 - 2830 + }, + { + x: 3164 - 4000, + y: 4897 - 2830 + }, + { + x: 3109 - 4000, + y: 4897 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#00ff0080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 5063 - 4000, + y: 2364 - 2830 + }, + { + x: 5611 - 4000, + y: 2291 - 2830 + }, + { + x: 6114 - 4000, + y: 2291 - 2830 + }, + { + x: 6114 - 4000, + y: 2346 - 2830 + }, + { + x: 5622 - 4000, + y: 2346 - 2830 + }, + { + x: 5137 - 4000, + y: 2475 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 + }, + { + Id: '5f6719a4e03abe3856d87d7b', + Name: '禁停区', + Angle: 0, + Color: '#ff000080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 6195 - 4000, + y: 3196 - 2830 + }, + { + x: 6910 - 4000, + y: 3196 - 2830 + }, + { + x: 6910 - 4000, + y: 4047 - 2830 + }, + { + x: 6195 - 4000, + y: 4047 - 2830 + }, ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], IsFromBuilding: true, InteractiveMode: 0 } - ; + ]; - const poly = new PolygonIcon(tempData, this); + tempData.forEach(element => { + const poly = new PolygonIcon(element, this); + }); + + + this.setNameVisible(false, GameMode.BasicInformation); } /** * 显示车辆图标 From d2221b2a3227bf974c89fb8f0b5712e60a445bf9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Tue, 22 Sep 2020 19:39:52 +0800 Subject: [PATCH 2/8] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/working-area.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 54fa75f..566907c 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -1745,6 +1745,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.backgroundImage.addChild(this.previewLineSegment); this.backgroundImage.addChild(this.rectToolGraphics); + this.rectToolGraphics.visible = false; } /** * 刷新预览线段 From 6d8c9df3a1ca985d250c2f0e03f9eac1e9bd3b60 Mon Sep 17 00:00:00 2001 From: Shaojihao <55341701@qq.com> Date: Wed, 23 Sep 2020 09:52:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=B1=BB=E4=BC=BC?= =?UTF-8?q?=E9=A2=84=E6=A1=88tree=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/collection-tools/collection-tools.component.scss | 2 ++ src/app/ui/plan/collection-tools.component.scss | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 0681dde..5015a0c 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -204,11 +204,13 @@ } .functionalDomain { flex: 98%; + overflow: hidden; .functionalDomainContent { display: flex; position: relative; width: 100%; height: 100%; + overflow: hidden; } .functionalDomainLeft { flex: 1; diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss index 435f3b1..4bacb5b 100644 --- a/src/app/ui/plan/collection-tools.component.scss +++ b/src/app/ui/plan/collection-tools.component.scss @@ -130,7 +130,7 @@ } .functionalDomain { flex: 98%; - overflow: hidden; + // overflow: hidden; .functionalDomainContent { // position: relative; width: 100%; From f8408f835b6f91097877e0444ec6bf55b57d4b98 Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Wed, 23 Sep 2020 09:53:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= 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/ui/plan-assistance/plan-assistance.component.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index b416c1e..fe84094 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -27,7 +27,7 @@ export class CanvasShareDataService { // 处置 节点 // 预案赋能 选择 车辆 - selectCar: any = {Id: '', WaterYield: '', Foam: '', PeopleNum: '', Tonnage: '', Assignment: '', LinkCar: '', WaterOccupy: ''}; + selectCar: any = {Id: '', WaterYield: '', Foam: '', PeopleNum: '', Tonnage: '', Assignment: '', LinkCar: [], WaterOccupy: []}; // 预案赋能 选择 车辆 /** diff --git a/src/app/ui/plan-assistance/plan-assistance.component.scss b/src/app/ui/plan-assistance/plan-assistance.component.scss index 78e6f57..5558547 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.scss +++ b/src/app/ui/plan-assistance/plan-assistance.component.scss @@ -135,7 +135,6 @@ align-items: center; justify-content: center; p { - color: #fff; flex: 1; text-align: center; line-height: 35px; From 0862b1b8e99a4a9d3d42356c62a75fa0ce20d0a5 Mon Sep 17 00:00:00 2001 From: Shaojihao <55341701@qq.com> Date: Wed, 23 Sep 2020 09:58:02 +0800 Subject: [PATCH 5/8] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84tree?= =?UTF-8?q?=E7=9A=84=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/plan/collection-tools.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/ui/plan/collection-tools.component.scss b/src/app/ui/plan/collection-tools.component.scss index 4bacb5b..435f3b1 100644 --- a/src/app/ui/plan/collection-tools.component.scss +++ b/src/app/ui/plan/collection-tools.component.scss @@ -130,7 +130,7 @@ } .functionalDomain { flex: 98%; - // overflow: hidden; + overflow: hidden; .functionalDomainContent { // position: relative; width: 100%; From 074179300c008f3e618ebbea6e1fc1c2410a2d15 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Wed, 23 Sep 2020 16:45:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-assistance.component.ts | 334 +++++++++--------- .../working-area/working-area.component.ts | 250 ++++++++++++- src/assets/images/举高喷射消防车.png | Bin 0 -> 3882 bytes 3 files changed, 404 insertions(+), 180 deletions(-) create mode 100644 src/assets/images/举高喷射消防车.png diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 07b884c..fdae6ff 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -27,9 +27,9 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 538.0725371265185, y: 790.8249488152024 }, - Width: 32, + Width: 45, Border: null, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -124,14 +124,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -854.3835678799273, y: 688.1144590593601 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -265,14 +265,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -539.9645631808662, y: 271.248256281619 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -367,14 +367,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -563.1123674185176, y: 272.12837517909185 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -510,14 +510,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -51.57937113008251, y: 271.9224183841443 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -653,14 +653,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 299.11560093170795, y: 5.1063714995351575 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -796,14 +796,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 500.9012712134421, y: 432.9232113342218 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -939,14 +939,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 88.60901628649833, y: -362.81780743424156 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1082,14 +1082,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1089.647824545333, y: -680.096209373906 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1225,14 +1225,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 916.5868780327887, y: -357.72777959563734 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1368,14 +1368,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1267.7987988964815, y: -374.6945390576514 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1511,14 +1511,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1507.3371984219418, y: -451.51880641310424 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1654,14 +1654,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2114.4400960509874, y: -142.24993442805783 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1797,14 +1797,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1936.2891216998387, y: 278.525700229893 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1940,14 +1940,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1656.3375905766052, y: 275.1323483374903 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2083,14 +2083,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1155.818186447188, y: -8.212534678145914 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2226,14 +2226,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2915.2711426580545, y: -347.5477239184288 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2369,14 +2369,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2913.5744667118533, y: 185.20852318881538 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2512,14 +2512,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2096.1298123494207, y: 649.4948028638328 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2655,14 +2655,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1901.6453605180648, y: 1239.3597336930006 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2798,14 +2798,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1354.5242652562279, y: 1235.0853501362674 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2941,14 +2941,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1160.7655915494565, y: 783.9050578476852 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3084,14 +3084,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 993.7723947424533, y: 1345.901393255869 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3227,14 +3227,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 577.8951065403974, y: 1345.9013932558687 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3370,14 +3370,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 126.55162198821722, y: 1029.7104791062238 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3513,14 +3513,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -179.95583881318612, y: 1030.9615299666377 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3656,14 +3656,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -435.1702143376199, y: 1028.45942824581 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3799,14 +3799,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -5.796097596718141, y: 273.14583520021273 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3903,14 +3903,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 462.9058952959447, y: 432.54246436208996 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4007,14 +4007,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1155.2026113881834, y: 36.88757093210626 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4111,14 +4111,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1218.8312292956107, y: -356.45297613199 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4215,14 +4215,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1561.5581030242533, y: -469.2491624224295 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4319,14 +4319,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1046.7447399550688, y: -664.473331002036 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4423,14 +4423,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2115.4162998093598, y: -15.172207355788942 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4527,14 +4527,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2915.112338509526, y: -292.8243582245628 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4631,14 +4631,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1988.5158013887126, y: 278.0216677369151 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4735,14 +4735,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2975.3868020413206, y: 191.2124158152834 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4839,14 +4839,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1703.0254066222362, y: 272.97200813738664 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4943,14 +4943,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2092.983870088383, y: 819.7323282038833 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5047,14 +5047,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1951.9378727440935, y: 1239.7359647402122 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5151,14 +5151,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1408.1271940944434, y: 1236.6016092436726 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5255,14 +5255,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1160.4571509862274, y: 942.5243236030998 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5359,14 +5359,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -592.1952057948927, y: 271.2807226550343 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5448,14 +5448,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -97.79605019753274, y: 272.1435484065131 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5539,14 +5539,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1150.6880828651256, y: -69.45260716773461 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5630,14 +5630,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1152.4040527919356, y: -333.2077578697689 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5721,14 +5721,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1456.632463331941, y: -431.236912377104 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5812,14 +5812,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2115.794019501953, y: -194.61481529043306 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5903,14 +5903,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2918.6189917603, y: -79.68408241976437 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5994,14 +5994,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1887.6227115969486, y: 278.62937888290867 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6085,14 +6085,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1609.5189625658177, y: 276.4352097691058 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6176,14 +6176,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2095.5215915504127, y: 596.2041604311792 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6267,14 +6267,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1851.9430767861622, y: 1238.0508628431387 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6358,14 +6358,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1286.183169018807, y: 1239.7943307666721 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6449,14 +6449,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1159.3027504423208, y: 738.1954273316667 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6540,14 +6540,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -32.3318372843471, y: 1029.7104791062238 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6631,14 +6631,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -276.2867550650558, y: 1028.4594282458097 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6719,7 +6719,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 3, Color: 0, Enabled: true, FillMode: 0, @@ -6727,8 +6727,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/水罐消防车.png', InteractiveMode: 0, @@ -6773,7 +6773,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -6781,8 +6781,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -6791,7 +6791,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '港北区解放路消防救援站', // 所属消防队 ReachTime: 0, // 到场剩余时间 WaterYield: '10t', // 载水量 @@ -6827,7 +6827,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -6835,8 +6835,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -6845,7 +6845,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '港北区解放路消防救援站', // 所属消防队 ReachTime: 0, // 到场剩余时间 WaterYield: '4t', // 载水量 @@ -6889,10 +6889,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), - ImageUrl: './assets/images/压缩空气泡沫消防车.png', + ImageUrl: './assets/images/举高喷射消防车.png', InteractiveMode: 0, MultiPoint: null, Point: { @@ -6935,7 +6935,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 3, Color: 0, Enabled: true, FillMode: 0, @@ -6943,8 +6943,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/水罐消防车.png', InteractiveMode: 0, @@ -6989,7 +6989,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -6997,8 +6997,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7007,7 +7007,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '八塘消防救援站', // 所属消防队 ReachTime: 249, // 到场剩余时间 WaterYield: '6t', // 载水量 @@ -7043,7 +7043,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7051,8 +7051,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7061,7 +7061,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '八塘消防救援站', // 所属消防队 ReachTime: 277, // 到场剩余时间 WaterYield: '3t', // 载水量 @@ -7105,10 +7105,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), - ImageUrl: './assets/images/压缩空气泡沫消防车.png', + ImageUrl: './assets/images/举高喷射消防车.png', InteractiveMode: 0, MultiPoint: null, Point: { @@ -7151,7 +7151,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7159,8 +7159,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7169,7 +7169,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '龚州消防救援站', // 所属消防队 ReachTime: 666, // 到场剩余时间 WaterYield: '6t', // 载水量 @@ -7205,7 +7205,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7213,8 +7213,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7223,7 +7223,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '龚州消防救援站', // 所属消防队 ReachTime: 721, // 到场剩余时间 WaterYield: '5t', // 载水量 @@ -7259,7 +7259,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7267,8 +7267,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7277,7 +7277,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '龚州消防救援站', // 所属消防队 ReachTime: 978, // 到场剩余时间 WaterYield: '3t', // 载水量 @@ -7321,10 +7321,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), - ImageUrl: './assets/images/压缩空气泡沫消防车.png', + ImageUrl: './assets/images/举高喷射消防车.png', InteractiveMode: 0, MultiPoint: null, Point: { @@ -7364,6 +7364,11 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { } ]; + bottomIsShow = false; // 底部车辆信息是否展示 + rightIsShow = true; // 右侧楼层是否展示 + rightSayIsShow = false; // 右侧语音是否展示 + selectCarID = ''; // 选中车辆ID 选中效果css + ngOnInit(): void { const that = this; window.setTimeout(() => { @@ -7382,11 +7387,11 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { this.workingArea.on('select', obj => { // 选中素材属性注入函数 if (obj && obj.assetData && obj.assetData.ReachTime != undefined) { - this.selectCarID = JSON.parse(JSON.stringify( obj.assetData.Id || '' )); //选中样式 赋值ID - let linkCar = this.canvasData.getLinkCarName(obj) //连接车辆 - let waterOccupy = this.canvasData.getWaterOccupyName(obj) //水源占用 - obj.assetData.LinkCar = linkCar //连接车辆 - obj.assetData.WaterOccupy = waterOccupy //水源占用 + this.selectCarID = JSON.parse(JSON.stringify( obj.assetData.Id || '' )); // 选中样式 赋值ID + const linkCar = this.canvasData.getLinkCarName(obj); // 连接车辆 + const waterOccupy = this.canvasData.getWaterOccupyName(obj); // 水源占用 + obj.assetData.LinkCar = linkCar; // 连接车辆 + obj.assetData.WaterOccupy = waterOccupy; // 水源占用 this.canvasData.selectCar = obj.assetData; this.bottomIsShow = true; } @@ -7398,11 +7403,6 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }); } - bottomIsShow:boolean = false; // 底部车辆信息是否展示 - rightIsShow:boolean = true; // 右侧楼层是否展示 - rightSayIsShow:boolean = false; // 右侧语音是否展示 - selectCarID:string = ''; // 选中车辆ID 选中效果css - // 开始绘制 plot(e) { e == 0 ? this.workingArea.beginPaintingArrows() : this.workingArea.beginPaintPipeline(); diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 566907c..6eac99c 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, ElementRef, ViewChild, AfterViewInit, Input } from ' import * as PIXI from 'pixi.js'; import { EventEmitter } from 'events'; import { EventManager } from '@angular/platform-browser'; -import { OutlineFilter } from 'pixi-filters'; +import { OutlineFilter, OldFilmFilter } from 'pixi-filters'; import { CanvasShareDataService, GameMode } from '../canvas-share-data.service'; import {CacheTokenService} from '../http-interceptors/cache-token.service'; // 引入自动登录 获取token服务 import * as ObjectID from 'bson-objectid'; @@ -60,7 +60,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 绘画模式 */ - public paintMode: PaintMode; + private paintMode: PaintMode; /** * 选择器 */ @@ -122,6 +122,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV public animation; public animationIcon; public animationTime; + // 车辆作业面 + public carAreas: PolygonIcon[]; + // 车辆数据 + public carData: Map = new Map(); + // 当前选择的车辆id + public selectCar: any = null; // 根据ID 找到数据 // 是否登录 @@ -237,7 +243,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param icon 移动到选中车辆到屏幕中心点 */ public moveIconToScreenCenter(icon) { - if (icon.parent === this.backgroundImage && icon.assetData.Type === 1) { + if (icon.parent === this.backgroundImage && icon.assetData.Type !== 0) { console.log(this.backgroundImage.position); this.backgroundImage.pivot.set(icon.x, icon.y); this.backgroundImage.position.set(771, 404); @@ -304,6 +310,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } }); this.on('backgroundScale', scale => { + this.previewSinglePointIcon.scale.set(1 / this.backgroundImage.scale.x); this.backgroundImage.children.forEach(item => { if (item instanceof SinglePointIcon) { if (item.assetData.FixedSize) { @@ -463,11 +470,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV const single = new SinglePointIcon(element, this); }); - const tempData = [ + const putCarAreaData = [ { Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -521,6 +529,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -574,6 +583,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -627,6 +637,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -680,6 +691,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -733,6 +745,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -786,6 +799,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -839,6 +853,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -892,6 +907,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -945,6 +961,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -998,6 +1015,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1051,6 +1069,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1104,6 +1123,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1157,6 +1177,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1210,6 +1231,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1263,6 +1285,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1320,10 +1343,13 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV IsFromBuilding: true, InteractiveMode: 0 }, + ]; + const tempCarAreaData = [ { Id: '5f6719a4e03abe3856d87d7b', Name: '禁停区', Angle: 0, + Type: [1, 2, 3, 4], Color: '#ff000080', Point: { x: 0, @@ -1372,13 +1398,75 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV PropertyInfos: [], IsFromBuilding: true, InteractiveMode: 0 + }, { + Id: '5f6719a4e03abe3856d87d7b', + Name: '禁停区', + Angle: 0, + Type: [1], + Color: '#ff000080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 5149 - 4000, + y: 4097 - 2830 + }, + { + x: 6094 - 4000, + y: 4097 - 2830 + }, + { + x: 6094 - 4000, + y: 4152 - 2830 + }, + { + x: 5149 - 4000, + y: 4152 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 } ]; - tempData.forEach(element => { - const poly = new PolygonIcon(element, this); + putCarAreaData.forEach(element => { + const poly = new PutCarArea(element, this); + poly.visible = false; }); + tempCarAreaData.forEach(element => { + const poly = new PutCarArea(element, this); + poly.visible = false; + poly.polygonGraphics.interactive = false; + }); + + + this.setNameVisible(false, GameMode.BasicInformation); } @@ -1387,10 +1475,51 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param data */ public ShowCarIcon(data: any) { + + this.carData.set(data.Id, data); + + const carButton = PIXI.Sprite.from(data.ImageUrl); + carButton.name = data.Id; + carButton.buttonMode = true; + carButton.interactive = true; + carButton + .on('pointerdown', (event) => { + if (this.paintMode !== PaintMode.Car) { + this.setPaintMode(PaintMode.Car); + this.selectCar = this.carData.get(event.currentTarget.name); + event.currentTarget.name = ''; + event.currentTarget.visible = false; + this.previewSinglePointIcon.texture = PIXI.Texture.from(data.ImageUrl); + this.previewSinglePointIcon.visible = true; + this.previewSinglePointIcon.scale.set(1 / this.backgroundImage.scale.x); + this.backgroundImage.children.forEach(item => { + if (item instanceof PutCarArea) { + if (item.assetData.Type.indexOf(this.selectCar.Type) !== -1) { + item.visible = true; + } else { + item.visible = false; + } + } + }); + } + }) + .on('pointerup', (event) => { + + }) + .on('pointerupoutside', (event) => { + + }) + .on('pointerover', (event) => { + + }) + .on('pointerout', (event) => { + + }); + + + carButton.setParent(this.app.stage); + carButton.position.set(25, this.count * 65); this.count++; - const tempCar2 = new Car(data, this); - tempCar2.setParent(this.app.stage); - tempCar2.position.set(25, this.count * 25); } /** * @@ -1625,6 +1754,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.paintMode = PaintMode.endPaint; } break; + case PaintMode.Car: + // console.log('创建车辆'); + break; } } else if (!event.currentTarget.dragging && this.selection.isMultiselection === true) { this.rectToolGraphics.visible = true; @@ -1672,6 +1804,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV event.stopPropagation(); this.cancelPaint(); this.selection.deselectAll(); + }) + .on('pointerover', (event) => { + this.previewSinglePointIcon.filters = [new OldFilmFilter()]; + }) + .on('pointerout', (event) => { + this.previewSinglePointIcon.filters = null; }); this.app.stage.addChild(this.backgroundImage); @@ -1723,7 +1861,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.previewSinglePointIcon = PIXI.Sprite.from('assets/images/noImg.png'); this.previewSinglePointIcon.width = 32; this.previewSinglePointIcon.height = 32; - this.previewSinglePointIcon.alpha = 0.5; + this.previewSinglePointIcon.alpha = 1; this.previewSinglePointIcon.anchor.set(0.5); this.previewSinglePointIcon.visible = false; this.backgroundImage.addChild(this.previewSinglePointIcon); @@ -1856,6 +1994,32 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV break; } } + /** + * 设置绘制状态 + * @param mode 状态 + */ + public setPaintMode(mode: PaintMode) { + this.reset(); + this.paintMode = mode; + switch (mode) { + case PaintMode.Car: + + break; + } + } + /** + * 获取绘制状态 + */ + public getPaintMode(): PaintMode { + return this.paintMode; + } + /** + * 重置 + */ + public reset() { + this.previewSinglePointIcon.filters = null; + this.previewSinglePointIcon.visible = false; + } /** * 确认绘制 */ @@ -1972,7 +2136,8 @@ enum PaintMode { polygonIcon, endPaint, Pipeline, - Arrows + Arrows, + Car } /** * 单点图标 @@ -2023,7 +2188,7 @@ export class SinglePointIcon extends PIXI.Container { event.stopPropagation(); this.workingArea.selection.selectOne(this); if (this.assetData.CanConnection && this.parent === this.workingArea.backgroundImage) { - if (this.workingArea.paintMode === PaintMode.Pipeline) { + if (this.workingArea.getPaintMode() === PaintMode.Pipeline) { if (this.workingArea.paintingPipeline === null) { this.workingArea.previewLineSegment.visible = true; this.workingArea.currentClickPoint.position = @@ -2612,8 +2777,54 @@ export class PolygonIcon extends PIXI.Container { this.polygonGraphics.endFill(); } } -export class Car extends SinglePointIcon { +/** + * 汽车放置区域 + */ +export class PutCarArea extends PIXI.Container { + public polygonGraphics: PIXI.Graphics = new PIXI.Graphics(); + constructor(public assetData: any, private workingArea: WorkingAreaComponent) { + super(); + this.name = this.assetData.Id; + this.x = this.assetData.Point.x; + this.y = this.assetData.Point.y; + this.workingArea.backgroundImage.addChild(this); + this.sortableChildren = true; + + // 填充多边形 + const color: number = this.assetData.Color.substring(0, 7).replace('#', '0x'); + const angle: number = parseInt(this.assetData.Color.substring(7), 16) / 255; + this.polygonGraphics.beginFill(color, angle); + this.polygonGraphics.drawPolygon(this.assetData.MultiPoint); + this.polygonGraphics.endFill(); + this.addChild(this.polygonGraphics); + // 添加选中事件 + this.polygonGraphics.interactive = true; + this.polygonGraphics + .on('pointerdown', (event) => { + if (this.workingArea.getPaintMode() === PaintMode.Car) { + this.workingArea.selectCar.Point = + new PIXI.Point(this.workingArea.previewSinglePointIcon.x, this.workingArea.previewSinglePointIcon.y); + const car = new SinglePointIcon(this.workingArea.selectCar, this.workingArea); + this.workingArea.setPaintMode(PaintMode.endPaint); + } + }) + .on('pointerup', (event) => { + + }) + .on('pointerupoutside', (event) => { + + }) + .on('pointerover', (event) => { + this.workingArea.previewSinglePointIcon.filters = null; + this.workingArea.previewSinglePointIcon.zIndex = this.zIndex + 1; + }) + .on('pointerout', (event) => { + this.workingArea.previewSinglePointIcon.filters = [ + new OldFilmFilter() + ]; + }); + } } /** * 管线 @@ -2707,6 +2918,9 @@ export class Arrows extends PIXI.Container { this.line.endFill(); } } + + + /** * 选择器 */ @@ -2847,3 +3061,13 @@ export class PropertyInfo { */ public PropertyValue: string; } +/** + * 车辆类型 + */ +export enum Type { + 水源 = 0, + 举高喷射消防车 = 1, + 泡沫消防车 = 2, + 水罐消防车 = 3, + 压缩空气泡沫消防车 = 4 +} diff --git a/src/assets/images/举高喷射消防车.png b/src/assets/images/举高喷射消防车.png new file mode 100644 index 0000000000000000000000000000000000000000..a4bc71b478a911a84f6808c006a93a57bd264c37 GIT binary patch literal 3882 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 literal 0 HcmV?d00001 From 29f2c6d95fcf52dfea1812d84ae4b813a3807f36 Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Wed, 23 Sep 2020 16:48:31 +0800 Subject: [PATCH 7/8] [] --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ce0c2e7..41fa697 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -# AX.Angular4PlanPlatform +智能实战指挥平台-前端项目 -上海数字化预案编制管理平台前端项目。此项目在 Angular 框架基础上编写。 - -后续开发都基于此。 + ---广西 演示 项目初始化：npm install From 1df6b615e65d90c596a15d2b8a0c0cbeb822efb6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Wed, 23 Sep 2020 16:54:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=AE=BE=E7=BD=AE=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/working-area.component.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 6eac99c..4b1664c 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -2002,8 +2002,17 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.reset(); this.paintMode = mode; switch (mode) { - case PaintMode.Car: - + case PaintMode.endPaint: + this.selectCar = null; + this.backgroundImage.children.forEach(item => { + if (item instanceof PutCarArea) { + if (item.assetData.Type.indexOf(this.selectCar?.Type) !== -1) { + item.visible = true; + } else { + item.visible = false; + } + } + }); break; } }