diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 631f3c9..e8e6fe6 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -22,7 +22,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048cae9d', @@ -49,7 +49,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048cae9e', @@ -76,7 +76,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048cae9f', @@ -103,7 +103,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea0', @@ -130,7 +130,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea1', @@ -157,7 +157,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea2', @@ -184,7 +184,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea3', @@ -211,7 +211,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea4', @@ -238,7 +238,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea5', @@ -265,7 +265,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea6', @@ -292,7 +292,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea7', @@ -319,7 +319,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea8', @@ -346,7 +346,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caea9', @@ -373,7 +373,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeaa', @@ -400,7 +400,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeab', @@ -427,7 +427,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeac', @@ -454,7 +454,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caead', @@ -481,7 +481,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeae', @@ -508,7 +508,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeaf', @@ -535,7 +535,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb0', @@ -562,7 +562,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb1', @@ -589,7 +589,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb2', @@ -616,7 +616,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb3', @@ -643,7 +643,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb4', @@ -670,7 +670,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb5', @@ -697,7 +697,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb6', @@ -724,7 +724,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb7', @@ -751,7 +751,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb8', @@ -778,7 +778,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeb9', @@ -805,7 +805,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeba', @@ -832,7 +832,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caebb', @@ -859,7 +859,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caebc', @@ -886,7 +886,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caebd', @@ -913,7 +913,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caebe', @@ -940,7 +940,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caebf', @@ -967,7 +967,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec0', @@ -994,7 +994,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec1', @@ -1021,7 +1021,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec2', @@ -1048,7 +1048,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec3', @@ -1075,7 +1075,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec4', @@ -1102,7 +1102,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec5', @@ -1129,7 +1129,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec6', @@ -1156,7 +1156,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec7', @@ -1183,7 +1183,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec8', @@ -1210,7 +1210,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caec9', @@ -1237,7 +1237,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caeca', @@ -1264,7 +1264,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caecb', @@ -1291,7 +1291,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caecc', @@ -1318,7 +1318,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caecd', @@ -1345,7 +1345,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048caece', @@ -1374,7 +1374,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, + FixedSize: false, Height: 32, Width: 32, Id: '5f67f92238f13cd2048cae9d', @@ -1412,6 +1412,6 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { } ngAfterViewInit(): void { - this.workingArea.loadDemoScene(this.demoData); + this.workingArea.loadDemoScene(this.demoData, 0.149); } } diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 03ad560..e56d813 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -397,8 +397,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 加载测试界面 */ - public loadDemoScene(list: any[]) { + public loadDemoScene(list: any[], backgroundScale: number) { this.backgroundImage.texture = PIXI.Texture.from('./assets/images/demo.jpg'); + this.setBackgroundScale(backgroundScale); list.forEach(element => { const single = new SinglePointIcon(element, this); }); @@ -414,9 +415,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, - Height: 32, - Width: 32, + FixedSize: false, + Height: 45, + Width: 45, Id: '5f67f92238f13cd2048cae9d', ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -425,7 +426,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV x: 1295, y: 1237 }, - Name: '泡沫消防车', + Name: '', PropertyInfos: [ { Enabled: true, @@ -433,7 +434,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV PhysicalUnit: '', PropertyName: '名称/编号', PropertyType: 0, - PropertyValue: '钦南区新兴消防', + PropertyValue: '', Required: false, RuleName: '', RuleValue: '', @@ -459,9 +460,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Enabled: true, FillMode: 0, FireElementId: 0, - FixedSize: true, - Height: 32, - Width: 32, + FixedSize: false, + Height: 45, + Width: 45, Id: '5f67f92238f13cd2048cae9d', ImageUrl: './assets/images/水罐消防车.png', InteractiveMode: 0, @@ -470,7 +471,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV x: 1295, y: 1237 }, - Name: '水罐消防车', + Name: '', PropertyInfos: [ { Enabled: true, @@ -478,7 +479,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV PhysicalUnit: '', PropertyName: '名称/编号', PropertyType: 0, - PropertyValue: '钦南区新兴消防', + PropertyValue: '', Required: false, RuleName: '', RuleValue: '',