From 230870e1bbba33b666fb2ce25e0ff021a1db1393 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Tue, 22 Sep 2020 10:39:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=20=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=B1=82=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-assistance.component.ts | 162 +++++++++--------- .../working-area/working-area.component.ts | 8 +- 2 files changed, 87 insertions(+), 83 deletions(-) diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 2d263f5..6986207 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -10,7 +10,7 @@ import * as ObjectID from 'bson-objectid'; styleUrls: ['./plan-assistance.component.scss'] }) export class PlanAssistanceComponent implements OnInit, AfterViewInit { - constructor(public canvasData: CanvasShareDataService,public snackBar: MatSnackBar,) { } + constructor(public canvasData: CanvasShareDataService, public snackBar: MatSnackBar, ) { } @ViewChild('workingArea') workingArea: WorkingAreaComponent; @@ -32,7 +32,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7c0ff1bb3cf106508afaed.png', FixedSize: false, CanConnection: true, @@ -132,7 +132,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', FixedSize: false, CanConnection: true, @@ -271,7 +271,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', FixedSize: false, CanConnection: true, @@ -371,7 +371,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -512,7 +512,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -653,7 +653,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -794,7 +794,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -935,7 +935,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1076,7 +1076,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1217,7 +1217,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1358,7 +1358,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1499,7 +1499,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1640,7 +1640,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1781,7 +1781,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -1922,7 +1922,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2063,7 +2063,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2204,7 +2204,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2345,7 +2345,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2486,7 +2486,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2627,7 +2627,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2768,7 +2768,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -2909,7 +2909,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3050,7 +3050,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3191,7 +3191,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3332,7 +3332,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3473,7 +3473,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3614,7 +3614,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3755,7 +3755,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3857,7 +3857,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -3959,7 +3959,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4061,7 +4061,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4163,7 +4163,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4265,7 +4265,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4367,7 +4367,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4469,7 +4469,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4571,7 +4571,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4673,7 +4673,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4775,7 +4775,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4877,7 +4877,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -4979,7 +4979,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5081,7 +5081,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5183,7 +5183,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5285,7 +5285,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', FixedSize: false, CanConnection: true, @@ -5372,7 +5372,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5461,7 +5461,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5550,7 +5550,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5639,7 +5639,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5728,7 +5728,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5817,7 +5817,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5906,7 +5906,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -5995,7 +5995,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6084,7 +6084,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6173,7 +6173,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6262,7 +6262,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6351,7 +6351,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6440,7 +6440,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6529,7 +6529,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, FillMode: 1, - GameMode: 2, + GameMode: 0, ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', CompanyId: '5f67042b9e91f4410005f55c', FixedSize: false, @@ -6640,7 +6640,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { DrawMode: null, Thickness: 0, IsFromBuilding: false, - GameMode: 2 + GameMode: 0 }; // 所有车辆信息 @@ -7266,14 +7266,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { this.dataInit(); // 监听canvas组件选中素材事件 - this.workingArea.on("select",obj=>{ - //选中素材属性注入函数 - this.selectCar(obj.assetData) - }) + this.workingArea.on('select', obj => { + // 选中素材属性注入函数 + this.selectCar(obj.assetData); + }); // 监听canvas组件取消选中素材事件 - this.workingArea.on("deselect",obj=>{ + this.workingArea.on('deselect', obj => { this.bottomIsShow = false; - }) + }); } // 开始绘制 @@ -7288,29 +7288,29 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }); } - //倒计时结束 - 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); } else { - item.ReachTime=e.left/1000 + item.ReachTime = e.left / 1000; } } - //选择 车辆 - selectCar (e) { + // 选择 车辆 + selectCar(e) { if (e.ReachTime == 0) { - this.canvasData.selectCar = e - this.bottomIsShow = true - let list = [] - list.push(e.Id) - this.workingArea.setHighlight(list) + this.canvasData.selectCar = e; + this.bottomIsShow = true; + const list = []; + list.push(e.Id); + this.workingArea.setHighlight(list); } else { - let config = new MatSnackBarConfig(); + const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('车辆目前未到场','确定',config); + config.duration = 3000; + this.snackBar.open('车辆目前未到场', '确定', config); } } diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 1c9b6ee..b6a977b 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -251,6 +251,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV // this.createEnterPaintEndButton(); // this.backgroundImage.addChild(this.paintingLine); this.on('select', obj => { + console.log('选择了' + obj); if (this.allowEdit) { if (obj instanceof MultipointIcon) { obj.setPointVisiable(true); @@ -373,7 +374,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV public setHighlight(ids: string[]): void { this.selection.deselectAll(); ids.forEach(item => { - const obj = this.backgroundImage.getChildByName(item); + let obj = this.backgroundImage.getChildByName(item); + if (obj === null) { + obj = this.app.stage.getChildByName(item); + } this.selection.select(obj); }); } @@ -431,7 +435,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV const single = new SinglePointIcon(element, this); }); - // this.setNameVisible(false, GameMode.BasicInformation); + this.setNameVisible(false, GameMode.BasicInformation); const tempData = { Id: '5f6719a4e03abe3856d87d7b', From 2ec59ff55225609700814536c44782dfa30f930f Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Tue, 22 Sep 2020 10:39:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=AD=BB=E5=BE=AA=E7=8E=AFBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/plan-assistance/plan-assistance.component.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 2d263f5..0696e2e 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -7268,10 +7268,11 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { // 监听canvas组件选中素材事件 this.workingArea.on("select",obj=>{ //选中素材属性注入函数 - this.selectCar(obj.assetData) + this.selectCar(obj.assetData,false) }) // 监听canvas组件取消选中素材事件 this.workingArea.on("deselect",obj=>{ + this.canvasData.selectCar.Id = '' this.bottomIsShow = false; }) } @@ -7299,13 +7300,13 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { } //选择 车辆 - selectCar (e) { + selectCar (e,isSelect:boolean = true) { if (e.ReachTime == 0) { this.canvasData.selectCar = e this.bottomIsShow = true let list = [] list.push(e.Id) - this.workingArea.setHighlight(list) + isSelect? this.workingArea.setHighlight(list) : null } else { let config = new MatSnackBarConfig(); config.verticalPosition = 'top'; From 1e6c24a659a2b8e50902429fe75cb33a5ca9ecb9 Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Tue, 22 Sep 2020 10:56:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/plan-assistance/plan-assistance.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 374b066..3be1da7 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -7272,7 +7272,6 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }) // 监听canvas组件取消选中素材事件 this.workingArea.on("deselect",obj=>{ - this.canvasData.selectCar.Id = '' this.bottomIsShow = false; }); } From 49446d7f109b243f5b5806dca71f37e38093daf8 Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Tue, 22 Sep 2020 11:03:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD=E5=9B=BE=E6=A0=87BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/plan-assistance/plan-assistance.component.html | 2 +- src/app/ui/plan-assistance/plan-assistance.component.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/ui/plan-assistance/plan-assistance.component.html b/src/app/ui/plan-assistance/plan-assistance.component.html index 2096958..8e9cf2c 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.html +++ b/src/app/ui/plan-assistance/plan-assistance.component.html @@ -3,7 +3,7 @@
{{item.Name}}
{{item.FireTeamName}}
diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 3be1da7..a3db338 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -7250,6 +7250,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { bottomIsShow = false; // 底部车辆信息是否展示 rightIsShow = true; // 右侧楼层是否展示 rightSayIsShow = false; // 右侧语音是否展示 + selectCarID:string = ''; // 选中车辆 样式 ngOnInit(): void { const that = this; @@ -7273,6 +7274,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { // 监听canvas组件取消选中素材事件 this.workingArea.on("deselect",obj=>{ this.bottomIsShow = false; + this.selectCarID = '' }); } @@ -7302,6 +7304,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { selectCar (e,isSelect:boolean = true) { if (e.ReachTime == 0) { this.canvasData.selectCar = e + this.selectCarID = JSON.parse(JSON.stringify( e.Id )) this.bottomIsShow = true let list = [] list.push(e.Id) From 11eb9f75ec67b343c565e6e0a0b2c44240450703 Mon Sep 17 00:00:00 2001 From: baozwreal-cases works!
+单位名称 | +始建于 | +着火物 | +点火位置 | +相近度 | +详情 | + + +
{{leisi.danweiName}} | +{{leisi.year}} | +{{leisi.zhoahuo}} | +{{leisi.weizhi}} | +=50&&leisi.xiangjin<=60,'tdyanse78':leisi.xiangjin>60,'tdyanse':leisi.xiangjin<50}">{{leisi.xiangjin}}% | +查看详情 | +