shaojiahao
/
TheCommandPlatform-Anxin
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[合并] 合并代码

develop
陈鹏飞 4 years ago
parent
2ec59ff552 230870e1bb
commit
2a5b9c0ace
2 changed files with 75 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 138
      src/app/ui/plan-assistance/plan-assistance.component.ts
  2. 8
      src/app/working-area/working-area.component.ts

138
src/app/ui/plan-assistance/plan-assistance.component.ts
Unescape View File

@ -10,7 +10,7 @@ import * as ObjectID from 'bson-objectid';
styleUrls: ['./plan-assistance.component.scss'] styleUrls: ['./plan-assistance.component.scss']
}) })
export class PlanAssistanceComponent implements OnInit, AfterViewInit { export class PlanAssistanceComponent implements OnInit, AfterViewInit {
constructor(public canvasData: CanvasShareDataService,public snackBar: MatSnackBar,) { } constructor(public canvasData: CanvasShareDataService, public snackBar: MatSnackBar, ) { }
@ViewChild('workingArea') @ViewChild('workingArea')
workingArea: WorkingAreaComponent; workingArea: WorkingAreaComponent;
@ -32,7 +32,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7c0ff1bb3cf106508afaed.png', ImageUrl: '/api/Objects/PlanPlatform/5e7c0ff1bb3cf106508afaed.png',
FixedSize: false, FixedSize: false,
CanConnection: true, CanConnection: true,
@ -132,7 +132,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
FixedSize: false, FixedSize: false,
CanConnection: true, CanConnection: true,
@ -271,7 +271,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
FixedSize: false, FixedSize: false,
CanConnection: true, CanConnection: true,
@ -371,7 +371,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -512,7 +512,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -653,7 +653,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -794,7 +794,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -935,7 +935,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -1076,7 +1076,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -1217,7 +1217,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -1358,7 +1358,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -1499,7 +1499,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -1640,7 +1640,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -1781,7 +1781,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -1922,7 +1922,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -2063,7 +2063,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -2204,7 +2204,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -2345,7 +2345,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -2486,7 +2486,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -2627,7 +2627,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -2768,7 +2768,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -2909,7 +2909,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3050,7 +3050,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3191,7 +3191,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3332,7 +3332,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3473,7 +3473,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3614,7 +3614,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png', ImageUrl: '/api/Objects/PlanPlatform/5e7aaebaefc8471c94ff19eb.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3755,7 +3755,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3857,7 +3857,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -3959,7 +3959,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4061,7 +4061,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4163,7 +4163,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4265,7 +4265,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4367,7 +4367,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4469,7 +4469,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4571,7 +4571,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4673,7 +4673,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4775,7 +4775,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4877,7 +4877,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -4979,7 +4979,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5081,7 +5081,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5183,7 +5183,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b3a628121c2286c0cb294.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5285,7 +5285,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
FixedSize: false, FixedSize: false,
CanConnection: true, CanConnection: true,
@ -5372,7 +5372,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5461,7 +5461,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5550,7 +5550,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5639,7 +5639,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5728,7 +5728,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5817,7 +5817,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5906,7 +5906,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -5995,7 +5995,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -6084,7 +6084,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -6173,7 +6173,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -6262,7 +6262,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -6351,7 +6351,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -6440,7 +6440,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -6529,7 +6529,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
FloorId: '5f670bb79e91f4410005f564', FloorId: '5f670bb79e91f4410005f564',
DrawMode: 0, DrawMode: 0,
FillMode: 1, FillMode: 1,
GameMode: 2, GameMode: 0,
ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png',
CompanyId: '5f67042b9e91f4410005f55c', CompanyId: '5f67042b9e91f4410005f55c',
FixedSize: false, FixedSize: false,
@ -6640,7 +6640,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
DrawMode: null, DrawMode: null,
Thickness: 0, Thickness: 0,
IsFromBuilding: false, IsFromBuilding: false,
GameMode: 2 GameMode: 0
}; };
// 所有车辆信息 // 所有车辆信息
@ -7274,7 +7274,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
this.workingArea.on("deselect",obj=>{ this.workingArea.on("deselect",obj=>{
this.canvasData.selectCar.Id = '' this.canvasData.selectCar.Id = ''
this.bottomIsShow = false; this.bottomIsShow = false;
}) });
} }
// 开始绘制 // 开始绘制
@ -7289,13 +7289,13 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
}); });
} }
//倒计时结束 // 倒计时结束
handleEvent (e,item) { handleEvent(e, item) {
if (e.left==0) { if (e.left == 0) {
item.ReachTime=0 item.ReachTime = 0;
this.workingArea.ShowCarIcon(item) this.workingArea.ShowCarIcon(item);
} else { } else {
item.ReachTime=e.left/1000 item.ReachTime = e.left / 1000;
} }
} }
@ -7308,10 +7308,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit {
list.push(e.Id) list.push(e.Id)
isSelect? this.workingArea.setHighlight(list) : null isSelect? this.workingArea.setHighlight(list) : null
} else { } else {
let config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000;
this.snackBar.open('车辆目前未到场','确定',config); this.snackBar.open('车辆目前未到场', '确定', config);
} }
} }

8
src/app/working-area/working-area.component.ts
Unescape View File

@ -251,6 +251,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
// this.createEnterPaintEndButton(); // this.createEnterPaintEndButton();
// this.backgroundImage.addChild(this.paintingLine); // this.backgroundImage.addChild(this.paintingLine);
this.on('select', obj => { this.on('select', obj => {
console.log('选择了' + obj);
if (this.allowEdit) { if (this.allowEdit) {
if (obj instanceof MultipointIcon) { if (obj instanceof MultipointIcon) {
obj.setPointVisiable(true); obj.setPointVisiable(true);
@ -373,7 +374,10 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
public setHighlight(ids: string[]): void { public setHighlight(ids: string[]): void {
this.selection.deselectAll(); this.selection.deselectAll();
ids.forEach(item => { 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); this.selection.select(obj);
}); });
} }
@ -431,7 +435,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
const single = new SinglePointIcon(element, this); const single = new SinglePointIcon(element, this);
}); });
// this.setNameVisible(false, GameMode.BasicInformation); this.setNameVisible(false, GameMode.BasicInformation);
const tempData = { const tempData = {
Id: '5f6719a4e03abe3856d87d7b', Id: '5f6719a4e03abe3856d87d7b',

Write Preview
Loading…
Cancel
Save