Переглянути джерело

feat(cockpit): 运行信息九卡 3x3 设施读数并配专属图标

ChenJZ 3 годин тому
батько
коміт
b602eab072

BIN
public/cockpit/assets/icons/kpi/kpi-facility-gate.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-hydrant.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-manhole.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-pipe-segment.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-plant.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-pump.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-source.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-storage.png


BIN
public/cockpit/assets/icons/kpi/kpi-facility-user.png


+ 288 - 0
public/cockpit/assets/manifest.json

@@ -2279,6 +2279,294 @@
       },
       "fallbackKey": null,
       "core": false
+    },
+    {
+      "key": "icon.kpi.pipeSegment",
+      "path": "assets/icons/kpi/kpi-facility-pipe-segment.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "Pipe管网设施.png",
+        "meaning": "KPI·管段数量(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:e3eb9fef97e32fa2bb5fa3cf470fe258268f6b9ee163e302920312cd326e73f0",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·管段数量"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.gate",
+      "path": "assets/icons/kpi/kpi-facility-gate.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "Q图标供水设备闸门.png",
+        "meaning": "KPI·闸门数量(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:08388d55763ee16cf414922e5ab30e27bbcd32ae79af9851ed66473f8a139565",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·闸门数量"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.manhole",
+      "path": "assets/icons/kpi/kpi-facility-manhole.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "Pipe窨井盖.png",
+        "meaning": "KPI·窨井数量(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:b07bf4ad54e1e12a4615d2501ee3c9aacec9635545f03d4d6f1976cb27772667",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·窨井数量"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.storage",
+      "path": "assets/icons/kpi/kpi-facility-storage.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "Q图标规模种类 调蓄设施.png",
+        "meaning": "KPI·调蓄设施(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:c0403c9a9cfd484d25ca93a42ac22725723da1950a3332d423ed0ddafc2fc160",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·调蓄设施"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.pump",
+      "path": "assets/icons/kpi/kpi-facility-pump.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "Pipe排水.png",
+        "meaning": "KPI·泵站数量(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:e38eb9185c15cdc129bc603f8153da82bb32b738fbb572cf6c623a9fb6cd7f13",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·泵站数量"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.hydrant",
+      "path": "assets/icons/kpi/kpi-facility-hydrant.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "line-art-drawn",
+        "meaning": "KPI·消火栓数(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:8e622d20b5288da63db46a04760ff5986dc8d455fb3639b0dc80ac4ecce1822b",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·消火栓数"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.plant",
+      "path": "assets/icons/kpi/kpi-facility-plant.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "T图标企业.PNG",
+        "meaning": "KPI·水厂数量(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:478238f8e6a3d11640c2d85e97e98fd7737f08258ad19b8d05ce3d241ec3a679",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·水厂数量"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.source",
+      "path": "assets/icons/kpi/kpi-facility-source.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "Pipe供水.png",
+        "meaning": "KPI·水源地数(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:dee6ecaf50a61d38276b29ef2e1e368522148fe46170703b9c634fb9ee58f2ee",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·水源地数"
+      },
+      "fallbackKey": null,
+      "core": false
+    },
+    {
+      "key": "icon.kpi.user",
+      "path": "assets/icons/kpi/kpi-facility-user.png",
+      "source": {
+        "board": null,
+        "delivery": "texture-icon-derived-tinted-white",
+        "layer": "T图标楼房1.PNG",
+        "meaning": "KPI·用水户数(去色染白供 mask 染语义色)"
+      },
+      "format": "png",
+      "dimensions": {
+        "width": 42,
+        "height": 42
+      },
+      "pixelRatio": 1,
+      "transparent": true,
+      "renderMode": "mask",
+      "version": "2026.11-t134-kpi-facility-icons",
+      "hash": "sha256:c314665d3b744400b37873c327e991ddced50db7dcb5e86658acc226f6e24d8c",
+      "status": "formal",
+      "appliesTo": {
+        "areas": [
+          "icon.kpi"
+        ],
+        "states": [
+          "default"
+        ],
+        "meaning": "KPI·用水户数"
+      },
+      "fallbackKey": null,
+      "core": false
     }
   ]
 }

+ 18 - 15
src/modules/cockpit/CockpitShell.vue

@@ -758,22 +758,22 @@ function pendingSection() {
  * "某个面板需要额外输入"的地方,写在壳里比塞进注册表签名更清楚。
  */
 /**
- * 窨井数量(维护者 2026-10-29):从**基础设施档案目录**的设施类型分布里取 `MANHOLE` 那一档。
+ * 基础档案的设施类型分布(票 06):运行信息九项读数与「基础档案」面板同源。
  *
- * 为什么不在运行信息端点自己算:实测该端点的 MANHOLE 块是 `state=EMPTY`、0 条指标 ——
- * 拿它计数只会得到 0,那是「后端没给」而不是「确实没有窨井」,画 0 就是伪造读数。
- * 档案目录里是真实的 3 座,且与「基础档案」的设施类型分布同源。
+ * 为什么不在运行信息端点自己算:运行信息只下发“有指标”的设施,水厂/泵站/水源地会因
+ * 能力值为空而缺席,拿它计数就是把「后端没给」画成 0。档案目录里是真实计数。
  *
- * @returns {number|null} 取不到(分区未就绪/该档缺失)回 null —— 调用方画占位符,不补 0。
+ * 返回数组引用(不是新对象),让 `panelViewOf` 的记忆化键保持稳定;
+ * 档案未就绪/失败时回 null —— 面板显示「—」,不补 0。
  */
-function archiveManholeCount() {
+const archiveFacilityTypes = computed(() => {
     const archive = infrastructureSections.value.archive
     const data = archive && archive.data
-    const types = data && Array.isArray(data.facilityTypes) ? data.facilityTypes : null
-    if (!types) return null
-    const row = types.find((item) => String(item.code || '').toUpperCase() === 'MANHOLE')
-    return row && Number.isFinite(Number(row.count)) ? Number(row.count) : null
-}
+    return data && Array.isArray(data.facilityTypes) ? data.facilityTypes : null
+})
+
+/** 当前是否有行业/片区筛选:档案里缺失的类型,有筛选=0,无筛选=未发布(「—」)。 */
+const facilityFilterActive = computed(() => industry.value !== 'all' || scope.value !== 'all')
 
 /** 面板视图缓存:输入快照不变就返回同一个视图对象(子组件 props 稳定 ⇒ 不重渲染)。 */
 const panelViewMemo = createViewMemo()
@@ -808,7 +808,8 @@ function panelViewOf(panelId) {
         panelId === 'operationOverview' ? deviceStatusStore.pools : null,
         panelId === 'monitoringDistribution' ? pointStatus.value : null,
         panelId === 'operation' ? scope.value : null,
-        panelId === 'operation' ? archiveManholeCount() : null,
+        panelId === 'operation' ? archiveFacilityTypes.value : null,
+        panelId === 'operation' ? facilityFilterActive.value : null,
         panelId === 'operationOverview' ? (overview && overview.data ? overview.data.devices : null) : null,
         panelId === 'perceptionDevices' ? filterStore.industry : null,
     ]
@@ -824,9 +825,11 @@ function panelViewOf(panelId) {
             }
         }
         // 票 64:运行信息要当前**片区**键(换片区 ⇒ 页码回第 1 页,周期刷新 ⇒ 页码保持)。
-        // 维护者 2026-10-29:本端点没有窨井指标(MANHOLE 块实测 state=EMPTY、0 条),
-        // 窨井数量从**基础设施档案目录**搬(与「基础档案」同源);取不到传 null,不造 0。
-        else if (panelId === 'operation') extra = { scope: scope.value, manholeCount: archiveManholeCount() }
+        // 票 06:九项读数取**基础设施档案目录**(与「基础档案」同源);取不到传 null,不造 0。
+        else if (panelId === 'operation') {
+            // 票 06:九项读数取基础档案的设施类型分布;filtered 决定缺失类型显示 0 还是「—」。
+            extra = { scope: scope.value, facilityTypes: archiveFacilityTypes.value, filtered: facilityFilterActive.value }
+        }
         // 票 62:运行概况的设备台账在 `monitoringOverview` 分区(跨分区取数只在这一处搬运)。
         else if (panelId === 'operationOverview') {
             // 维护者 2026-11-04:运行概况的预警/报警设备也取同一份状态池,三处同数。

+ 35 - 0
src/modules/cockpit/domain/facilityPoints.js

@@ -416,6 +416,41 @@ export const FACILITY_LEGEND_ICON = Object.freeze({
     MANHOLE: 'kpiManhole',
 })
 
+/** 管线三类档案码:管段数量=燃气/供水/排水三类之和。 */
+export const PIPE_ARCHIVE_CODES = Object.freeze(['GAS_PIPE', 'WATER_PIPE', 'DRAINAGE_PIPE'])
+
+/**
+ * 基础档案的设施类型分布 → 九类设施计数(票 06)。
+ *
+ * 为什么不用运行信息行数:运行信息只下发“有指标”的设施,水厂/泵站/水源地会因能力值为空
+ * 而缺席;拿它计数会把“后端没下发”读成“确实是 0”。基础档案的设施类型分布是计数口径,
+ * 与「基础档案」面板同源。
+ *
+ * 缺失语义留给调用方:返回 `null` 表示档案里没有该类型(无筛选时=未发布,有筛选时=范围内没有),
+ * 由面板按 `filtered` 决定显示「—」还是 0;本函数不替调用方猜。
+ *
+ * @param {Array|null} facilityTypes 档案 `facilityTypeDistribution` 归并后的 `{code,count}` 行
+ * @returns {object|null} 九类计数(缺失为 null);输入不是数组时回 null(档案未取到)
+ */
+export function facilityCountsFromArchive(facilityTypes) {
+    const rows = Array.isArray(facilityTypes) ? facilityTypes : null
+    if (!rows) return null
+    const byCode = new Map()
+    for (const row of rows) {
+        const code = String((row && row.code) || '').trim().toUpperCase()
+        if (!code) continue
+        const count = Number(row.count)
+        byCode.set(code, Number.isFinite(count) ? count : 0)
+    }
+    const sum = (codes) => {
+        const present = codes.filter((code) => byCode.has(code))
+        return present.length ? present.reduce((total, code) => total + byCode.get(code), 0) : null
+    }
+    const counts = { PIPE_NETWORK: sum(PIPE_ARCHIVE_CODES) }
+    for (const meta of FACILITY_POINT_TYPES) counts[meta.key] = sum(meta.archiveCodes)
+    return counts
+}
+
 function legendHint(row) {
     if (!row) return ''
     if (row.state === FACILITY_LEGEND_STATE.UNAVAILABLE) return '设施点数据未取到'

+ 10 - 0
src/modules/cockpit/domain/icons.js

@@ -68,6 +68,16 @@ const ICON_SPECS = {
     kpiTime: 'icon.kpi.time',
     kpiScale: 'icon.kpi.scale',
     kpiShield: 'icon.kpi.shield',
+    // 票 06:运行信息九项设施读数图标(资源库去色染白,mask 染设施语义色)。
+    kpiPipeSegment: 'icon.kpi.pipeSegment',
+    kpiGate: 'icon.kpi.gate',
+    kpiManhole: 'icon.kpi.manhole',
+    kpiStorage: 'icon.kpi.storage',
+    kpiPump: 'icon.kpi.pump',
+    kpiHydrant: 'icon.kpi.hydrant',
+    kpiPlant: 'icon.kpi.plant',
+    kpiSource: 'icon.kpi.source',
+    kpiUser: 'icon.kpi.user',
     // 票 68:四类设施点符号(地图标记内层 + 设施图例共用同一枚剪影;agent 生成的临时占位,
     // 设计正式切图到位后按同 manifest key 替换文件即可,代码零改动)。
     facilityPlant: 'marker.inner.facilityPlant',

+ 43 - 56
src/modules/cockpit/domain/infrastructurePanels.js

@@ -21,7 +21,7 @@
 import { fieldReader } from './fields.js'
 import { DETAIL_PLACEHOLDER } from './detailFlow.js'
 import { facilityStatusText, facilityStatusTone } from './entityDetail.js'
-import { FACILITY_DETAIL_CATEGORIES } from './facilityPoints.js'
+import { FACILITY_DETAIL_CATEGORIES, facilityCountsFromArchive } from './facilityPoints.js'
 import { collectMissing, valueText } from './equipmentDetailView.js'
 import { industryLabel, normalizeDistrict, districtLabel } from './filterOptions.js'
 import {
@@ -493,17 +493,17 @@ const EMERGENCY_DETAIL_CATEGORY = Object.freeze({
  *   · 后端只回一个块(忽略"全部")→ 如实说"仅统计××",不假称全部(降级路径)。
  */
 /**
- * 运行信息「设施数量」读数(维护者 2026-10-29)。
+ * 运行信息「设施读数」九卡(票 06)。
  *
- * 口径:运行信息端点每条指标对应**一个设施**(管网按段逐条),所以按 `facilityKind` 计数
- * 就是设施数量,不需要第二套聚合。四项是维护者点名的:管段 / 水厂 / 水源地 / 用水户 / 泵站。
+ * 口径:九项计数统一取基础档案的设施类型分布(与「基础档案」面板同源),不再按运行信息
+ * 的指标行计数 —— 运行信息只下发“有指标”的设施,水厂/泵站/水源地会因能力值为空而缺席。
+ * 顺序/标签由维护者给定:管段/闸门/窨井;调蓄/泵站/消火栓;水厂/水源地/用水户。
  *
- * 诚实边界:旧载荷可能只产出 PIPE_NETWORK / WATER_PLANT / PUMP_STATION / ENGINEERING_FACILITY;
- * 水源地(WATER_SOURCE)与用水户(WATER_USER)若没下发明细指标,卡片按占位符 + 说明呈现,
- * 不拿别的类型凑数(缺口写进面板的 gap)。票 05 起前端已按目标契约支持用水户详情。
+ * 诚实边界:档案分布取不到 → 全部「—」;有筛选时某类型缺失 → 0(该范围内确实没有);
+ * 无筛选时缺失 → 「—」(后端未发布),不拿别的类型凑数。
  *
- * @param {Array} metrics `operatingScope()` 交出的指标行(带 `facilityKind`)
- * @returns {Array} 五张 KPI 卡(管段独占一行)
+ * @param {object} [extra] `{ facilityTypes, filtered, manholeCount }`(manholeCount 为旧调用兼容)
+ * @returns {Array} 九张 KPI 卡
  */
 
 /**
@@ -578,49 +578,33 @@ function operatingLedgerRow(metric, index, scope) {
  * 界面现在只展示后者,所以摘要读这一段。
  */
 export const OPERATING_FACILITY_SOURCE_NOTE =
-    '设施数量由后端按设施实体逐条下发(水厂、泵站、管网、排水设施各一条),前端只做按类别计数,不做第二套聚合。' +
-    '「管段数量」数的是管网类设施条数(一段管网一条记录),与「基础档案」的设施类型分布同源;' +
-    '「水厂」「泵站」按设施类别计数。' +
-    '水源地与用水户按本端点实际下发的指标计数;若当前载荷未含该类指标则读数留空,不拿别的类别凑数。'
-export function operatingFacilityCards(metrics, extra = {}) {
-    const list = Array.isArray(metrics) ? metrics : []
-    // 设施类别优先取后端的 facilityKind;老载荷/测试样例没有这个字段时按 metricCode 后缀兜底
-    // (口径模块已登记四类后缀,这里是同一套词,不新造第二份映射)。
-    const kindOf = (row) => {
-        const explicit = String((row && row.facilityKind) || '').toUpperCase()
-        if (explicit) return explicit
-        const code = String((row && row.code) || '')
-        if (code.endsWith('pipe_network_length')) return 'PIPE_NETWORK'
-        if (code.endsWith('water_plant_current_supply')) return 'WATER_PLANT'
-        if (code.endsWith('pump_station_design_flow')) return 'PUMP_STATION'
-        if (code.endsWith('point_count')) return 'ENGINEERING_FACILITY'
-        return ''
+    '九项设施读数取自基础档案的设施类型分布,与「基础档案」面板同源:' +
+    '「管段数量」=燃气/供水/排水三类管线之和,「泵站数量」=供水泵站+排水泵站,其余按设施类型码归并。' +
+    '按行业/片区筛选时,读数随同一份过滤后的档案分布变化;档案取不到时显示「—」,不拿运行信息的行数冒充。'
+export function operatingFacilityCards(extra = {}) {
+    // 九项计数统一取基础档案的设施类型分布(票 06):运行信息只下发“有指标”的设施,
+    // 水厂/泵站/水源地会因能力值为空而缺席,拿它计数就是伪造 0。
+    const counts = facilityCountsFromArchive(extra.facilityTypes)
+    const filtered = extra.filtered === true
+    // 兼容旧调用点(t120 直接传 manholeCount):没有档案分布时只认这一个显式读数。
+    const legacyManhole = typeof extra.manholeCount === 'number' && Number.isFinite(extra.manholeCount) ? extra.manholeCount : null
+    const valueOf = (key) => {
+        if (!counts) return key === 'MANHOLE' ? legacyManhole : null
+        const count = counts[key]
+        if (Number.isFinite(count)) return count
+        // 有筛选时缺失=该范围内确实没有;无筛选时缺失=后端未发布(显示「—」)。
+        return filtered ? 0 : null
     }
-    const countOf = (kinds) => list.filter((row) => kinds.includes(kindOf(row))).length
-    const hasKind = (kinds) => list.some((row) => kinds.includes(kindOf(row)))
-    const pipes = countOf(['PIPE_NETWORK'])
-    const plants = countOf(['WATER_PLANT'])
-    const pumps = countOf(['PUMP_STATION', 'DRAINAGE_PUMP_STATION'])
-    const sources = hasKind(['WATER_SOURCE']) ? countOf(['WATER_SOURCE']) : null
-    const users = hasKind(['WATER_USER']) ? countOf(['WATER_USER']) : null
-    // 窨井数量(维护者 2026-10-29):本端点**没有**窨井指标(MANHOLE 块实测 state=EMPTY、0 条),
-    // 所以不在这里硬造一个 0;由外壳从**基础设施档案目录**(与「基础档案」同一份目录)搬进来,
-    // 与「设施数量与基础档案同源」这条口径一致。拿不到(档案分区空/失败)就回 null → 占位符。
-    const manholeCount = typeof extra.manholeCount === 'number' && Number.isFinite(extra.manholeCount) ? extra.manholeCount : null
     return [
-        { key: 'pipeSegmentCount', label: '管段数量', value: valueText(pipes), unit: '段', caption: '管网按段逐条统计', accent: 'info' },
-        {
-            key: 'manholeCount',
-            label: '窨井数量',
-            value: valueText(manholeCount),
-            unit: '座',
-            caption: '取自基础设施档案目录',
-            hint: manholeCount === null ? '基础设施档案目录未取到,窨井数量暂不可用' : '',
-        },
-        { key: 'waterPlantCount', label: '水厂', value: valueText(plants), unit: '座' },
-        { key: 'waterSourceCount', label: '水源地', value: valueText(sources), unit: '处', hint: sources === null ? '本端点不提供水源地指标,数量见基础档案的设施类型分布' : '' },
-        { key: 'waterUserCount', label: '用水户', value: valueText(users), unit: '户', hint: users === null ? '本端点未下发用水户指标,读数留空' : '' },
-        { key: 'pumpStationCount', label: '泵站', value: valueText(pumps), unit: '座' },
+        { key: 'pipeSegmentCount', label: '管段数量', value: valueText(valueOf('PIPE_NETWORK')), unit: '段', accent: 'info' },
+        { key: 'gateCount', label: '闸门数量', value: valueText(valueOf('DRAINAGE_GATE')), unit: '座' },
+        { key: 'manholeCount', label: '窨井数量', value: valueText(valueOf('MANHOLE')), unit: '座' },
+        { key: 'storageCount', label: '调蓄设施', value: valueText(valueOf('DRAINAGE_STORAGE')), unit: '座' },
+        { key: 'pumpStationCount', label: '泵站数量', value: valueText(valueOf('PUMP_STATION')), unit: '座' },
+        { key: 'hydrantCount', label: '消火栓数', value: valueText(valueOf('WATER_FIRE_HYDRANT')), unit: '座' },
+        { key: 'waterPlantCount', label: '水厂数量', value: valueText(valueOf('WATER_PLANT')), unit: '座' },
+        { key: 'waterSourceCount', label: '水源地数', value: valueText(valueOf('WATER_SOURCE')), unit: '处' },
+        { key: 'waterUserCount', label: '用水户数', value: valueText(valueOf('WATER_USER')), unit: '户' },
     ]
 }
 export function operationPanel(data, section, extra) {
@@ -629,9 +613,9 @@ export function operationPanel(data, section, extra) {
     const metrics = scope.metrics
 
     const blocks = [
-        // 维护者 2026-10-29:指标改为「管段数量 + 窨井数量(并排一行)+ 水厂/水源地/用水户/泵站(1×2×2)」;
-        // 「承载能力=管网长度合计」删除 —— 与基础档案重复,且不是运行读数。
-        kpiBlock(operatingFacilityCards(metrics, extra), { layout: 'two-by-two' }),
+        // 票 06:维护者给定 3×3 九卡顺序(管段/闸门/窨井;调蓄/泵站/消火栓;水厂/水源地/用水户)。
+        // 「承载能力=管网长度合计」仍不恢复 —— 与基础档案重复,且不是运行读数。
+        kpiBlock(operatingFacilityCards(extra), { layout: 'three' }),
         listBlock(
             // 维护者 2026-10-29:标题由「运行指标」改为「设施台账」——
             // 这本来就是**按设施逐条**的清单(一条指标对应一个设施),叫台账比叫指标准确,
@@ -661,10 +645,13 @@ export function operationPanel(data, section, extra) {
         section,
         hasContent: sectionHasContent(section),
         blocks,
-        // 窨井数量取自**基础档案目录**(本端点没有窨井指标,见上面 operatingFacilityCards 的注释):
-        // 本分区为空时它仍可能是真值,不能被空态一起抹成占位符(维护者 2026-11-12 实测:
+        // 九项读数都来自**基础档案目录**(见上面 operatingFacilityCards 的注释):
+        // 本分区为空时它们仍可能是真值,不能被空态一起抹成占位符(维护者 2026-11-12 实测:
         // 同一屏基础档案显示「窨井 3」,这里却显示「—」)。
-        retainedKeys: ['manholeCount'],
+        retainedKeys: [
+            'pipeSegmentCount', 'gateCount', 'manholeCount', 'storageCount', 'pumpStationCount',
+            'hydrantCount', 'waterPlantCount', 'waterSourceCount', 'waterUserCount',
+        ],
         // 票 67 要求 4:说清"当前统计的是哪个行业范围"——全部时列出实际参与的行业,
         // 后端只回一个块时如实降级为"仅统计××"。
         industryNote: scope.note,

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

@@ -480,6 +480,16 @@ export const KPI_ICONS = {
     // 走「未知/缺失」的既有图标。
     districtCount: 'industryCount',
     unassignedFacility: 'unknownOrMissing',
+    // 票 06:运行信息九项设施读数,各有独立图标(资源库去色染白,mask 染语义色)。
+    pipeSegmentCount: 'pipeSegment',
+    gateCount: 'gate',
+    manholeCount: 'manhole',
+    storageCount: 'storage',
+    pumpStationCount: 'pump',
+    hydrantCount: 'hydrant',
+    waterPlantCount: 'plant',
+    waterSourceCount: 'source',
+    waterUserCount: 'user',
     // 应急保障
     hazardSourceCount: 'unknownOrMissing',
     protectionTargetCount: 'shield',
@@ -526,6 +536,17 @@ export const KPI_ICON_COLORS = {
     handlingRate: 'var(--lv4, #27d17a)',
     handlingRateView: 'var(--lv4, #27d17a)',
     createdAt: 'var(--muted, #5680b0)',
+    // 票 06:设施读数图标走行业色(供水青 / 排水绿 / 窨井紫),与 tokens 同源。
+    // 管段数量是燃气+供水+排水三类之和,不属任何单一行业 → 用中性色,不冒充某一行业。
+    pipeSegmentCount: 'var(--muted, #5680b0)',
+    gateCount: 'var(--industry-drainage, #29e36c)',
+    manholeCount: 'var(--industry-manhole, #a970ff)',
+    storageCount: 'var(--industry-drainage, #29e36c)',
+    pumpStationCount: 'var(--industry-water, #168bff)',
+    hydrantCount: 'var(--industry-water, #168bff)',
+    waterPlantCount: 'var(--industry-water, #168bff)',
+    waterSourceCount: 'var(--industry-water, #168bff)',
+    waterUserCount: 'var(--industry-water, #168bff)',
     // 总体概览四模块(票 02)
     warningToday: 'var(--lv2, #ffb020)',
     warningUnresolved: 'var(--lv2, #ffb020)',