Pārlūkot izejas kodu

feat(cockpit): 消火栓设施点与详情完整接入

ChenJZ 17 stundas atpakaļ
vecāks
revīzija
923ef03605

+ 21 - 0
src/modules/cockpit/domain/entityDetail.js

@@ -224,6 +224,8 @@ const SUMMARY_LABELS = {
     initialReading: '初始读数',
     currentReading: '当前读数',
     annualWaterConsumption: '年用水量',
+    hydrantType: '消火栓类型',
+    inletPipeDiameter: '进水主管管径',
 }
 /** 同类字段在不同设施里的业务名不同(隐患等级 vs 设施等级),差异只在这里登记。 */
 const SUMMARY_LABELS_BY_CATEGORY = {
@@ -231,6 +233,8 @@ const SUMMARY_LABELS_BY_CATEGORY = {
     ENGINEERING_FACILITY: { facilityLevel: '设施等级' },
     DRAINAGE_GATE: { facilityLevel: '设施等级' },
     DRAINAGE_STORAGE: { facilityLevel: '设施等级' },
+    // 消火栓的产权单位与窨井的权属单位是同一字段在不同类别下的业务名。
+    WATER_FIRE_HYDRANT: { ownershipUnit: '产权单位' },
 }
 
 function assetSummary(category, a, status, location) {
@@ -241,6 +245,7 @@ function assetSummary(category, a, status, location) {
         DRAINAGE_GATE: ['facilityLevel', 'designFlow', 'storageCapacity'],
         DRAINAGE_STORAGE: ['facilityLevel', 'designFlow', 'storageCapacity'],
         WATER_USER: ['currentReading', 'annualWaterConsumption', 'userType'],
+        WATER_FIRE_HYDRANT: ['hydrantType', 'model', 'inletPipeDiameter'],
         PUMP_STATION: ['pumpCount', 'designFlow', 'powerCapacity'],
         PIPE_NETWORK: ['lengthMeters', 'diameterMillimeters', 'material'],
         MANHOLE: ['manholeDepth', 'manholeShape', 'material', 'ownershipUnit'],
@@ -290,6 +295,8 @@ const NETWORK_LEVEL_TEXT = { '0': '污水', '1': '雨水' }
 const ENGINEERING_FACILITY_TYPE_TEXT = { '0': '闸门', '1': '调蓄设施', '2': '泵站' }
 /** 窨井井形(manhole_shape):码值直译,认不出回原码(与上面几条同一纪律)。 */
 const MANHOLE_SHAPE_TEXT = { '0': '圆形', '1': '方形', '2': '矩形' }
+/** 消火栓类型(字典 water_fire_hydrant_type:0 市政室外 / 1 小区室外 / 2 室内)。 */
+const HYDRANT_TYPE_TEXT = { '0': '市政室外消火栓', '1': '小区室外消火栓', '2': '室内消火栓' }
 /** 类别中文名:界面上用「中文 + 英文码」,只印英文等于把接口词汇漏上大屏。 */
 const FACILITY_CATEGORY_TEXT = {
     PIPE_NETWORK: '管网',
@@ -299,6 +306,7 @@ const FACILITY_CATEGORY_TEXT = {
     DRAINAGE_GATE: '闸门',
     DRAINAGE_STORAGE: '调蓄设施',
     WATER_USER: '用水户',
+    WATER_FIRE_HYDRANT: '消火栓',
     MANHOLE: '窨井',
     EMERGENCY_RESOURCE: '应急资源',
     HAZARD: '危险源',
@@ -418,6 +426,19 @@ const ASSET_FIELD_ROWS = {
         { label: '年用水量', key: 'annualWaterConsumption' },
         { label: '备注', key: 'remark', wide: true },
     ],
+    // 票 06:消火栓字段按后端 water_fire_hydrant_info 实体登记;类型用字典词表,不发明字段。
+    WATER_FIRE_HYDRANT: [
+        { label: '消火栓类型', key: 'hydrantType', format: (v) => codedText(v, HYDRANT_TYPE_TEXT) },
+        { label: '型号', key: 'model' },
+        { label: '进水主管管径', key: 'inletPipeDiameter' },
+        { label: '出水口规格', key: 'outletSpec' },
+        { label: '产权单位', key: 'ownershipUnit' },
+        { label: '管护单位', key: 'maintenanceUnit' },
+        { label: '责任人', key: 'principal' },
+        { label: '联系电话', key: 'contactPhone' },
+        { label: '位置描述', key: 'location', wide: true },
+        { label: '备注', key: 'remark', wide: true },
+    ],
     PUMP_STATION: [
         { label: '泵站类型', key: 'stationType', format: (v) => pumpStationTypeText(v) },
         { label: '水泵数量', key: 'pumpCount' },

+ 14 - 3
src/modules/cockpit/domain/facilityPoints.js

@@ -1,5 +1,5 @@
 /**
- * 设施点(水厂 / 泵站 / 水源地 / 用水户 / 闸门 / 调蓄设施 / 窨井)—— 票 68/04 的领域层。
+ * 设施点(水厂 / 泵站 / 水源地 / 用水户 / 消火栓 / 闸门 / 调蓄设施 / 窨井)—— 票 68/04/06 的领域层。
  *
  * 与「管线与构件」(`domain/pipeNetwork.js`)分属不同对象域,不共用口径:
  *   · 管线/构件来自 `/infrastructure/geometry`,每个 feature 带后端 `coordinateValidation`;
@@ -24,7 +24,7 @@ import { facilityStatusTone } from './entityDetail.js'
 import { districtQuery, industryQuery } from './filterOptions.js'
 // MANHOLE(维护者 2026-11-16):后端 CockpitEntityCategory 与详情服务已支持窨井,
 // 本白名单同步放行 —— 否则后端能回详情、界面却仍提示「设施类别未发布」。
-export const FACILITY_DETAIL_CATEGORIES = Object.freeze(['WATER_PLANT', 'PUMP_STATION', 'PIPE_NETWORK', 'DRAINAGE_GATE', 'DRAINAGE_STORAGE', 'WATER_USER', 'MANHOLE'])
+export const FACILITY_DETAIL_CATEGORIES = Object.freeze(['WATER_PLANT', 'PUMP_STATION', 'PIPE_NETWORK', 'DRAINAGE_GATE', 'DRAINAGE_STORAGE', 'WATER_USER', 'WATER_FIRE_HYDRANT', 'MANHOLE'])
 
 /** 设施点类型的稳定键(进 filterStore、data-* 断言面与测试,不用中文)。 */
 export const FACILITY_POINT_TYPE = Object.freeze({
@@ -32,6 +32,7 @@ export const FACILITY_POINT_TYPE = Object.freeze({
     PUMP_STATION: 'PUMP_STATION',
     WATER_SOURCE: 'WATER_SOURCE',
     WATER_USER: 'WATER_USER',
+    WATER_FIRE_HYDRANT: 'WATER_FIRE_HYDRANT',
     DRAINAGE_GATE: 'DRAINAGE_GATE',
     DRAINAGE_STORAGE: 'DRAINAGE_STORAGE',
     MANHOLE: 'MANHOLE',
@@ -58,6 +59,15 @@ export const FACILITY_POINT_TYPES = Object.freeze([
         archiveCodes: ['WATER_PUMP_STATION', 'DRAINAGE_PUMP_STATION'],
         detailCategory: 'PUMP_STATION',
     },
+    {
+        key: FACILITY_POINT_TYPE.WATER_FIRE_HYDRANT,
+        label: '消火栓',
+        unit: '座',
+        // 票 06:专属图标后续补,先复用可辨的工程设施占位符号。
+        symbol: 'pipeSpecial',
+        archiveCodes: ['WATER_FIRE_HYDRANT'],
+        detailCategory: 'WATER_FIRE_HYDRANT',
+    },
     {
         key: FACILITY_POINT_TYPE.DRAINAGE_GATE,
         label: '闸门',
@@ -156,7 +166,8 @@ export function normalizeFacilityType(value) {
     if (ARCHIVE_TYPE.has(code)) return ARCHIVE_TYPE.get(code)
     // 实体详情的 `category` 与设施台账的 `facilityKind` 都可能是 WATER_PLANT / PUMP_STATION。
     if (code === 'WATER_PLANT' || code === 'PUMP_STATION' || code === 'WATER_SOURCE'
-            || code === 'WATER_USER' || code === 'DRAINAGE_GATE' || code === 'DRAINAGE_STORAGE'
+            || code === 'WATER_USER' || code === 'WATER_FIRE_HYDRANT'
+            || code === 'DRAINAGE_GATE' || code === 'DRAINAGE_STORAGE'
             || code === 'MANHOLE') return code
     return ''
 }

+ 2 - 0
src/modules/cockpit/domain/markerPlan.js

@@ -63,6 +63,8 @@ const FACILITY_INNER_ICONS = {
     PUMP_STATION: 'facilityPump',
     WATER_SOURCE: 'facilitySource',
     WATER_USER: 'facilityUser',
+    // 票 06:消火栓专属图标后续补,占位沿用工程设施那枚可辨符号。
+    WATER_FIRE_HYDRANT: 'pipeSpecial',
     PIPE_NETWORK: 'pipeSpecial',
     // 票 04:闸门/调蓄的专属图标资产后续补,占位沿用工程设施那枚可辨符号。
     DRAINAGE_GATE: 'pipeSpecial',