From f8c64ec6ed284df59a3d7b64a2b2e57ac2bce6ad Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Tue, 22 Sep 2020 09:46:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-assistance.component.ts | 306 +++++++++--------- .../working-area/working-area.component.ts | 119 ++++++- 2 files changed, 270 insertions(+), 155 deletions(-) diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index ccc2bab..b8cdcb0 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -31,7 +31,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7c0ff1bb3cf106508afaed.png', FixedSize: false, CanConnection: true, @@ -131,7 +131,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', FixedSize: false, CanConnection: true, @@ -270,7 +270,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', FixedSize: false, CanConnection: true, @@ -370,7 +370,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -511,7 +511,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -652,7 +652,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -793,7 +793,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -934,7 +934,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1075,7 +1075,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1216,7 +1216,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1357,7 +1357,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1498,7 +1498,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1639,7 +1639,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1780,7 +1780,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1921,7 +1921,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2062,7 +2062,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2203,7 +2203,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2344,7 +2344,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2485,7 +2485,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2626,7 +2626,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2767,7 +2767,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2908,7 +2908,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3049,7 +3049,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3190,7 +3190,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3331,7 +3331,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3472,7 +3472,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3613,7 +3613,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3754,7 +3754,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3856,7 +3856,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3958,7 +3958,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4060,7 +4060,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4162,7 +4162,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4264,7 +4264,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4366,7 +4366,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4468,7 +4468,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4570,7 +4570,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4672,7 +4672,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4774,7 +4774,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4876,7 +4876,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4978,7 +4978,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5080,7 +5080,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5182,7 +5182,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5284,7 +5284,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', FixedSize: false, CanConnection: true, @@ -5371,7 +5371,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5460,7 +5460,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5549,7 +5549,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5638,7 +5638,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5727,7 +5727,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5816,7 +5816,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5905,7 +5905,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5994,7 +5994,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6083,7 +6083,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6172,7 +6172,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6261,7 +6261,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6350,7 +6350,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6439,7 +6439,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6528,7 +6528,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 0, + GameMode: 2, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6864,15 +6864,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '水罐消防车', - FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 240, //到场剩余时间 - WaterYield: '12t',//载水量 - Foam: '0t', //载泡沫 - PeopleNum: 6, //载人数 - Tonnage: '14t', //吨位 - Assignment: '冷却', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '八塘消防救援站', // 所属消防队 + ReachTime: 240, // 到场剩余时间 + WaterYield: '12t', // 载水量 + Foam: '0t', // 载泡沫 + PeopleNum: 6, // 载人数 + Tonnage: '14t', // 吨位 + Assignment: '冷却', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -6914,15 +6914,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '水罐泡沫消防车', - FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 240, //到场剩余时间 - WaterYield: '6t',//载水量 - Foam: '2t', //载泡沫 - PeopleNum: 6, //载人数 - Tonnage: '8t', //吨位 - Assignment: '冷却', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '八塘消防救援站', // 所属消防队 + ReachTime: 240, // 到场剩余时间 + WaterYield: '6t', // 载水量 + Foam: '2t', // 载泡沫 + PeopleNum: 6, // 载人数 + Tonnage: '8t', // 吨位 + Assignment: '冷却', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -6964,15 +6964,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '水罐泡沫消防车', - FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 240, //到场剩余时间 - WaterYield: '3t',//载水量 - Foam: '1t', //载泡沫 - PeopleNum: 8, //载人数 - Tonnage: '5t', //吨位 - Assignment: '堵截', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '八塘消防救援站', // 所属消防队 + ReachTime: 240, // 到场剩余时间 + WaterYield: '3t', // 载水量 + Foam: '1t', // 载泡沫 + PeopleNum: 8, // 载人数 + Tonnage: '5t', // 吨位 + Assignment: '堵截', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -7014,15 +7014,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '举高喷射消防车', - FireTeamName: '八塘消防救援站', //所属消防队 - ReachTime: 300, //到场剩余时间 - WaterYield: '16t',//载水量 - Foam: '2t', //载泡沫 - PeopleNum: 4, //载人数 - Tonnage: '18t', //吨位 - Assignment: '灭火', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '八塘消防救援站', // 所属消防队 + ReachTime: 300, // 到场剩余时间 + WaterYield: '16t', // 载水量 + Foam: '2t', // 载泡沫 + PeopleNum: 4, // 载人数 + Tonnage: '18t', // 吨位 + Assignment: '灭火', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -7064,15 +7064,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '水罐泡沫消防车', - FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 660, //到场剩余时间 - WaterYield: '6t',//载水量 - Foam: '2t', //载泡沫 - PeopleNum: 6, //载人数 - Tonnage: '8t', //吨位 - Assignment: '供液', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '龚州消防救援站', // 所属消防队 + ReachTime: 660, // 到场剩余时间 + WaterYield: '6t', // 载水量 + Foam: '2t', // 载泡沫 + PeopleNum: 6, // 载人数 + Tonnage: '8t', // 吨位 + Assignment: '供液', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -7114,15 +7114,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '水罐泡沫消防车', - FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 720, //到场剩余时间 - WaterYield: '5t',//载水量 - Foam: '1t', //载泡沫 - PeopleNum: 6, //载人数 - Tonnage: '7t', //吨位 - Assignment: '供液', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '龚州消防救援站', // 所属消防队 + ReachTime: 720, // 到场剩余时间 + WaterYield: '5t', // 载水量 + Foam: '1t', // 载泡沫 + PeopleNum: 6, // 载人数 + Tonnage: '7t', // 吨位 + Assignment: '供液', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -7164,15 +7164,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '水罐泡沫消防车', - FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 960, //到场剩余时间 - WaterYield: '3t',//载水量 - Foam: '1t', //载泡沫 - PeopleNum: 6, //载人数 - Tonnage: '5t', //吨位 - Assignment: '供液', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '龚州消防救援站', // 所属消防队 + ReachTime: 960, // 到场剩余时间 + WaterYield: '3t', // 载水量 + Foam: '1t', // 载泡沫 + PeopleNum: 6, // 载人数 + Tonnage: '5t', // 吨位 + Assignment: '供液', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -7214,15 +7214,15 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { y: 1237 }, Name: '举高喷射消防车', - FireTeamName: '龚州消防救援站', //所属消防队 - ReachTime: 960, //到场剩余时间 - WaterYield: '18t',//载水量 - Foam: '2t', //载泡沫 - PeopleNum: 4, //载人数 - Tonnage: '20t', //吨位 - Assignment: '灭火', //执行任务 - LinkCar: '', //连接车辆 - WaterOccupy: '', //水源占用 + FireTeamName: '龚州消防救援站', // 所属消防队 + ReachTime: 960, // 到场剩余时间 + WaterYield: '18t', // 载水量 + Foam: '2t', // 载泡沫 + PeopleNum: 4, // 载人数 + Tonnage: '20t', // 吨位 + Assignment: '灭火', // 执行任务 + LinkCar: '', // 连接车辆 + WaterOccupy: '', // 水源占用 PropertyInfos: [ { Enabled: true, @@ -7246,6 +7246,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { } ]; + bottomIsShow = false; // 底部车辆信息是否展示 + rightIsShow = true; // 右侧楼层是否展示 + rightSayIsShow = false; // 右侧语音是否展示 + ngOnInit(): void { const that = this; window.setTimeout(() => { @@ -7258,43 +7262,39 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { ngAfterViewInit(): void { this.workingArea.loadDemoScene(this.demoData, 0.149); - this.dataInit() + this.dataInit(); } - - bottomIsShow:boolean = false; // 底部车辆信息是否展示 - rightIsShow:boolean = true; // 右侧楼层是否展示 - rightSayIsShow:boolean = false; // 右侧语音是否展示 // 开始绘制 plot(e) { - e == 0? this.workingArea.beginPaintingArrows() : this.workingArea.beginPaintingArrows() + e == 0 ? this.workingArea.beginPaintingArrows() : this.workingArea.beginPaintPipeline(); } - //到场车辆初始化 - dataInit () { - this.allCarsData.forEach(item=>{ - item.ReachTime==0? this.workingArea.ShowCarIcon(item) : null - }) + // 到场车辆初始化 + dataInit() { + this.allCarsData.forEach(item => { + item.ReachTime == 0 ? this.workingArea.ShowCarIcon(item) : null; + }); } - //倒计时结束 - handleEvent (e,item) { - if (e.left==0) { - item.ReachTime=0 - this.workingArea.ShowCarIcon(item) + // 倒计时结束 + handleEvent(e, item) { + if (e.left == 0) { + item.ReachTime = 0; + this.workingArea.ShowCarIcon(item); } } - //选择 车辆 - selectCar (e) { - console.log(e) - this.canvasData.selectCar = e - this.bottomIsShow = true + // 选择 车辆 + selectCar(e) { + console.log(e); + this.canvasData.selectCar = e; + this.bottomIsShow = true; } - //关闭 底部车辆信息 - closeBottom () { - this.bottomIsShow = false + // 关闭 底部车辆信息 + closeBottom() { + this.bottomIsShow = false; } // 打开 右侧楼层 diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 6abf698..3027b2f 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -429,7 +429,118 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV list.forEach(element => { const single = new SinglePointIcon(element, this); }); - this.setNameVisible(false, GameMode.BasicInformation); + + // this.setNameVisible(false, GameMode.BasicInformation); + + const tempData = { + Id: '5f6719a4e03abe3856d87d7b', + Name: '作业面', + Angle: 0, + Color: '#066eed80', + Point: { + x: 2139, + y: 399 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 1, + 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: [ + { + 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' + } + ], + IsFromBuilding: true, + InteractiveMode: 0 + } + ; + + const poly = new PolygonIcon(tempData, this); } /** * 显示车辆图标 @@ -859,7 +970,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 开始绘制管线 */ - private beginPaintPipeline(): void { + public beginPaintPipeline(): void { this.paintMode = PaintMode.Pipeline; } public paintingPipelineFinish(): void { @@ -1157,6 +1268,10 @@ export class SinglePointIcon extends PIXI.Container { this.text.y = this.image.y - this.image.height / 2; this.text.anchor.set(0.5, 1); + if (this.assetData.GameMode === 2) { + this.text.visible = false; + } + this.addChild(this.text); this.addChild(this.image); }