diff --git a/src/app/babylon/controller/config-manager.ts b/src/app/babylon/controller/config-manager.ts index 9cdd168..26a0214 100644 --- a/src/app/babylon/controller/config-manager.ts +++ b/src/app/babylon/controller/config-manager.ts @@ -82,9 +82,9 @@ export class ConfigManager { case FacilityType.TPBZ: result = "图片"; break; case FacilityType.DWBZ: result = "点位"; break; //内建 - case FacilityType.XF_MHQ_PT_4: result = "4kg普通灭火器"; break; - case FacilityType.XF_MHQ_PT_8: result = "8kg普通灭火器"; break; - case FacilityType.XF_MHQ_PT_35: result = "35kg普通灭火器"; break; + case FacilityType.XF_MHQ_PT_4: result = "4kg二氧化碳灭火器"; break; + case FacilityType.XF_MHQ_PT_8: result = "8kg二氧化碳灭火器"; break; + case FacilityType.XF_MHQ_PT_35: result = "35kg二氧化碳灭火器"; break; case FacilityType.XF_MHQ_GF_4: result = "4kg干粉灭火器"; break; case FacilityType.XF_MHQ_GF_8: result = "8kg干粉灭火器"; break; case FacilityType.XF_MHQ_GF_25: result = "25kg干粉灭火器"; break; @@ -154,7 +154,7 @@ export class ConfigManager { [MarkType.YGCSJ, "油罐车司机"], [MarkType.XFSD, "消防沙(堆)"], [MarkType.XFSQ, "消防沙(圈)"], - [MarkType.PTMHQ, "普通灭火器"], + [MarkType.PTMHQ, "二氧化碳灭火器"], [MarkType.GFMHQ, "干粉灭火器"], [MarkType.TCMHQ, "推车灭火器"], [MarkType.ZYMBRQ, "专用密闭容器"], diff --git a/src/app/babylon/model/data/model-data/model-data-facility.ts b/src/app/babylon/model/data/model-data/model-data-facility.ts index 9cd43be..d68554f 100644 --- a/src/app/babylon/model/data/model-data/model-data-facility.ts +++ b/src/app/babylon/model/data/model-data/model-data-facility.ts @@ -158,15 +158,15 @@ export enum FacilityType { //模型内置 /** - * 普通灭火器 - 4kg + * 二氧化碳灭火器 - 4kg */ XF_MHQ_PT_4 = "XF_MHQ_PT_4", /** - * 普通灭火器 - 8kg + * 二氧化碳灭火器 - 8kg */ XF_MHQ_PT_8 = "XF_MHQ_PT_8", /** - * 普通灭火器 - 35kg (手推) + * 二氧化碳灭火器 - 35kg (手推) */ XF_MHQ_PT_35 = "XF_MHQ_PT_35", /** diff --git a/src/assets/images/facility/in/XF_MHQ_GF_25.png b/src/assets/images/facility/in/XF_MHQ_GF_25.png index 1814a11..2459568 100644 Binary files a/src/assets/images/facility/in/XF_MHQ_GF_25.png and b/src/assets/images/facility/in/XF_MHQ_GF_25.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_GF_35.png b/src/assets/images/facility/in/XF_MHQ_GF_35.png index 1814a11..ee61dc4 100644 Binary files a/src/assets/images/facility/in/XF_MHQ_GF_35.png and b/src/assets/images/facility/in/XF_MHQ_GF_35.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_GF_4.png b/src/assets/images/facility/in/XF_MHQ_GF_4.png index 620a6fe..721c29e 100644 Binary files a/src/assets/images/facility/in/XF_MHQ_GF_4.png and b/src/assets/images/facility/in/XF_MHQ_GF_4.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_GF_8.png b/src/assets/images/facility/in/XF_MHQ_GF_8.png index 697e80f..7dc3701 100644 Binary files a/src/assets/images/facility/in/XF_MHQ_GF_8.png and b/src/assets/images/facility/in/XF_MHQ_GF_8.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_PT_35.png b/src/assets/images/facility/in/XF_MHQ_PT_35.png index fbd2b78..02a6746 100644 Binary files a/src/assets/images/facility/in/XF_MHQ_PT_35.png and b/src/assets/images/facility/in/XF_MHQ_PT_35.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_PT_4.png b/src/assets/images/facility/in/XF_MHQ_PT_4.png index bb5e697..19c6fdf 100644 Binary files a/src/assets/images/facility/in/XF_MHQ_PT_4.png and b/src/assets/images/facility/in/XF_MHQ_PT_4.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_PT_8.png b/src/assets/images/facility/in/XF_MHQ_PT_8.png index 165d63a..2e7a436 100644 Binary files a/src/assets/images/facility/in/XF_MHQ_PT_8.png and b/src/assets/images/facility/in/XF_MHQ_PT_8.png differ diff --git a/src/assets/images/facility/in/XF_MHT.png b/src/assets/images/facility/in/XF_MHT.png index 59b42ce..045b0bf 100644 Binary files a/src/assets/images/facility/in/XF_MHT.png and b/src/assets/images/facility/in/XF_MHT.png differ diff --git a/src/assets/images/facility/in/XF_XFCM.png b/src/assets/images/facility/in/XF_XFCM.png index ffd5524..58e556f 100644 Binary files a/src/assets/images/facility/in/XF_XFCM.png and b/src/assets/images/facility/in/XF_XFCM.png differ diff --git a/src/assets/images/facility/in/XF_XFF.png b/src/assets/images/facility/in/XF_XFF.png index b163770..ad474a0 100644 Binary files a/src/assets/images/facility/in/XF_XFF.png and b/src/assets/images/facility/in/XF_XFF.png differ diff --git a/src/assets/images/facility/in/XF_XFQ.png b/src/assets/images/facility/in/XF_XFQ.png index 8b37d93..5df3edf 100644 Binary files a/src/assets/images/facility/in/XF_XFQ.png and b/src/assets/images/facility/in/XF_XFQ.png differ diff --git a/src/assets/images/facility/in/XF_XFS.png b/src/assets/images/facility/in/XF_XFS.png index 28d5a34..349613a 100644 Binary files a/src/assets/images/facility/in/XF_XFS.png and b/src/assets/images/facility/in/XF_XFS.png differ diff --git a/src/assets/images/facility/in/XF_XFT.png b/src/assets/images/facility/in/XF_XFT.png index 5f761dd..a6d1776 100644 Binary files a/src/assets/images/facility/in/XF_XFT.png and b/src/assets/images/facility/in/XF_XFT.png differ diff --git a/src/assets/images/mark/inside/gfmhq.png b/src/assets/images/mark/inside/gfmhq.png index 7b64a73..e325789 100644 Binary files a/src/assets/images/mark/inside/gfmhq.png and b/src/assets/images/mark/inside/gfmhq.png differ diff --git a/src/assets/images/mark/inside/ptmhq.png b/src/assets/images/mark/inside/ptmhq.png index eb9dd05..bb8c7f8 100644 Binary files a/src/assets/images/mark/inside/ptmhq.png and b/src/assets/images/mark/inside/ptmhq.png differ diff --git a/src/assets/images/mark/inside/tcmhq.png b/src/assets/images/mark/inside/tcmhq.png index fbd2b78..eab24b2 100644 Binary files a/src/assets/images/mark/inside/tcmhq.png and b/src/assets/images/mark/inside/tcmhq.png differ