From 074179300c008f3e618ebbea6e1fc1c2410a2d15 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Wed, 23 Sep 2020 16:45:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-assistance.component.ts | 334 +++++++++--------- .../working-area/working-area.component.ts | 250 ++++++++++++- src/assets/images/举高喷射消防车.png | Bin 0 -> 3882 bytes 3 files changed, 404 insertions(+), 180 deletions(-) create mode 100644 src/assets/images/举高喷射消防车.png diff --git a/src/app/ui/plan-assistance/plan-assistance.component.ts b/src/app/ui/plan-assistance/plan-assistance.component.ts index 07b884c..fdae6ff 100644 --- a/src/app/ui/plan-assistance/plan-assistance.component.ts +++ b/src/app/ui/plan-assistance/plan-assistance.component.ts @@ -27,9 +27,9 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 538.0725371265185, y: 790.8249488152024 }, - Width: 32, + Width: 45, Border: null, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -124,14 +124,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -854.3835678799273, y: 688.1144590593601 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -265,14 +265,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -539.9645631808662, y: 271.248256281619 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -367,14 +367,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -563.1123674185176, y: 272.12837517909185 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -510,14 +510,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -51.57937113008251, y: 271.9224183841443 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -653,14 +653,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 299.11560093170795, y: 5.1063714995351575 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -796,14 +796,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 500.9012712134421, y: 432.9232113342218 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -939,14 +939,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 88.60901628649833, y: -362.81780743424156 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1082,14 +1082,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1089.647824545333, y: -680.096209373906 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1225,14 +1225,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 916.5868780327887, y: -357.72777959563734 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1368,14 +1368,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1267.7987988964815, y: -374.6945390576514 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1511,14 +1511,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1507.3371984219418, y: -451.51880641310424 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1654,14 +1654,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2114.4400960509874, y: -142.24993442805783 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1797,14 +1797,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1936.2891216998387, y: 278.525700229893 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -1940,14 +1940,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1656.3375905766052, y: 275.1323483374903 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2083,14 +2083,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1155.818186447188, y: -8.212534678145914 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2226,14 +2226,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2915.2711426580545, y: -347.5477239184288 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2369,14 +2369,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2913.5744667118533, y: 185.20852318881538 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2512,14 +2512,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2096.1298123494207, y: 649.4948028638328 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2655,14 +2655,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1901.6453605180648, y: 1239.3597336930006 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2798,14 +2798,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1354.5242652562279, y: 1235.0853501362674 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -2941,14 +2941,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1160.7655915494565, y: 783.9050578476852 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3084,14 +3084,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 993.7723947424533, y: 1345.901393255869 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3227,14 +3227,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 577.8951065403974, y: 1345.9013932558687 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3370,14 +3370,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 126.55162198821722, y: 1029.7104791062238 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3513,14 +3513,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -179.95583881318612, y: 1030.9615299666377 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3656,14 +3656,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -435.1702143376199, y: 1028.45942824581 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3799,14 +3799,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -5.796097596718141, y: 273.14583520021273 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -3903,14 +3903,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 462.9058952959447, y: 432.54246436208996 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4007,14 +4007,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1155.2026113881834, y: 36.88757093210626 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4111,14 +4111,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1218.8312292956107, y: -356.45297613199 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4215,14 +4215,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1561.5581030242533, y: -469.2491624224295 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4319,14 +4319,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1046.7447399550688, y: -664.473331002036 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4423,14 +4423,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2115.4162998093598, y: -15.172207355788942 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4527,14 +4527,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2915.112338509526, y: -292.8243582245628 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4631,14 +4631,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1988.5158013887126, y: 278.0216677369151 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4735,14 +4735,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2975.3868020413206, y: 191.2124158152834 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4839,14 +4839,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1703.0254066222362, y: 272.97200813738664 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -4943,14 +4943,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2092.983870088383, y: 819.7323282038833 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5047,14 +5047,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1951.9378727440935, y: 1239.7359647402122 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5151,14 +5151,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1408.1271940944434, y: 1236.6016092436726 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5255,14 +5255,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1160.4571509862274, y: 942.5243236030998 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5359,14 +5359,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -592.1952057948927, y: 271.2807226550343 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5448,14 +5448,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -97.79605019753274, y: 272.1435484065131 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5539,14 +5539,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1150.6880828651256, y: -69.45260716773461 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5630,14 +5630,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1152.4040527919356, y: -333.2077578697689 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5721,14 +5721,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1456.632463331941, y: -431.236912377104 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5812,14 +5812,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2115.794019501953, y: -194.61481529043306 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5903,14 +5903,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2918.6189917603, y: -79.68408241976437 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -5994,14 +5994,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1887.6227115969486, y: 278.62937888290867 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6085,14 +6085,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1609.5189625658177, y: 276.4352097691058 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6176,14 +6176,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 2095.5215915504127, y: 596.2041604311792 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6267,14 +6267,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1851.9430767861622, y: 1238.0508628431387 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6358,14 +6358,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1286.183169018807, y: 1239.7943307666721 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6449,14 +6449,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1159.3027504423208, y: 738.1954273316667 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6540,14 +6540,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -32.3318372843471, y: 1029.7104791062238 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6631,14 +6631,14 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: -276.2867550650558, y: 1028.4594282458097 }, - Width: 32, + Width: 45, Border: { w: 0, x: 0, y: 0, z: 0 }, - Height: 32, + Height: 45, Enabled: true, FloorId: '5f670bb79e91f4410005f564', DrawMode: 0, @@ -6719,7 +6719,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 3, Color: 0, Enabled: true, FillMode: 0, @@ -6727,8 +6727,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/水罐消防车.png', InteractiveMode: 0, @@ -6773,7 +6773,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -6781,8 +6781,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -6791,7 +6791,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '港北区解放路消防救援站', // 所属消防队 ReachTime: 0, // 到场剩余时间 WaterYield: '10t', // 载水量 @@ -6827,7 +6827,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -6835,8 +6835,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -6845,7 +6845,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '港北区解放路消防救援站', // 所属消防队 ReachTime: 0, // 到场剩余时间 WaterYield: '4t', // 载水量 @@ -6889,10 +6889,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), - ImageUrl: './assets/images/压缩空气泡沫消防车.png', + ImageUrl: './assets/images/举高喷射消防车.png', InteractiveMode: 0, MultiPoint: null, Point: { @@ -6935,7 +6935,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 3, Color: 0, Enabled: true, FillMode: 0, @@ -6943,8 +6943,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/水罐消防车.png', InteractiveMode: 0, @@ -6989,7 +6989,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -6997,8 +6997,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7007,7 +7007,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '八塘消防救援站', // 所属消防队 ReachTime: 249, // 到场剩余时间 WaterYield: '6t', // 载水量 @@ -7043,7 +7043,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7051,8 +7051,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7061,7 +7061,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '八塘消防救援站', // 所属消防队 ReachTime: 277, // 到场剩余时间 WaterYield: '3t', // 载水量 @@ -7105,10 +7105,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), - ImageUrl: './assets/images/压缩空气泡沫消防车.png', + ImageUrl: './assets/images/举高喷射消防车.png', InteractiveMode: 0, MultiPoint: null, Point: { @@ -7151,7 +7151,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7159,8 +7159,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7169,7 +7169,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '龚州消防救援站', // 所属消防队 ReachTime: 666, // 到场剩余时间 WaterYield: '6t', // 载水量 @@ -7205,7 +7205,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7213,8 +7213,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7223,7 +7223,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '龚州消防救援站', // 所属消防队 ReachTime: 721, // 到场剩余时间 WaterYield: '5t', // 载水量 @@ -7259,7 +7259,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FloorId: null, Angle: 0, Pipelines: [], - Type: 1, + Type: 2, Color: 0, Enabled: true, FillMode: 0, @@ -7267,8 +7267,8 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), ImageUrl: './assets/images/泡沫消防车.png', InteractiveMode: 0, @@ -7277,7 +7277,7 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { x: 1295, y: 1237 }, - Name: '水罐泡沫消防车', + Name: '泡沫消防车', FireTeamName: '龚州消防救援站', // 所属消防队 ReachTime: 978, // 到场剩余时间 WaterYield: '3t', // 载水量 @@ -7321,10 +7321,10 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { FixedSize: false, CanConnection: true, ConnectionObjs: [], - Height: 32, - Width: 32, + Height: 45, + Width: 45, Id: ObjectID.default.generate(), - ImageUrl: './assets/images/压缩空气泡沫消防车.png', + ImageUrl: './assets/images/举高喷射消防车.png', InteractiveMode: 0, MultiPoint: null, Point: { @@ -7364,6 +7364,11 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { } ]; + bottomIsShow = false; // 底部车辆信息是否展示 + rightIsShow = true; // 右侧楼层是否展示 + rightSayIsShow = false; // 右侧语音是否展示 + selectCarID = ''; // 选中车辆ID 选中效果css + ngOnInit(): void { const that = this; window.setTimeout(() => { @@ -7382,11 +7387,11 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { this.workingArea.on('select', obj => { // 选中素材属性注入函数 if (obj && obj.assetData && obj.assetData.ReachTime != undefined) { - this.selectCarID = JSON.parse(JSON.stringify( obj.assetData.Id || '' )); //选中样式 赋值ID - let linkCar = this.canvasData.getLinkCarName(obj) //连接车辆 - let waterOccupy = this.canvasData.getWaterOccupyName(obj) //水源占用 - obj.assetData.LinkCar = linkCar //连接车辆 - obj.assetData.WaterOccupy = waterOccupy //水源占用 + this.selectCarID = JSON.parse(JSON.stringify( obj.assetData.Id || '' )); // 选中样式 赋值ID + const linkCar = this.canvasData.getLinkCarName(obj); // 连接车辆 + const waterOccupy = this.canvasData.getWaterOccupyName(obj); // 水源占用 + obj.assetData.LinkCar = linkCar; // 连接车辆 + obj.assetData.WaterOccupy = waterOccupy; // 水源占用 this.canvasData.selectCar = obj.assetData; this.bottomIsShow = true; } @@ -7398,11 +7403,6 @@ export class PlanAssistanceComponent implements OnInit, AfterViewInit { }); } - bottomIsShow:boolean = false; // 底部车辆信息是否展示 - rightIsShow:boolean = true; // 右侧楼层是否展示 - rightSayIsShow:boolean = false; // 右侧语音是否展示 - selectCarID:string = ''; // 选中车辆ID 选中效果css - // 开始绘制 plot(e) { e == 0 ? this.workingArea.beginPaintingArrows() : this.workingArea.beginPaintPipeline(); diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 566907c..6eac99c 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, ElementRef, ViewChild, AfterViewInit, Input } from ' import * as PIXI from 'pixi.js'; import { EventEmitter } from 'events'; import { EventManager } from '@angular/platform-browser'; -import { OutlineFilter } from 'pixi-filters'; +import { OutlineFilter, OldFilmFilter } from 'pixi-filters'; import { CanvasShareDataService, GameMode } from '../canvas-share-data.service'; import {CacheTokenService} from '../http-interceptors/cache-token.service'; // 引入自动登录 获取token服务 import * as ObjectID from 'bson-objectid'; @@ -60,7 +60,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 绘画模式 */ - public paintMode: PaintMode; + private paintMode: PaintMode; /** * 选择器 */ @@ -122,6 +122,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV public animation; public animationIcon; public animationTime; + // 车辆作业面 + public carAreas: PolygonIcon[]; + // 车辆数据 + public carData: Map = new Map(); + // 当前选择的车辆id + public selectCar: any = null; // 根据ID 找到数据 // 是否登录 @@ -237,7 +243,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param icon 移动到选中车辆到屏幕中心点 */ public moveIconToScreenCenter(icon) { - if (icon.parent === this.backgroundImage && icon.assetData.Type === 1) { + if (icon.parent === this.backgroundImage && icon.assetData.Type !== 0) { console.log(this.backgroundImage.position); this.backgroundImage.pivot.set(icon.x, icon.y); this.backgroundImage.position.set(771, 404); @@ -304,6 +310,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } }); this.on('backgroundScale', scale => { + this.previewSinglePointIcon.scale.set(1 / this.backgroundImage.scale.x); this.backgroundImage.children.forEach(item => { if (item instanceof SinglePointIcon) { if (item.assetData.FixedSize) { @@ -463,11 +470,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV const single = new SinglePointIcon(element, this); }); - const tempData = [ + const putCarAreaData = [ { Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -521,6 +529,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -574,6 +583,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -627,6 +637,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -680,6 +691,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -733,6 +745,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -786,6 +799,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -839,6 +853,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -892,6 +907,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -945,6 +961,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -998,6 +1015,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1051,6 +1069,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1104,6 +1123,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1157,6 +1177,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1210,6 +1231,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1263,6 +1285,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV Id: '5f6719a4e03abe3856d87d7b', Name: '作业面', Angle: 0, + Type: [1, 2, 3, 4], Color: '#00ff0080', Point: { x: 0, @@ -1320,10 +1343,13 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV IsFromBuilding: true, InteractiveMode: 0 }, + ]; + const tempCarAreaData = [ { Id: '5f6719a4e03abe3856d87d7b', Name: '禁停区', Angle: 0, + Type: [1, 2, 3, 4], Color: '#ff000080', Point: { x: 0, @@ -1372,13 +1398,75 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV PropertyInfos: [], IsFromBuilding: true, InteractiveMode: 0 + }, { + Id: '5f6719a4e03abe3856d87d7b', + Name: '禁停区', + Angle: 0, + Type: [1], + Color: '#ff000080', + Point: { + x: 0, + y: 0 + }, + Width: 32, + Border: { + w: 0, + x: 0, + y: 0, + z: 0 + }, + Height: 32, + Enabled: true, + FloorId: '5f670bb79e91f4410005f564', + DrawMode: 0, + FillMode: 1, + GameMode: 0, + ImageUrl: '/api/Objects/PlanPlatform/5e7b384e8121c2286c0cb290.png', + CompanyId: '5f67042b9e91f4410005f55c', + FixedSize: false, + CanConnection: true, + ConnectionObjs: [], + Thickness: 0, + BuildingId: '5f6704859e91f4410005f55f', + MultiPoint: [ + { + x: 5149 - 4000, + y: 4097 - 2830 + }, + { + x: 6094 - 4000, + y: 4097 - 2830 + }, + { + x: 6094 - 4000, + y: 4152 - 2830 + }, + { + x: 5149 - 4000, + y: 4152 - 2830 + }, + ], + TemplateId: '5e7b38610137e12020bd7f7b', + FireElementId: '5e7967f30814180f1c1ecaab', + PropertyInfos: [], + IsFromBuilding: true, + InteractiveMode: 0 } ]; - tempData.forEach(element => { - const poly = new PolygonIcon(element, this); + putCarAreaData.forEach(element => { + const poly = new PutCarArea(element, this); + poly.visible = false; }); + tempCarAreaData.forEach(element => { + const poly = new PutCarArea(element, this); + poly.visible = false; + poly.polygonGraphics.interactive = false; + }); + + + this.setNameVisible(false, GameMode.BasicInformation); } @@ -1387,10 +1475,51 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param data */ public ShowCarIcon(data: any) { + + this.carData.set(data.Id, data); + + const carButton = PIXI.Sprite.from(data.ImageUrl); + carButton.name = data.Id; + carButton.buttonMode = true; + carButton.interactive = true; + carButton + .on('pointerdown', (event) => { + if (this.paintMode !== PaintMode.Car) { + this.setPaintMode(PaintMode.Car); + this.selectCar = this.carData.get(event.currentTarget.name); + event.currentTarget.name = ''; + event.currentTarget.visible = false; + this.previewSinglePointIcon.texture = PIXI.Texture.from(data.ImageUrl); + this.previewSinglePointIcon.visible = true; + this.previewSinglePointIcon.scale.set(1 / this.backgroundImage.scale.x); + this.backgroundImage.children.forEach(item => { + if (item instanceof PutCarArea) { + if (item.assetData.Type.indexOf(this.selectCar.Type) !== -1) { + item.visible = true; + } else { + item.visible = false; + } + } + }); + } + }) + .on('pointerup', (event) => { + + }) + .on('pointerupoutside', (event) => { + + }) + .on('pointerover', (event) => { + + }) + .on('pointerout', (event) => { + + }); + + + carButton.setParent(this.app.stage); + carButton.position.set(25, this.count * 65); this.count++; - const tempCar2 = new Car(data, this); - tempCar2.setParent(this.app.stage); - tempCar2.position.set(25, this.count * 25); } /** * @@ -1625,6 +1754,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.paintMode = PaintMode.endPaint; } break; + case PaintMode.Car: + // console.log('创建车辆'); + break; } } else if (!event.currentTarget.dragging && this.selection.isMultiselection === true) { this.rectToolGraphics.visible = true; @@ -1672,6 +1804,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV event.stopPropagation(); this.cancelPaint(); this.selection.deselectAll(); + }) + .on('pointerover', (event) => { + this.previewSinglePointIcon.filters = [new OldFilmFilter()]; + }) + .on('pointerout', (event) => { + this.previewSinglePointIcon.filters = null; }); this.app.stage.addChild(this.backgroundImage); @@ -1723,7 +1861,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.previewSinglePointIcon = PIXI.Sprite.from('assets/images/noImg.png'); this.previewSinglePointIcon.width = 32; this.previewSinglePointIcon.height = 32; - this.previewSinglePointIcon.alpha = 0.5; + this.previewSinglePointIcon.alpha = 1; this.previewSinglePointIcon.anchor.set(0.5); this.previewSinglePointIcon.visible = false; this.backgroundImage.addChild(this.previewSinglePointIcon); @@ -1856,6 +1994,32 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV break; } } + /** + * 设置绘制状态 + * @param mode 状态 + */ + public setPaintMode(mode: PaintMode) { + this.reset(); + this.paintMode = mode; + switch (mode) { + case PaintMode.Car: + + break; + } + } + /** + * 获取绘制状态 + */ + public getPaintMode(): PaintMode { + return this.paintMode; + } + /** + * 重置 + */ + public reset() { + this.previewSinglePointIcon.filters = null; + this.previewSinglePointIcon.visible = false; + } /** * 确认绘制 */ @@ -1972,7 +2136,8 @@ enum PaintMode { polygonIcon, endPaint, Pipeline, - Arrows + Arrows, + Car } /** * 单点图标 @@ -2023,7 +2188,7 @@ export class SinglePointIcon extends PIXI.Container { event.stopPropagation(); this.workingArea.selection.selectOne(this); if (this.assetData.CanConnection && this.parent === this.workingArea.backgroundImage) { - if (this.workingArea.paintMode === PaintMode.Pipeline) { + if (this.workingArea.getPaintMode() === PaintMode.Pipeline) { if (this.workingArea.paintingPipeline === null) { this.workingArea.previewLineSegment.visible = true; this.workingArea.currentClickPoint.position = @@ -2612,8 +2777,54 @@ export class PolygonIcon extends PIXI.Container { this.polygonGraphics.endFill(); } } -export class Car extends SinglePointIcon { +/** + * 汽车放置区域 + */ +export class PutCarArea extends PIXI.Container { + public polygonGraphics: PIXI.Graphics = new PIXI.Graphics(); + constructor(public assetData: any, private workingArea: WorkingAreaComponent) { + super(); + this.name = this.assetData.Id; + this.x = this.assetData.Point.x; + this.y = this.assetData.Point.y; + this.workingArea.backgroundImage.addChild(this); + this.sortableChildren = true; + + // 填充多边形 + const color: number = this.assetData.Color.substring(0, 7).replace('#', '0x'); + const angle: number = parseInt(this.assetData.Color.substring(7), 16) / 255; + this.polygonGraphics.beginFill(color, angle); + this.polygonGraphics.drawPolygon(this.assetData.MultiPoint); + this.polygonGraphics.endFill(); + this.addChild(this.polygonGraphics); + // 添加选中事件 + this.polygonGraphics.interactive = true; + this.polygonGraphics + .on('pointerdown', (event) => { + if (this.workingArea.getPaintMode() === PaintMode.Car) { + this.workingArea.selectCar.Point = + new PIXI.Point(this.workingArea.previewSinglePointIcon.x, this.workingArea.previewSinglePointIcon.y); + const car = new SinglePointIcon(this.workingArea.selectCar, this.workingArea); + this.workingArea.setPaintMode(PaintMode.endPaint); + } + }) + .on('pointerup', (event) => { + + }) + .on('pointerupoutside', (event) => { + + }) + .on('pointerover', (event) => { + this.workingArea.previewSinglePointIcon.filters = null; + this.workingArea.previewSinglePointIcon.zIndex = this.zIndex + 1; + }) + .on('pointerout', (event) => { + this.workingArea.previewSinglePointIcon.filters = [ + new OldFilmFilter() + ]; + }); + } } /** * 管线 @@ -2707,6 +2918,9 @@ export class Arrows extends PIXI.Container { this.line.endFill(); } } + + + /** * 选择器 */ @@ -2847,3 +3061,13 @@ export class PropertyInfo { */ public PropertyValue: string; } +/** + * 车辆类型 + */ +export enum Type { + 水源 = 0, + 举高喷射消防车 = 1, + 泡沫消防车 = 2, + 水罐消防车 = 3, + 压缩空气泡沫消防车 = 4 +} diff --git a/src/assets/images/举高喷射消防车.png b/src/assets/images/举高喷射消防车.png new file mode 100644 index 0000000000000000000000000000000000000000..a4bc71b478a911a84f6808c006a93a57bd264c37 GIT binary patch literal 3882 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 literal 0 HcmV?d00001 From 29f2c6d95fcf52dfea1812d84ae4b813a3807f36 Mon Sep 17 00:00:00 2001 From: username <1105965053@qq.com> Date: Wed, 23 Sep 2020 16:48:31 +0800 Subject: [PATCH 2/6] [] --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ce0c2e7..41fa697 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -# AX.Angular4PlanPlatform +智能实战指挥平台-前端项目 -上海数字化预案编制管理平台前端项目。此项目在 Angular 框架基础上编写。 - -后续开发都基于此。 + ---广西 演示 项目初始化：npm install From 1df6b615e65d90c596a15d2b8a0c0cbeb822efb6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Wed, 23 Sep 2020 16:54:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=AE=BE=E7=BD=AE=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/working-area.component.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 6eac99c..4b1664c 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -2002,8 +2002,17 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.reset(); this.paintMode = mode; switch (mode) { - case PaintMode.Car: - + case PaintMode.endPaint: + this.selectCar = null; + this.backgroundImage.children.forEach(item => { + if (item instanceof PutCarArea) { + if (item.assetData.Type.indexOf(this.selectCar?.Type) !== -1) { + item.visible = true; + } else { + item.visible = false; + } + } + }); break; } } From 84a29b72a944258a63a39a7dc7bd1c1c8a3541bd Mon Sep 17 00:00:00 2001 From: baozw Date: Wed, 23 Sep 2020 17:05:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[=E7=9C=9F=E5=AE=9E=E6=A1=88=E4=BE=8B]?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E7=AC=AC=E4=B8=80=E6=9D=A1?= =?UTF-8?q?=E9=99=A4=E5=AD=98=E5=9C=A8=E4=B8=8D=E8=B6=B3=E5=A4=96=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/real-cases/real-cases.component.html | 38 ++-- .../ui/real-cases/real-cases.component.scss | 12 +- src/app/ui/real-cases/real-cases.component.ts | 186 +++++++++++++++++- 3 files changed, 207 insertions(+), 29 deletions(-) diff --git a/src/app/ui/real-cases/real-cases.component.html b/src/app/ui/real-cases/real-cases.component.html index 6c12cd1..7c1fd0f 100644 --- a/src/app/ui/real-cases/real-cases.component.html +++ b/src/app/ui/real-cases/real-cases.component.html @@ -35,13 +35,13 @@ 详情 - + {{leisi.danweiName}} {{leisi.year}} {{leisi.zhoahuo}} {{leisi.weizhi}} {{leisi.xiangjin}}% - 查看详情 + 查看详情 @@ -50,19 +50,19 @@
-
+
基本信息
-
+
事故特点
-
+
处置经过
-
+
几点体会
-
+
存在不足
@@ -73,30 +73,18 @@
-
+
-
-
- 码头基本情况 -
-
- 事故油轮基本情况 -
-
- 石脑油理化性质 -
-
- 消防水源及消防设施情况 -
-
- 码头基本情况 +
+
+ {{item.name}}
- 八所港危化品码头位于东方市滨海南路，东侧为中海石油建滔化工有限公司化工厂区（甲醇项目）、中海油东方石化有限责任公司化工厂区（DCC项目），西侧、北侧、南侧为大海。码头设置3个泊位，1号泊位为10000吨级，2号泊位为5000吨级，3号泊位为50000吨级。该码头目前运营工业园区六家公司的产品，共有甲醇、原油、汽油、柴油、LPG、丙烯、MTBE等16种作业介质，年吞吐量约为520万吨。 + {{zjxinxi}}
-
+
diff --git a/src/app/ui/real-cases/real-cases.component.scss b/src/app/ui/real-cases/real-cases.component.scss index 29b97d5..f291888 100644 --- a/src/app/ui/real-cases/real-cases.component.scss +++ b/src/app/ui/real-cases/real-cases.component.scss @@ -135,10 +135,8 @@ height: 100%; display: flex; flex-direction: column; - // align-items:center;/*由于flex-direction: column，因此align-items代表的是水平方向*/ justify-content: center; user-select: none; - //background-image: url("../../../assets/images/标签正常.png") ; background-size:100% 100%; color: white; span{ @@ -205,6 +203,7 @@ .tanCenterbtn{ //margin-top: 5px; width: 100%; + height: 100%; border: 1px solid #30bbec; //margin-right: 0px; display: flex; @@ -216,6 +215,8 @@ background-size:100% 100%; color: white; span{ + cursor:pointer; + border-bottom:1px solid #30bbec; padding: 8px ; text-align: center; //padding-right: 18px; @@ -224,6 +225,7 @@ } } .centerRight{ + overflow: auto; padding-top: 10px; height: 90%; width: 65%; @@ -249,4 +251,10 @@ margin: 4px 2px; cursor: pointer; } + +//点击后边框变色 +.biankuang{ + //border:1px solid red; + background-color: #F7BA2A; +} diff --git a/src/app/ui/real-cases/real-cases.component.ts b/src/app/ui/real-cases/real-cases.component.ts index 7299cd3..e6d6f0b 100644 --- a/src/app/ui/real-cases/real-cases.component.ts +++ b/src/app/ui/real-cases/real-cases.component.ts @@ -20,18 +20,200 @@ export class RealCasesComponent implements OnInit { {danweiName:"海南东方市八所港危化品码头",year:"2016年",zhoahuo:"石脑油",weizhi:"丰盛油8油轮发动机舱",xiangjin:parseFloat("10%")} ] + //弹窗数据 + tandata=[ + {key:0,zongdata:[ + {name:"基本信息",xinxidata:[ + {name:"单位基本情况",xinxi:"江苏德桥化工仓储有限公司位于江苏省靖江市新港园区，是由新加坡恒阳石化物流有限公司投资组建的液体石化产品储运公司，" + +"占地面积31.5万m2，现有员工130人，罐区13个、储罐139个，储存能力约58.3万m3。事故发生时储存有汽油、石脑油、甲醇、二氯乙烷、三氯乙烯、四氯乙烯、" + +"液化烃、芳烃、醋酸乙酯、醋酸丁酯、冰醋酸等25种危化品，共计21.12万吨，其中：油品约14万吨、液态化学品近7万吨、主要组分为C3、C4的液化烃约1420吨。" + +"事故单位北侧400m为村庄，东侧120m为储存能力52万m3、22个易燃易爆危化品储罐的联合安能石化有限公司，南侧300m为长江主航道，西侧50m为长江丹华港。"}, + {name:"主要工艺流程",xinxi:"德桥化工仓储有限公司是典型的危化品储运企业，主要从事液态散化、油品及液化气体的仓储中转、分拨、灌装业务。厂区设有2个软管交换站，" + +"作为物料集中配输中心，通过输送管线分别连接长江码头、罐区储罐和厂区装卸台，实现危化品物料从码头—罐区—装卸台间的进出双向输转。其中，1号交换站：设有发船泵5台、" + +"发车泵30台，对应11、12、21、22罐区60个储罐的物料分输；2号交换站：设有发船泵6台、发车泵36台，对应13、14、15、23、24、25罐区58个储罐的物料分输。" + +"事故所在的2号交换站，位于厂区中间，24罐区北侧，为半敞开式框架结构，建筑面积1482m2，交换站下层管廊设有码头管线12根，连接长江码头，长度741-1102m、" + +"管径200-300mm；上层管廊设有发车管线36根，连接厂区装卸台，长度477-601m、管径100mm；底部分布有储罐内管线58根，分别连向各罐区储罐的罐根，因各罐区位置不同，" + +"管线长度也不一样，总长约为1.1km。事故发生时，长江码头上的码头海油318（船名）、赣华强化016（船名），正在通过2号交换站，分别利用码头206号管线（管径250mm）、" + +"305号管线（管径200mm）进行卸汽油至2411储罐、卸醋酸乙酯至2307储罐的作业。其他10条管线内有残留物料。"}, + {name:"重点危险罐区",xinxi:"厂区危险等级最高的物料：燃烧或爆炸能产生剧毒光气的2406号二氯乙烷罐（存量4274吨）、1108号三氯乙烯罐（存量1988吨）和1105、1109、" + +"2210、2213、2214号四氯乙烯罐（存量9315吨）以及燃烧爆炸后威力巨大、主要组分为C3、C4 的901-926号液化烃罐（存量1536吨）。二氯乙烷：无色或浅黄色透明液体，有类似氯仿的气味，" + +"微溶于水，可混溶于醇、醚、氯仿等，主要用于作蜡、脂肪、橡胶等的溶剂及谷物杀虫剂；属高毒类，对眼睛及呼吸道有刺激作用，吸入可引起肺水肿，抑制中枢神经系统、刺激胃肠道和引起肝、肾及肾上腺损害；" + +"其蒸气与空气形成爆炸性混合物，遇明火、高热能引起燃烧爆炸，与氧化剂能发生强烈反应，受高热分解产生有毒的腐蚀性气体。熔点-35.7℃、闪点13℃、沸点83.5℃、饱和蒸气压13.33Kpa／29.4℃，爆炸极限6.2%-16%。" + +"有害燃烧产物：一氧化碳、二氧化碳、氯化氢、光气。三氯乙烯：无色透明液体，有似氯仿的气味，不溶于水，可混溶于乙醇、乙醚等多数有机溶剂，主要用于脱脂、冷冻、农药、香料、橡胶工业、洗涤织物等；吸入后出现头痛、" + +"头晕、酩酊感、嗜睡等，重者发生谵妄、抽搐，甚至昏迷、呼吸麻痹或循环衰竭；其蒸气与空气形成爆炸性混合物，遇明火、高热能引起燃烧爆炸，与强氧化剂可发生反应，受高热分解产生有毒的腐蚀性气体。熔点-87.1℃、闪点32.2℃、" + +"沸点87.1℃、饱和蒸气压13.33Kpa／32℃，爆炸极限12.5%-90%。有害燃烧产物：一氧化碳、二氧化碳、氯化氢、光气。" + +"四氯乙烯：无色液体，有氯仿样气味，不溶于水，可混溶于乙醇、乙醚等多数有机溶剂，主要用作溶剂；吸入急性中毒者有上呼吸道刺激症状、流泪、流涎，随之出现头晕、头痛、恶心、运动失调及酒醉样症状；一般不会燃烧，" + +"但长时间暴露在明火及高温下仍能燃烧；若遇高热可发生剧烈分解，引起容器破裂或爆炸事故；受高热分解产生有毒的腐蚀性气体。熔点-22.2℃、沸点121.2℃、饱和蒸气压2.11Kpa／20℃。有害燃烧产物：氯化氢、光气。"}, + {name:"着火区域情况",xinxi:"1、起火区域。起火位置为2号交换站。事故发生时，2号交换站进出料管线内存有汽油、石脑油、甲醇、芳烃、醋酸乙酯、醋酸丁酯、冰醋酸等物料，与其相连的罐区共存储12种、约15.8万吨的危化品。" + +"后期起火的2401罐所在罐区，位于厂区中部，共有12个储罐，呈东、西两排分布，罐区防火堤长170m、宽70m、高1.1m，罐组隔堤高1m，最小罐间距10m。其中，2401-2408号为内浮顶罐、2409-2412号为拱顶罐，2401、2402罐罐容2500m3，" + +"其余均为3750m3。事故发生时，2401、2402、2403、2404、2407、2409、2410、2411罐储存汽油共计13482吨，2408、2412罐储存甲醇共计1895吨，2405罐储存汽油添加剂MTBE（又称甲基叔丁基醚）1675吨，2406罐储存二氯乙烷4274吨。" + +"2、毗邻情况。距离着火区域南侧7-8m为2401-2412罐区，储存裂解汽油、石脑油、甲醇、二氯乙烷等约1.8万吨；北侧66m为1301-1308罐区，储存甲醇约2.3万吨；东侧36m为2301-2316罐区，储存醋酸乙酯、醋酸丁酯、冰醋酸等约1.6万吨；" + +"西侧36m为2501-2504罐区，储存混合芳烃约1.5万吨；西侧100m为液化烃罐区，储存主要组分为C3、C4的液化烃约1536吨。"}, + {name:"单位消防设施及水源情况",xinxi:"事故单位设有消防水池1个，容积4864m3；消防水泵房位于厂区东侧，设有消防水泵3台，每台功率480kW、流量250L∕s、扬程130m；消防给水管网为环状、管径500mm，采用稳高压系统，平时压力0.7Mpa；" + +"厂区共有消火栓132只、固定水炮54门。泡沫站位于2号交换站北侧，设有泡沫储罐2座，储存3%型抗溶性水成膜泡沫18吨，泡沫混合液主管道管径200-250mm。各罐区均设有水喷淋冷却系统，除液化烃罐区外，其他罐区还设有泡沫灭火系统；" + +"1、2号交换站未设置自动消防设施。厂区四面有人工河流（护仓河）环绕，南临长江航道，西连丹华港，均可作为消防取水码头。"}, + {name:"单位及周边消防力量情况",xinxi:"德桥化工仓储有限公司只建有微型消防站，没有企业专职消防队。周边20km范围有1个现役消防队、1个政府专职消防队，共有消防车11辆、队员53人，总载水量59吨、泡沫量12.4吨，距离最近的新港城专职队约5公里。"}, + {name:"当日气象情况",xinxi:"气象资料显示：22日-23日，白天多云，夜里多云转阴有小雨，东南风3-4级，最低气温15-16℃，最高气温26-27℃。"} + ]}, + {name:"事故特点",xinxidata:[ + {name:"化学品种类多，危险性大",xinxi:"事故厂区储存有汽油、石脑油、甲醇、二氯乙烷、三氯乙烯、四氯乙烯、液化烃、芳烃、醋酸乙酯、" + +"醋酸丁酯等各类危化品共计25种、21万余吨，且分储在13个罐区内。库区、罐区、罐组、罐与罐的安全间距小，同一罐区、罐组内存有多种易燃易爆、" + +"有毒有害物料，成分复杂，风险极高。特别是厂区储存4274吨二氯乙烷、1988吨三氯乙烯、9315吨四氯乙烯，一旦遇到高热或发生爆炸、燃烧，会快速释放大量的剧毒光气。"}, + {name:"储罐类型复杂，处置难度高",xinxi:"罐区内有拱顶、内浮顶、全压力球型、半冷冻球型等多种储罐类型，储存物料有油、烷烃、醇、酯等，" + +"处置方法和灭火药剂类型不同，特别是厂区南侧的二氯乙烷、东北侧的三氯乙烯和四氯乙烯罐以及主要组分为C3、C4的液化烃罐区，危险性大、处置难度高。"}, + {name:"地势落差大，流淌火蔓延快",xinxi:"厂区地势“中间高、南北低”，地面绝对标高相差约1.55m，道路坡度近1%。发生爆炸后，位于厂区中部的2号交换站上方管线被拉断，" + +"大量易燃易爆物料外泄并沿地势急速流淌燃烧，将邻近罐区两侧的冷却管线和泡沫灭火管线烧毁。扑救过程中，大面积流淌火先后5次突破灭火防线，烧毁部分器材装备，严重威胁参战官兵生命安全。"}, + {name:"周边环境复杂，指挥决策难度大",xinxi:"事故单位距离长江主航道仅300m，有相邻的危险品码头2个，事发时正在作业的危险品运输船只2艘，其他危险品船只若干；" + +"周边5公里范围有19个村镇6万余名群众。加之事故单位有139个危化品储罐，与其一路之隔的联合安能化工有限公司还有22个、总储量达52万m3的易燃易爆物料储罐，火势一旦失控，极易引起连锁反应，给周边数十平方公里区域和长江水域带来不可估量的灾难。"} + ]}, + {name:"处置过程",xinxidata:[ + {name:"辖区力量到场",xinxi:"4月22日7时许，江苏德桥仓储有限公司组织承包商（华东建设安装有限公司）3名工人进入厂区2号交换站进行检修作业；" + +"8时10分，在未实施有效监护的情况下动火作业；9时13分，因作业产生的明火引起2号交换站排污沟内残留油体燃烧，烧裂正在进料作业的206、305号管线" + +"与储罐间的连接软管，造成管线内的裂解汽油和醋酸乙酯大量外泄燃烧；现场人员关闭了206、305号管线的紧急切断阀，并进行自救；9时16分，DCS系统发出指令，" + +"关闭与2号交换站相连的物料输送管道的电动阀；9时18分，现场人员撤离前对2401罐未完全关闭的电动阀实施手动关阀（旋转了4圈）；9时18分55秒、9时19分38秒，" + +"大火烧裂交换站部分管线，物料外泄加剧，先后发生2次较大规模爆炸；9时26分，事故单位向119报警。9时34分至49分，辖区中队新港城专职队和靖江中队相继到场。" + +"此时，2号交换站一片火海，燃烧面积约2000㎡，火焰高达几十米，上层管廊出现局部坍塌。经询问单位技术人员，厂区所有生产系统已紧急停车，着火区域及邻近罐区的消防泵、" + +"喷淋系统和固定炮已开启，燃烧物质为醇、脂、油类等易燃液体（主要为206、305号管线内的裂解汽油和醋酸乙酯）。到场力量迅速进行战斗部署：新港城专职队一号车泡沫水罐车" + +"停靠1号交换站附近，从着火区域东侧架设1门移动炮阻截火势、1门移动炮冷却2402罐；二号车水罐车占据氮气站附近消火栓，向一号车供水；三号车抢险救援车停靠厂区东门外，" + +"负责外围警戒和增援车辆引导。靖江中队一号车压缩空气泡沫车停靠南侧2411罐附近，从着火区域西南侧架设1门移动炮冷却2401罐（后期改为2支泡沫枪灭火）；二号车泡沫水罐车占据" + +"南侧人工河，向一号车供水；三号车高喷车停靠西侧2501罐附近，从着火区域西北侧压制火势；四号车泡沫水罐车占据西侧926罐附近消火栓，向三号车供水；五号车泡沫水罐车占据北侧人工河，" + +"从着火区域北侧架设1门移动炮阻截火势；六号车抢险救援车停靠厂区东门外，负责外围警戒和增援车辆引导。10时40分，2号交换站发生第三次爆炸，站内承重结构严重受损，管廊呈V型坍塌，" + +"与装卸台相连的36条管线以及与码头相连的12条管线被拉断，大量带压物料加速外泄，顺地势沿罐区东、西两侧道路急速流淌，瞬间形成“全路面”流淌火。现场指挥员立即下达紧急撤退命令，" + +"参战官兵按照既定路线，迅速撤离至邻近的2502罐南侧未使用的罐区防火堤内。在西南侧承担主攻任务的靖江中队泡沫车驾驶员朱军军，为保证火场供水不间断、掩护战友及时撤退、抢救车辆装备，被流淌火围困，瞬间被大火吞噬，壮烈牺牲。"}, + {name:"支队增援力量到场",xinxi:"10时50分，支队全勤指挥部和特勤、泰兴、通扬路中队到场。此时，交换站及其东、南、西侧道路的流淌火近5000m2，火焰高度约40-50m，严重威胁位于" + +"厂区南侧的液化烃输送管道及24、25罐区的16个储罐安全。指挥部立即组织力量从东、南、西侧部署1门暴雪泡沫炮、2支泡沫枪梯次掩护、强攻推进压制地面流淌火，并重新部署2门移动炮在西侧" + +"道路设置阻截阵地。同时，组织相继到场的姜堰、兴化、滨江、春晖路中队，分别从着火区域西南、东北、东南方向共增设6门移动炮，阻截火势，强行对邻近的2401、2402、2403、2404、2502罐实施冷却、抑制爆炸。"}, + {name:"总队增援力量到场",xinxi:"总队全勤指挥部出动途中，周详总队长通过指挥中心和移动视频终端实时跟踪灾情发展态势、了解战斗部署情况，并及时向前方指挥员下达指示要求：一是迅速查明燃烧物料的种类、性质和储量；" + +"二是力量到场后不得盲目靠近事故核心区，应边行进边侦检，在相对安全区域设置移动炮、车载炮等阵地，确保官兵自身安全；三是组织单位技术人员采取关阀断料、紧急停车、氮封保护、启动固定消防设施等工艺措施，有效控制灾情发展；" + +"四是根据火场态势和力量到场情况，集中全力加强对着火区域邻近罐体的冷却，防止火势扩大蔓延；五是及时关闭罐区雨排系统，安排力量提前筑堤设防，防止流淌火蔓延；六是派出安全哨，实时观察灾情发展态势，不间断监测罐体结构变化和" + +"罐壁温度，明确紧急撤离路线。11时50分至12时，总队全勤指挥部和周详总队长相继到达现场，第一时间在距离2号交换站120m的配电房附近设立火场总指挥部，由周详总队长担任总指挥、高宁宇参谋长担任前沿指挥,朱晖副参谋长负责火情侦察" + +"和通信保障、王士军副参谋长负责统筹协调和药剂保障，责令事故单位指派熟悉厂区情况和工艺安全的技术人员到指挥部全程值守，同时架设无人机高空侦察。指挥部第一时间调取厂区平面图和DCS系统实时监测数据，并围绕着火区域进行火情侦察，" + +"确认着火区域南侧为混存裂解汽油、石脑油和燃烧爆炸产生剧毒光气的二氯乙烷罐区；北侧为甲醇罐区；东侧为冰醋酸、醋酸乙酯罐区；西侧为混合芳烃及主要组分为C3、C4的液化烃罐区。无人机航拍发现，2号交换站燃烧猛烈，直接烘烤南侧2401、" + +"2402罐和西侧2502、2504罐；东、西两侧道路形成大面积流淌火迅速向南蔓延；2401-2404罐组防火隔堤内充满流淌火。根据DCS系统监测和无人机侦察结果，考虑到现场力量与灾情态势不对等的现状，指挥部确定了“控制燃烧、冷却抑爆、筑堤设防、" + +"全程监测”的战术原则，并研究制定七项处置措施：一是明确将2406罐和液化烃罐区作为保护重点，集中力量冷却南侧的2401、2402、2403、2404罐和西侧2502、2504罐，阻止火势蔓延；二是组织力量在着火区域东南、西南、西北方向道路上筑堤设防，" + +"防止地面流淌火蔓延，威胁战斗阵地和官兵生命安全；三是核查着火罐区关阀断料情况；四是密切监视邻近储罐的结构变化，时刻监测罐体温度以及厂区可燃、有毒气体浓度；五是组织力量接应灭火药剂、装备器材厂家，做好向战斗阵地的输送投放；六是通知" + +"交通部门对长江航道采取禁航措施，撤离事故码头上下游船舶；七是通知环保部门做好防范水域污染的应对措施。12时05分至13时10分，无锡、南通、扬州支队增援力量相继到场。指挥部命令：泰州支队占据着火区域西北侧阵地，继续阻截流淌火向西侧芳烃罐区" + +"蔓延，重点冷却2502、2504罐，防止火势威胁液化烃罐区；无锡支队在着火区域东、西侧道路及南侧设置阵地，扑灭地面流淌火，加强冷却2401、2402、2403、2404罐进行，死保2406罐；扬州支队占据着火区域北侧阵地，阻截流淌火蔓延，加强冷却1307、1406罐；" + +"南通支队2套远程供水泵组分别利用东南侧消防水池和北侧人工河，向无锡和泰州支队阵地供水。12时15分许，着火区域接连传出十几声“嘭嘭”的爆炸声。侦察发现，由于长时间火焰烧烤，与2号交换站相连的部分进出料管线及盲板炸裂，管线内残存的汽油、甲醇、芳烃、" + +"醋酸乙酯、冰醋酸等物料大量外泄（约260吨）。随着火势猛烈燃烧，流淌火再次向东、西两侧排水明渠和道路翻腾外溢，并流淌至厂区南侧人工河流，同时越过西侧道路向芳烃罐区蔓延，2502、2504罐被浓烈的烟火笼罩，2502罐保温层局部脱落。根据火情，指挥部调整" + +"力量部署：在2502罐南侧未使用的罐区防火堤内设置4支泡沫枪阻截扑灭堤外流淌火；在2405—2408罐组防火堤内架设4门移动炮，加强对2403、2404罐冷却控制，继续死保2406罐；在西北侧架设2门移动炮，加强冷却2502、2504罐；在厂区南侧河面上，利用15m拉梯搭建" + +"紧急撤离通道；依托罐区道路和防火堤，从东南、西南、西北三个方向利用沙袋构筑防护堤。同时，考虑2406罐存在爆炸危险，为在紧急情况下掩护官兵撤退，指挥部调集2台涡喷消防车增援现场。随即，指挥部前移至距离着火点30m左右的地点。" + +"12时30分，省委常委、政法委书记、公安厅厅长王立科，省公安厅副厅长程建东到达现场，实地勘察灾情。王立科书记就事故处置工作提出六点要求：一是始终将参战官兵安全放在第一位，加强个人防护；二是发挥厂方技术人员作用，科学制定处置方案；" + +"三是全力控制灾情扩大，做好长时间作战准备；四是如实发布信息，客观规范舆论导向；五是加强外围警戒，严禁无关人员进入现场；六是尽快组织专家评估灾情发展态势。" + +"13时30分至17时45分，常州、苏州、镇江、南京、盐城支队和总队培训基地、公安消防部队士官学校的增援力量陆续到场。指挥部随即将整个火场划分为前、后方两个战区。" + +"前方以事故区域为中心，划分东、西、南、北四个战斗段，要求着火区域必须使用“全泡沫”灭火与冷却。西侧阵地：泰州、苏州、南通、镇江支队和总队培训基地部署4门移动炮、" + +"1门车载炮、1门高喷炮，阻截火势，加强对2401、2403、2502罐冷却，重点保护液化烃罐区。南侧阵地：无锡、常州支队部署8门移动炮，阻截火势，加强对2401、2402、2403、" + +"2404、2405、2406罐冷却，持续死保2406号二氯乙烷罐。东侧阵地：南京、常州、盐城、泰州支队部署8门移动炮，阻截火势，加强对2401、2402、2404、2301、2303罐冷却。" + +"北侧阵地：南京、扬州、泰州、南通、苏州支队部署10门移动炮、2门高喷炮、2门暴雪泡沫炮，阻截火势，加强对1307、1308罐冷却。" + +"后方调集全省10套远程供水泵组、4辆泡沫原液供给车、40台泡沫输转泵、1200吨抗溶性泡沫，依托厂区人工河和长江航道设立取水点，设置2个泡沫补给点，全力保障火场不间断供水、" + +"供液。远程供水：常州、无锡支队2套泵组利用厂区东南侧消防水池，向南侧、东侧阵地供水；苏州支队1套泵组利用北侧人工河，向北侧阵地供水；南通支队3套泵组分别利用厂区东南侧消防" + +"水池、北侧人工河和南面长江干道，向南侧、北侧阵地供水；扬州支队1套泵组利用北侧人工河，向北侧阵地供水；泰州支队2套泵组分别利用南侧人工河和长江主干道，向消防水池和东侧阵地供水；" + +"培训基地1套泵组利用北侧人工河，向西侧阵地供水。泡沫供给：分别在东、西门附近设置2个泡沫补给点，采取泡沫原液供给车输转、泡沫输转泵输转、人工搬运等多种方法，向各战斗阵地不间断补给泡沫药剂。" + +"14时50分，指挥部决定：组织公安消防部队士官学校132名官兵，分别在东、西、北侧进攻路线上布设第二道防护堤，组织力量死看死守，牢牢将火势控制在交换站周边区域内。" + +"16时11分，2号交换站火势突然急剧增大，巨大的火球腾空而起，近百米高的浓烟烈火笼罩厂区上空，东、西两侧部分道路和2401-2404罐防火隔堤内瞬间布满流淌火。加之厂区邻近" + +"长江、风向多次突变，固定泡沫站被大火完全吞噬，强大的热辐射对邻近2号交换站北侧的甲醇和西北侧的芳烃等罐区安全构成了极大的威胁，人员难以靠近。指挥部根据物料泄漏量、" + +"流淌速度及燃烧时间推断，2401-2404罐组存在储罐阀门未完全关闭，提出了“加强筑堤保护、全力阻截流淌火、持续强化冷却、伺机抵近关阀”的针对性措施。鉴于1307、1308罐体外壁温度均已超过300℃，" + +"命令北侧阵地的扬州、泰州、苏州支队尽全力冷却1307、1308甲醇罐。" + +"16时45分，紧急调集的2万米水带、30门移动炮、100套隔热服、30台泡沫输转泵、300套防毒面具全部到场，做好了打持久战的准备。" + +"18时，指挥部根据兵力部署、火场态势和泡沫药剂、水源准备情况，发动第一次总攻，共部署30门移动炮、3门高喷炮、1门车载炮、2门暴雪泡沫炮、21支泡沫管枪强攻灭火。" + +"18时30分，交换站东、西两侧地面流淌火被陆续扑灭，前期丢失的部分阵地重新占领，灭火力量与灾情态势相对均衡，火场进入拉锯相持阶段。" + +"18时40分，指挥部明确四项措施：一是各阵地灭火冷却强度保持均衡；二是确保泡沫药剂、油料、供水不间断；三是加紧筑堤，巩固阵地；四是战斗预备队做好轮换准备。" + +"19时许，淮安、宿迁、连云港、徐州4个支队，中石化华东片区的扬子石化、金陵石化、仪征化纤、南化公司、管道分公司、高桥石化6个企业专职消防队，共51辆重型泡沫车、342名队员，" + +"以及总队2套单车400L/s的超重型化工编队，到达现场。按照指挥部要求，立即组成战斗预备队，做好随时轮换投入战斗的准备。" + +"19时45分，伴随着几声巨响，数个火球接连腾起，管道再次爆裂，交换站东、西两侧道路再次出现大面积流淌火，2401罐顶鼓起，呼吸阀和泡沫产生器罐壁连接处起火，" + +"呈火炬型燃烧。指挥部要求前沿指挥长密切监控火情，必要时有权决定撤退，确保安全。囿于高喷车难以抵近作战、移动炮和车载炮射程不足，指挥部要求加大供给强度，加强2401罐冷却，责成企业调集氮气车沿2401罐的东南侧道路停靠，强制向2401罐实施充氮保护。"}, + {name:"部局领导到场",xinxi:"20时10分，罗永强副局长一行到达现场。在听取情况汇报、查看无人机视频后，罗永强副局长率领部局专家组深入现场，抵近着火点侦察，与化工专家研判商讨后，" + +"作出战斗部署：一是即将到场的上海增援力量配合无锡支队在重点防御的西南侧阵地展开战斗；二是再次确认所有储罐阀门关闭情况；三是调用高喷车对受火势威胁较大的1307、1308罐进一步强化冷却。" + +"20时30分，上海总队汪永明副总队长率领增援力量到场。根据罗永强副局长指示，组织力量从着火区域西南侧架设6门移动炮，协助无锡支队阻截交换站火势，并对2401、2403罐实施冷却。" + +"21时50分，部消防局于建华局长带领工作组到达现场，详细听取现场情况汇报，深入前沿阵地勘察火情，准确研判火灾发展态势，迅速召集各战斗段指挥员和事故单位工程技术人员，提出五项处置措施：" + +"一是保持足够力量对着火邻近储罐进行大强度冷却，确保不发生问题；二是从临近地区调集氮气，架设临时管线，对受火势威胁的储罐进行充氮保护；三是外接临时电源，启动西侧半冷冻球罐冰机；" + +"四是备足力量和药剂，择机对交换站及罐区实施强攻灭火；五是树立底线意识，组织疏散半径5公里范围内的群众。" + +"根据于建华局长指示，4个战斗区段分别增设1门移动炮加强对邻近罐冷却；组织对2401-2404罐组防火堤进行凿孔导流，降低液面、防止漫堤；" + +"加强对2401-2404罐补充氮气保护；协调当地政府疏散周边5公里范围内的群众；各战斗阵地迅速补足泡沫和油料，组织预备力量轮换，做好总攻准备。" + +"23日0时左右，2号交换站内火势仍呈喷射状燃烧。根据现场情况，于建华局长召集专家分析认定，罐区内仍有管线阀门未关闭，随即要求0时至1时再次发动总攻，为关阀断料创造条件。" + +"0时30分，各阵地共部署42门移动炮、1门高喷炮、2门车载炮、2门暴雪泡沫炮、21支泡沫管枪，对着火区域及邻近罐区发起第二次总攻，2401-2404罐组内的流淌火、" + +"2401罐顶呼吸阀和泡沫产生器罐壁连接处的明火被全部扑灭，2号交换站火势有所减弱。前沿侦察小组冒着强辐射热，抵近火场最前沿，反复观察火情，认为现场已具备关阀条件，" + +"当即向于建华局长报告。于建华局长当机立断、果断决策，命令实施关阀断料。随后，罗永强副局长亲自排查罐区管线，制定关阀方案，指挥南京支队关阀攻坚小组，" + +"在雾状水掩护下深入罐区防火堤内实施关阀断料。0时40分，2403、2404罐的进出料阀门被彻底关闭。" + +"1时10分，2401罐的进出料阀门被彻底关闭。随后，火势明显减弱。指挥部命令，在保证冷却力量的前提下，各战斗段抢抓战机，梯次掩护推进，全力围剿火势。3时10分，大火被彻底扑灭。"}, + {name:"冷却监护、移交现场",xinxi:"大火扑灭后，现场指挥部命令参战力量继续向着火区域液面喷射泡沫，增加泡沫覆盖厚度，防止复燃。同时继续冷却相邻罐体、持续降温，" + +"安排专人对罐体温度和水样、空气进行不间断检测。4时25分，2401、2403、2404罐壁温度降至40℃以下，其它罐降至20℃左右，空气、水体检测结果基本正常。" + +"9时30分，指挥部召集参战队伍指挥员进行战斗小结，明确苏州、无锡、南通、镇江、扬州5个支队，25辆消防车、150名官兵留守现场，配合泰州支队实施监护，其余力量陆续返回。" + +"25日12时，现场所有储罐温度均降至常温，增援支队全部撤回，泰州支队17辆消防车、102名官兵继续监护。"} + ]}, + {name:"几点体会",xinxidata:[ + {name:"领导高度重视、正确指挥是先决条件",xinxi:"事故发生后，按照习近平总书记、李克强总理作出的批示指示，郭声琨部长，黄明、李伟副部长坐镇公安部指挥中心，" + +"通过音视频系统指导现场处置工作，尤其是李伟副部长全程、实时跟踪指导一线战斗行动，明确了5条富有实效的战斗措施，为整个灭火救援战斗提供了科学遵循。江苏省委书记罗志军、" + +"省长石泰峰，省委常委、政法委书记、公安厅厅长王立科，公安部消防局局长于建华、副局长罗永强深入火场前沿阵地，指导事故处置工作，鼓舞士气、凝聚警心，为全体参战官兵注入了强大的精神动力。" + +"特别是于建华局长、罗永强副局长率先垂范、靠前指挥，准确研判、抢抓战机、果断决策，采取了一系列行之有效的灭火措施，从根本上遏制了火灾态势，为最终圆满打赢了这场险象环生的战斗起到了决定性作用。"}, + {name:"力量调集充分、响应迅速是有力支撑",xinxi:"针对石油化工火灾的特殊复杂性和灾情预判情况，总队第一时间提请省政府启动重特大灾害事故应急处置预案，按火灾最高等级调集全省13个支队和总队培训基地28个化工编队、" + +"4个战勤保障编队、10套远程供水泵组、124辆大功率泡沫水罐车、161门移动炮、1200吨抗溶性泡沫以及通信、侦检、洗消等装备器材，部消防局紧急调派公安消防部队士官学校和上海总队40辆车、332名官兵到场增援，为打好初战控制、有效遏制灾情扩大提供了有力保障。"}, + {name:"发挥专家作用、科学施救是关键所在",xinxi:"事故发生后，部消防局和总队紧急调派化工灭火专家遂行出动、辅助决策。专家组根据侦察结果，实时评估灾情发展态势和罐体设备安全，及时提出了筑堤设防、全力冷却、" + +"注氮排险等处置建议。尤其是公安部灭火救援专家组郝伟同志，在事故单位2次关阀未果的情况下，多次抵近罐区侦察，与罗永强副局长一起全程指导攻坚组关阀，对成功扑灭大火起到了十分关键的作用。"}, + {name:"应急联动高效、保障有力是重要基础",xinxi:"事故发生后，省、市两级市政府迅速启动应急预案和联动机制，公安、安监、交通、气象、卫生、供水、供电、环保等部门第一时间响应，调集了客运车、环境检测车、" + +"120救护车、叉车、运沙车等各种车辆40余辆和砂土、水泥等应急物资，协同开展了外围警戒、人员疏散、物资保障、环境监测、医疗急救等工作。总、支队两级战勤保障和应急通信力量遂行作战，调集战勤保障车辆22辆、" + +"器材装备600余件套、水带2万多米、泡沫灭火剂约1200吨、油料约52吨，综合利用4G球机、3G单兵、卫星通信指挥车、无人机等设备，实时采集全景视频、火点分布、罐体温度等数据，不间断上传重点部位图像，为现场指挥决策提供了科学参考。"}, + {name:"官兵英勇顽强、舍生忘死是根本保证",xinxi:"面对高温、浓烟、毒害气体和随时可能发生的爆炸，参战官兵从将军到士兵无一人退缩，始终战斗在灭火最前沿，面对生与死的考验，表现出应有的血性和担当。在多次进攻受阻的情况下，全体参战官兵顶着巨大压力，敢打敢拼、死守“红线”，与大火展开拉锯战、攻坚战，彰显了消防铁军英勇善战、敢打必胜的战斗精神。"} + ]} + ]}, + {key:1,zongdata:[ + {name:"基本信息",xinxidata:[ + {name:"码头基本情况",xinxi:"八所港危化品码头位于东方市滨海南路，东侧为中海石油建滔化工有限公司化工厂区（甲醇项目）、中海油东方石化有限责任公司化工厂区" + +"（DCC项目），西侧、北侧、南侧为大海。码头设置3个泊位，1号泊位为10000吨级，2号泊位为5000吨级，3号泊位为50000吨级。该码头目前运营工业园区六家公司的产品，" + +"共有甲醇、原油、汽油、柴油、LPG、丙烯、MTBE等16种作业介质，年吞吐量约为520万吨。"},{name:"事故油轮基本情况",xinxi:"“丰盛油8 号”船体总长99.87m，型宽14.2m，吃水深度7.1m," + +"满载为4800 吨。船体前端和中段共有10 个储油舱，分布在船体左右两侧，每个储油舱480 吨。船尾甲板以上共3 层，分别为驾驶室、船员舱和生活舱。船尾负二层为船员舱，负一层底舱为机" + +"舱,机舱和货舱之间为泵舱。事故发生时油轮已装油完毕正准备离港。"},{name:"石脑油理化性质",xinxi:"石脑油化学俗名为溶剂油、粗汽油，是一种无色或浅黄色易燃液体，有特殊气味。其蒸汽与空气混合，能形成爆炸性混合物。" + +"相对密度为0.78～0.97，闪点小于-18℃，燃点为260℃，爆炸极限%（V/V）为1.2～6.8。不溶于水，溶于多数有机溶剂，主要成分为烷烃的-C4～C6-成分。蒸汽比空气重，沿地面扩散并易积存于低洼处，遇火源会着火回燃。" + +"能够通过呼吸道吸入、皮肤接触、食入等方式进入体内，石脑油蒸气可引起眼及上呼吸道刺激症状。如浓度过高，几分钟即可引起呼吸困难、紫绀等缺氧症状。"}, + {name:"消防水源及消防设施情况",xinxi:"该码头设施的消防用水采用两路供水，一路由后方甲醇项目厂区2 座各为容量4000m3 的消防水池提供，另外一路由后方精细化工项目厂区内2 座各为容量10000m3的消防水池提供，由2 条管" + +"径DN400mm 的消防供水干管接至码头，消防管网供水能力为600L/S，压力0.7～1.2MPa。码头设置46 套消防栓箱、1 套水幕系统、2 套ZPF3000 干粉灭火系统、8 座消防炮塔（每座炮塔上有" + +"电动遥控消防泡沫炮和水炮各一门，消防水炮和消防泡沫炮流量均为80L/s），备有抗溶性水成膜泡沫25 吨，存储在泡沫泵房内，通过比例混合器直接进入泡沫管线，向泡沫栓供给。码头周边" + +"1000m 范围内有可用市政消火栓10 个（园区三路2 个，疏港北路2 个，疏港三中路6 个），压力为0.2～0.3MPa，另距离码头约300m处有华能电厂码头可作为海水取水点。"} + ]} + ]} + ] + zongdata + centerdata + //打开说话框 isOpenTalk = false openTalkDiv(){ this.isOpenTalk = !this.isOpenTalk } + //详情页 isshow=false//控制显隐 - ShowHide (){ - console.log("000") + ShowHide (key){ + console.log(this.tandata) + this.zongdata=this.tandata[key].zongdata + this.centerdata=this.zongdata[0].xinxidata + console.log(this.zongdata) this.isshow=true } ShoeFalse(){ this.isshow=false + /* this.zongdata=null + this.centerdata=null */ + this.zjxinxi="" + this.chooseleft=-1 + this.chooseid=0 + } + //点击弹窗头部 + chooseid=0 + clickHead(num){ + this.zjxinxi="" + this.chooseid=num + this.centerdata=this.zongdata[num].xinxidata + this.chooseleft=-1 + console.log(this.centerdata) + } + + //点击弹窗左侧菜单栏 + zjxinxi + chooseleft + clickLift(key){ + this.chooseleft=key + console.log(key) + this.zjxinxi=this.centerdata[key].xinxi } } From 01637033cd65afb11b9ca489c9db3a2a7ff6d478 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Wed, 23 Sep 2020 17:43:31 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=20=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=A4=84=E7=BD=AE=E9=A2=84=E6=A1=88=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../working-area/working-area.component.ts | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 4b1664c..b4e7ce0 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -429,7 +429,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV const floorData = this.canvasData.originaleveryStoreyData.data; const buildingData = this.canvasData.originalcompanyBuildingData.data; const floor = this.canvasData.selectStorey; - console.log(JSON.stringify(buildingData)); + // console.log(JSON.stringify(buildingData)); // // key=>属性名 data[key]=>属性值 Object.keys(floorData).forEach((key) => { switch (floorData[key].InteractiveMode) { @@ -459,6 +459,28 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } } }); + + const nodeData = this.canvasData.selectPanelPoint?.data; + if (nodeData !== undefined) { + Object.keys(nodeData).forEach((key) => { + // console.log(nodeData[key]); + Object.keys(nodeData[key]).forEach((tempKey) => { + console.log(nodeData[key][tempKey]); + switch (nodeData[key][tempKey].InteractiveMode) { + case 0: + const singleIcon = new SinglePointIcon(nodeData[key][tempKey], this); + break; + case 1: + const icon = new MultipointIcon(nodeData[key][tempKey], this); + break; + case 2: + const polygonIcon = new PolygonIcon(nodeData[key][tempKey], this); + break; + } + }); + }); + console.log(this.canvasData.selectPanelPoint); + } } /** * 加载测试界面 From fc5497716c54fcaa78126e0b23945ad5cac3e888 Mon Sep 17 00:00:00 2001 From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com> Date: Thu, 24 Sep 2020 08:29:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=20=E7=8E=B0?= =?UTF-8?q?=E5=9C=A84=E7=A7=8D=E8=BD=A6=E8=BE=86=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=BC=9A=E5=9C=A8=E9=80=89=E4=B8=AD=E6=97=B6=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=B9=B6=E9=97=AA=E7=83=815=E7=A7=92?= =?UTF-8?q?=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E9=9D=9E=E6=B0=B4=E6=BA=90?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/working-area.component.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index b4e7ce0..72ea103 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -28,7 +28,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV /** * 父组件 */ - @Input( ) init: any; + @Input() init: any; /** * pixijs 程序 */ @@ -243,7 +243,12 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param icon 移动到选中车辆到屏幕中心点 */ public moveIconToScreenCenter(icon) { - if (icon.parent === this.backgroundImage && icon.assetData.Type !== 0) { + if (icon.parent === this.backgroundImage && ( + icon.assetData.Type === 1 || + icon.assetData.Type === 2 || + icon.assetData.Type === 3 || + icon.assetData.Type === 4 + )) { console.log(this.backgroundImage.position); this.backgroundImage.pivot.set(icon.x, icon.y); this.backgroundImage.position.set(771, 404);