完善供水子系统-报警管理

src/router/alarmMenuView.js

@@ -1,12 +1,9 @@
-/** 按菜单的数据范围选择供水专属报警管理，不改数据库下发的 path/name。 */
+/** 兼容已部署菜单仍下发旧组件名，避免动态路由找不到页面。供水报警管理已统一走通用列表 subSystem/alarm/common/list（由菜单 query.rootTypeId 限定范围）。 */
 export function resolveAlarmMenuView(view, rawQuery) {
   let query = rawQuery || {}
   if (typeof query === 'string') {
     try { query = JSON.parse(query) } catch { query = {} }
   }
-  if (['subSystem/alarm/common/list', 'subSystem/alarm/list'].includes(view) && Number(query.rootTypeId) === 1) {
-    return 'subSystem/waterSupply/monitorAlarm/index'
-  }
   // 兼容已部署菜单仍下发旧组件名，避免动态路由找不到行业处置分析页面。
   if (view === 'industryAnalysis') {
     return 'subSystem/lifeCompany/lstatistics/industryAnalysis/index'

src/utils/waterAlarmManagementModel.js

@@ -1,82 +0,0 @@
-import { normalizeAlarmTrend } from './waterHomeModel.js'
-import { alarmPendingText } from './alarmLabels.js'
-
-export const WATER_ALARM_ROOT_TYPE_ID = 1
-
-const displayStatusLabels = { 1: '待核实', 2: '已转工单', 3: '已解除', 4: '误报警' }
-const columns = [
-  ['报警单号', 'alarmNo'], ['设备编码', 'deviceCode'], ['设备名称', 'deviceName'],
-  ['报警类型', 'warningType'], ['报警等级', 'alarmLevelName'], ['报警时间', 'createTime'],
-  ['设备报警状态', 'deviceAlarmStatusText'], ['报警展示状态', 'displayStatusText'],
-  ['处置状态', 'orderStatusText'], ['责任人', 'receiveUserName']
-]
-
-/** 构建供水报警流水查询参数，所有查询均限定供水设备根类型。 */
-export function buildWaterAlarmQuery({
-  pageNum = 1, pageSize = 10, keyword = '', alarmNo = '', alarmLevel,
-  alarmStatus, displayStatus, deviceAlarmStatus, startDate, endDate
-} = {}) {
-  return {
-    rootTypeId: WATER_ALARM_ROOT_TYPE_ID,
-    pageNum: Number(pageNum) || 1,
-    pageSize: Number(pageSize) || 10,
-    ...(String(keyword).trim() ? { keyword: String(keyword).trim() } : {}),
-    ...(String(alarmNo).trim() ? { alarmNo: String(alarmNo).trim() } : {}),
-    ...(alarmLevel == null || alarmLevel === '' ? {} : { alarmLevel }),
-    ...(alarmStatus == null || alarmStatus === '' ? {} : { alarmStatus }),
-    ...(displayStatus == null || displayStatus === '' ? {} : { displayStatus }),
-    ...(deviceAlarmStatus == null || deviceAlarmStatus === '' ? {} : { deviceAlarmStatus }),
-    ...(startDate ? { startTime: `${startDate} 00:00:00` } : {}),
-    ...(endDate ? { endTime: `${endDate} 23:59:59.999999` } : {})
-  }
-}
-
-/** 归一化报警流水行，保持设备报警、报警展示、工单处置三种状态独立。 */
-export function normalizeWaterAlarmRow(row = {}) {
-  const level = Number(row.alarmLevel)
-  const displayStatus = Number(row.displayStatus ?? row.alarmDisplayStatus)
-  const orderStatus = row.orderStatusName ?? (row.orderStatus == null ? '未转工单' : `状态${row.orderStatus}`)
-  return {
-    ...row,
-    alarmLevelName: row.alarmLevelName || (level ? String(level) : '未分级'),
-    monitorStatusText: row.monitorStatusName || '未获取',
-    deviceAlarmStatusText: row.deviceAlarmStatusText || (row.deviceAlarmStatus == null ? '未获取' : Number(row.deviceAlarmStatus) === 1 ? '报警中' : '正常'),
-    displayStatusText: displayStatus === 1 ? '待核实' : alarmPendingText(row.displayStatusText) || displayStatusLabels[displayStatus] || '未知',
-    orderStatusText: orderStatus,
-    receiveUserName: row.receiveUserName || '未分配'
-  }
-}
-
-/** 归一化首页/报警页共用的后端态势聚合。 */
-export function normalizeAlarmDashboard(raw = {}) {
-  const dashboard = raw?.data ?? raw ?? {}
-  return {
-    totalCount: Number(dashboard.totalCount ?? 0),
-    alarmingDeviceCount: Number(dashboard.alarmingDeviceCount ?? 0),
-    trend: normalizeAlarmTrend(dashboard.trend || []),
-    warningTypeRatio: normalizeRatio(dashboard.warningTypeRatio),
-    deviceTypeRatio: normalizeRatio(dashboard.deviceTypeRatio)
-  }
-}
-
-function normalizeRatio(items) {
-  return (Array.isArray(items) ? items : [])
-    .map(item => ({ name: String(item?.name || '未分类'), count: Number(item?.count ?? 0) }))
-    .filter(item => item.count > 0)
-}
-
-export function buildWaterAlarmExportRows(rows = []) {
-  return (Array.isArray(rows) ? rows : []).map(normalizeWaterAlarmRow)
-}
-
-function csvCell(value) {
-  const text = value == null ? '' : String(value)
-  return /[",\r\n]/u.test(text) ? `"${text.replace(/"/gu, '""')}"` : text
-}
-
-/** 将当前筛选的报警流水导出为 Excel 可打开的 CSV。 */
-export function toAlarmCsv(rows = []) {
-  const header = columns.map(([label]) => csvCell(label)).join(',')
-  const lines = buildWaterAlarmExportRows(rows).map(row => columns.map(([, key]) => csvCell(row[key])).join(','))
-  return `\ufeff${[header, ...lines].join('\r\n')}\r\n`
-}

src/views/subSystem/waterSupply/components/WaterAlarmPage.vue

@@ -1,239 +0,0 @@
-<template>
-  <div class="water-page alarm-page">
-    <div class="page-heading">
-      <div class="page-title">
-        <span class="page-title-icon"><el-icon><BellFilled /></el-icon></span>
-        <div><h2>报警管理</h2><span class="muted">供水报警流水、态势趋势与报警台账</span></div>
-      </div>
-      <div class="heading-actions">
-        <el-button :icon="Refresh" :loading="loading" @click="load">刷新</el-button>
-        <el-button type="success" plain :icon="Download" :loading="exportLoading" :disabled="!rows.length" @click="exportData">批量导出</el-button>
-      </div>
-    </div>
-
-    <div class="metric-grid">
-      <div v-for="card in metricCards" :key="card.key" class="metric">
-        <div class="metric-icon" :class="card.tone"><el-icon><component :is="card.icon" /></el-icon></div>
-        <div class="metric-body"><span>{{ card.label }}</span><div class="metric-value"><strong>{{ dashboard[card.key] }}</strong><small>{{ card.unit }}</small></div></div>
-      </div>
-    </div>
-
-    <el-alert v-if="dashboardError" class="dashboard-error" :title="dashboardError" type="error" show-icon :closable="false"><el-button link type="primary" @click="load">重新加载</el-button></el-alert>
-    <div v-loading="dashboardLoading" class="chart-grid">
-      <el-card shadow="never" class="water-panel chart-card trend-card"><template #header><div class="card-title"><el-icon><TrendCharts /></el-icon><span>报警趋势</span><span class="muted chart-caption">近 {{ trendDays }} 天 · 四级报警</span></div></template><div ref="trendRef" class="chart" /></el-card>
-      <el-card shadow="never" class="water-panel chart-card"><template #header><div class="card-title"><el-icon><PieChart /></el-icon><span>报警分类占比</span></div></template><div ref="warningRef" class="chart chart--small" /></el-card>
-      <el-card shadow="never" class="water-panel chart-card"><template #header><div class="card-title"><el-icon><DataAnalysis /></el-icon><span>设备分类占比</span></div></template><div ref="deviceRef" class="chart chart--small" /></el-card>
-    </div>
-
-    <el-card shadow="never" class="filter-card water-panel"><template #header><div class="card-title"><el-icon><Search /></el-icon><span>报警台账筛选</span></div></template>
-      <el-form :inline="true" :model="filters" @submit.prevent="search">
-        <el-form-item label="报警单号"><el-input v-model="filters.alarmNo" clearable placeholder="请输入报警单号" /></el-form-item>
-        <el-form-item label="设备搜索"><el-input v-model="filters.keyword" clearable placeholder="请输入设备编码/名称" /></el-form-item>
-        <el-form-item label="报警等级"><el-select v-model="filters.alarmLevel" clearable placeholder="全部等级"><el-option v-for="level in levels" :key="level.value" :label="level.label" :value="level.value" /></el-select></el-form-item>
-        <el-form-item label="报警展示状态"><el-select v-model="filters.displayStatus" clearable placeholder="全部状态"><el-option v-for="status in displayStatuses" :key="status.value" v-bind="status" /></el-select></el-form-item>
-        <el-form-item label="设备报警状态"><el-select v-model="filters.deviceAlarmStatus" clearable placeholder="全部状态"><el-option label="报警中" :value="1" /><el-option label="正常" :value="0" /></el-select></el-form-item>
-        <el-form-item label="报警时间"><el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" /></el-form-item>
-        <el-form-item><el-button type="primary" :icon="Search" @click="search">查询</el-button><el-button :icon="RefreshLeft" @click="reset">重置</el-button></el-form-item>
-      </el-form>
-    </el-card>
-
-    <el-card shadow="never" class="water-panel table-card"><template #header><div class="table-toolbar"><div class="card-title"><el-icon><List /></el-icon><span>报警流水</span><span class="muted">共 {{ total }} 条</span></div></div></template>
-      <el-alert v-if="error" :title="error" type="error" show-icon :closable="false"><el-button link type="primary" @click="load">重新加载</el-button></el-alert>
-      <el-table v-loading="loading" :data="rows" stripe border @row-click="openDetail">
-        <template #empty><el-empty :description="error ? '暂无法获取报警流水' : '暂无报警流水数据'" /></template>
-        <el-table-column prop="alarmNo" label="报警单号" width="210" show-overflow-tooltip><template #default="{ row }">{{ row.alarmNo || '—' }}</template></el-table-column>
-        <el-table-column prop="deviceCode" label="设备编码" width="190" show-overflow-tooltip />
-        <el-table-column prop="deviceName" label="设备名称" min-width="145" show-overflow-tooltip />
-        <el-table-column prop="warningType" label="报警类型" min-width="145" show-overflow-tooltip />
-        <el-table-column label="报警等级" width="100" align="center"><template #default="{ row }"><el-tag :type="levelType(row.alarmLevel)">{{ levels.find(item => Number(item.value) === Number(row.alarmLevel))?.label || row.alarmLevelName || '—' }}</el-tag></template></el-table-column>
-        <el-table-column prop="createTime" label="报警时间" width="175" sortable="custom" />
-        <el-table-column label="设备报警状态" width="120" align="center"><template #default="{ row }"><el-tag :type="row.deviceAlarmStatus == null ? 'info' : Number(row.deviceAlarmStatus) === 1 ? 'danger' : 'success'">{{ row.deviceAlarmStatusText }}</el-tag></template></el-table-column>
-        <el-table-column label="报警展示状态" width="120" align="center"><template #default="{ row }"><el-tag :type="displayType(row.displayStatus)">{{ row.displayStatusText }}</el-tag></template></el-table-column>
-        <el-table-column label="处置状态" width="110" align="center"><template #default="{ row }"><el-tag type="info">{{ row.orderStatusText }}</el-tag></template></el-table-column>
-        <el-table-column label="操作" width="80" fixed="right"><template #default="{ row }"><el-button link type="primary" :icon="View" @click.stop="openDetail(row)">详情</el-button></template></el-table-column>
-      </el-table>
-      <el-pagination v-model:current-page="pageNum" v-model:page-size="pageSize" :total="total" layout="total, sizes, prev, pager, next" :page-sizes="[10, 20, 50]" @change="load" />
-    </el-card>
-
-    <AlarmDetail ref="detailRef" water-shortcuts />
-  </div>
-</template>
-
-<script setup>
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { BellFilled, DataAnalysis, Download, List, Monitor, PieChart, Refresh, RefreshLeft, Search, TrendCharts, View } from '@element-plus/icons-vue'
-import { ElMessage } from 'element-plus'
-import { saveAs } from 'file-saver'
-import * as echarts from 'echarts'
-import { getAlarmDashboard, getAlarms } from '@/api/alarm'
-import AlarmDetail from '@/views/subSystem/alarm/AlarmDetail.vue'
-import { WATER_ALARM_ROOT_TYPE_ID, buildWaterAlarmQuery, normalizeAlarmDashboard, normalizeWaterAlarmRow, toAlarmCsv } from '@/utils/waterAlarmManagementModel'
-import { normalizePage, unwrapResponse } from '@/utils/waterSupplyModel'
-import { useDict } from '@/utils/dict'
-
-const trendDays = 7
-const filters = ref({ alarmNo: '', keyword: '', alarmLevel: undefined, displayStatus: undefined, deviceAlarmStatus: undefined })
-const dateRange = ref([])
-const pageNum = ref(1), pageSize = ref(10), total = ref(0), rows = ref([]), loading = ref(false), error = ref('')
-const dashboard = ref(normalizeAlarmDashboard())
-const dashboardError = ref('')
-const dashboardLoading = ref(false)
-let loadGeneration = 0
-const exportLoading = ref(false)
-const detailRef = ref()
-const trendRef = ref(), warningRef = ref(), deviceRef = ref()
-let trendChart, warningChart, deviceChart
-const { alarm_level: levels } = useDict('alarm_level')
-const displayStatuses = [{ label: '待核实', value: 1 }, { label: '已转工单', value: 2 }, { label: '已解除', value: 3 }, { label: '误报警', value: 4 }]
-const metricCards = computed(() => [
-  { key: 'totalCount', label: '报警总数', unit: '条', icon: BellFilled, tone: 'tone-blue' },
-  { key: 'alarmingDeviceCount', label: '报警中设备', unit: '台', icon: Monitor, tone: 'tone-red' }
-])
-
-function queryParams() {
-  return buildWaterAlarmQuery({ ...filters.value, pageNum: pageNum.value, pageSize: pageSize.value, startDate: dateRange.value?.[0], endDate: dateRange.value?.[1] })
-}
-async function load() {
-  const token = ++loadGeneration
-  loading.value = true
-  dashboardLoading.value = true
-  error.value = ''
-  dashboardError.value = ''
-  const [listResult, dashboardResult] = await Promise.allSettled([
-    getAlarms(queryParams()),
-    getAlarmDashboard({ rootTypeId: WATER_ALARM_ROOT_TYPE_ID, days: trendDays })
-  ])
-  if (token !== loadGeneration) return
-  if (listResult.status === 'fulfilled') {
-    const page = normalizePage(listResult.value)
-    rows.value = page.records.map(normalizeWaterAlarmRow)
-    total.value = page.total
-  } else {
-    error.value = listResult.reason?.message || '报警流水加载失败，已保留上次结果'
-  }
-  if (dashboardResult.status === 'fulfilled') {
-    dashboard.value = normalizeAlarmDashboard(unwrapResponse(dashboardResult.value))
-    await nextTick()
-    if (token === loadGeneration) renderCharts()
-  } else {
-    dashboardError.value = dashboardResult.reason?.message || '报警态势加载失败，已保留上次结果'
-  }
-  if (token === loadGeneration) { loading.value = false; dashboardLoading.value = false }
-}
-function search() { pageNum.value = 1; load() }
-function reset() { filters.value = { alarmNo: '', keyword: '', alarmLevel: undefined, displayStatus: undefined, deviceAlarmStatus: undefined }; dateRange.value = []; search() }
-function openDetail(row) { detailRef.value?.open(row.id || row.alarmId) }
-function levelType(level) { return ({ 1: 'danger', 2: 'warning', 3: 'primary', 4: 'success' })[Number(level)] || 'info' }
-function displayType(status) { return ({ 1: 'warning', 2: 'primary', 3: 'success', 4: 'info' })[Number(status)] || 'info' }
-async function exportData() {
-  exportLoading.value = true
-  try {
-    const records = []
-    let currentPage = 1
-    let total = Infinity
-    while (records.length < total) {
-      const response = await getAlarms(buildWaterAlarmQuery({ ...filters.value, pageNum: currentPage, pageSize: 100, startDate: dateRange.value?.[0], endDate: dateRange.value?.[1] }))
-      const page = normalizePage(response)
-      total = page.total
-      records.push(...page.records)
-      if (!page.records.length) break
-      currentPage++
-    }
-    saveAs(new Blob([toAlarmCsv(records.map(row => ({ ...row, alarmLevelName: levels.value.find(item => Number(item.value) === Number(row.alarmLevel))?.label || row.alarmLevelName })))], { type: 'text/csv;charset=utf-8' }), `供水报警流水_${new Date().toISOString().slice(0, 10)}.csv`)
-    ElMessage.success('导出完成')
-  } catch (e) {
-    ElMessage.error(e?.message || '导出失败，请稍后重试')
-  } finally { exportLoading.value = false }
-}
-function renderCharts() {
-  trendChart?.dispose(); warningChart?.dispose(); deviceChart?.dispose()
-  trendChart = renderTrend(trendRef.value, dashboard.value.trend)
-  warningChart = renderPie(warningRef.value, dashboard.value.warningTypeRatio)
-  deviceChart = renderPie(deviceRef.value, dashboard.value.deviceTypeRatio)
-}
-function renderTrend(container, trend) {
-  if (!container) return null
-  const chart = echarts.init(container)
-  chart.setOption({ tooltip: { trigger: 'axis' }, legend: { top: 0 }, grid: { left: 40, right: 18, top: 35, bottom: 30 }, xAxis: { type: 'category', data: trend.dates }, yAxis: { type: 'value', minInterval: 1 }, series: trend.levels.map((level, index) => ({ name: levels.value.find(item => Number(item.value) === level.level)?.label || level.text, type: 'line', smooth: true, data: level.data, symbol: 'circle', symbolSize: 6, lineStyle: { width: 2, color: ['#ef4444', '#f97316', '#2563eb', '#22c55e'][index] }, itemStyle: { color: ['#ef4444', '#f97316', '#2563eb', '#22c55e'][index] } })) })
-  return chart
-}
-function renderPie(container, data) {
-  if (!container) return null
-  const chart = echarts.init(container)
-  chart.setOption({ tooltip: { trigger: 'item' }, legend: { bottom: 0 }, series: [{ type: 'pie', radius: ['45%', '70%'], data: data.map(item => ({ name: item.name, value: item.count })), itemStyle: { borderColor: '#fff', borderWidth: 2 } }] })
-  return chart
-}
-watch(levels, () => { if (trendChart) renderCharts() })
-function resizeCharts() { trendChart?.resize(); warningChart?.resize(); deviceChart?.resize() }
-onMounted(() => { load(); window.addEventListener('resize', resizeCharts) })
-onBeforeUnmount(() => { ++loadGeneration; window.removeEventListener('resize', resizeCharts); trendChart?.dispose(); warningChart?.dispose(); deviceChart?.dispose() })
-</script>
-
-<style scoped>
-/* 仅在报警页作用域内复用管网数据统计分析的蓝白卡片语言，避免影响其他供水页面。 */
-.water-page {
-  min-height: calc(100vh - 84px);
-  padding: 20px;
-  color: #1e293b;
-  background: linear-gradient(135deg, #eff6ff 0%, #f8fafc 45%, #eef2f7 100%);
-}
-.page-heading { display: flex; align-items: center; justify-content: space-between; gap: 16px; margin-bottom: 18px; }
-.page-title { display: flex; align-items: center; gap: 12px; min-width: 0; }
-.page-title-icon {
-  display: grid; place-items: center; flex: 0 0 42px;
-  width: 42px; height: 42px; border-radius: 8px; color: #fff;
-  background: linear-gradient(135deg, #2563eb 0%, #06b6d4 100%);
-  box-shadow: 0 8px 16px rgba(37, 99, 235, 0.2);
-}
-.page-heading h2 { margin: 0 0 4px; font-size: 20px; color: #1e293b; }
-.heading-actions { display: flex; align-items: center; gap: 12px; }
-.muted { color: #64748b; font-size: 13px; }
-
-.metric-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 14px; margin-bottom: 16px; }
-.metric {
-  position: static; display: flex; align-items: center; gap: 14px;
-  min-width: 0; padding: 16px 18px; background: #fff;
-  border: 1px solid #e2e8f0; border-radius: 8px;
-  box-shadow: 0 6px 14px rgba(15, 23, 42, 0.04);
-}
-.metric-icon {
-  position: static; top: auto; left: auto; flex: 0 0 42px;
-  display: grid; place-items: center; width: 42px; height: 42px;
-  border-radius: 8px; font-size: 22px;
-}
-.tone-blue { color: #2563eb; background: linear-gradient(135deg, #dbeafe, #eff6ff); }
-.tone-red { color: #dc2626; background: linear-gradient(135deg, #fee2e2, #fff1f2); }
-.metric-body { min-width: 0; }
-.metric-body span { display: block; margin-bottom: 3px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: #64748b; font-size: 13px; }
-.metric-value { display: flex; align-items: baseline; gap: 5px; min-width: 0; }
-.metric-value strong { color: #1e293b; font-size: 24px; line-height: 1.2; }
-.metric-value small { margin-left: 0; color: #94a3b8; }
-
-.chart-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 16px; margin-bottom: 16px; }
-.trend-card { grid-column: 1 / -1; }
-.water-panel { overflow: hidden; border: 1px solid #e2e8f0; border-radius: 8px; box-shadow: 0 6px 14px rgba(15, 23, 42, 0.04); }
-.chart { height: 320px; }
-.card-title { display: flex; align-items: center; justify-content: flex-start; gap: 8px; color: #1e293b; font-weight: 600; }
-.card-title .el-icon { color: #2563eb; font-size: 18px; }
-.chart-caption { margin-left: auto; font-weight: 400; }
-.chart-card :deep(.el-card__header), .filter-card :deep(.el-card__header), .table-card :deep(.el-card__header) {
-  padding: 14px 18px; border-bottom: 1px solid #e2e8f0;
-}
-.filter-card :deep(.el-card__header) { background: #fbfdff; }
-.dashboard-error, .filter-card { margin-bottom: 16px; }
-.filter-card :deep(.el-form-item) { margin: 8px 16px 8px 0; }
-.filter-card :deep(.el-form-item__label) { color: #475569; }
-.table-card :deep(.el-card__body) { padding-top: 0; }
-.table-card :deep(.el-table) { --el-table-border-color: #e2e8f0; --el-table-header-bg-color: #f8fafc; --el-table-header-text-color: #475569; --el-table-row-hover-bg-color: #eff6ff; }
-.table-card :deep(.el-pagination) { justify-content: flex-end; margin-top: 16px; }
-.table-toolbar { display: flex; align-items: center; gap: 10px; }
-@media (max-width: 1000px) { .chart-grid { grid-template-columns: 1fr; } }
-@media (max-width: 650px) {
-  .water-page { padding: 12px; }
-  .page-heading { align-items: flex-start; flex-direction: column; }
-  .metric-grid { grid-template-columns: 1fr; }
-  .heading-actions { width: 100%; }
-  .heading-actions .el-button { flex: 1; }
-  .chart-caption { margin-left: 0; }
-}
-</style>

src/views/subSystem/waterSupply/monitorAlarm/index.vue

@@ -1,4 +0,0 @@
-<script setup>
-import WaterAlarmPage from '../components/WaterAlarmPage.vue'
-</script>
-<template><WaterAlarmPage /></template>

tests/waterAlarmLayout.test.mjs

@@ -1,34 +0,0 @@
-import assert from 'node:assert/strict'
-import { readFile } from 'node:fs/promises'
-import test from 'node:test'
-import postcss from 'postcss'
-import { parse } from '@vue/compiler-sfc'
-
-const pagePath = new URL('../src/views/subSystem/waterSupply/components/WaterAlarmPage.vue', import.meta.url)
-const themePath = new URL('../src/views/subSystem/waterSupply/components/waterSupplyPageTheme.scss', import.meta.url)
-
-async function effectiveDeclarations(selector) {
-  const { descriptor } = parse(await readFile(pagePath, 'utf8'))
-  const sharedTheme = await readFile(themePath, 'utf8')
-  const scopedStyle = descriptor.styles.find(style => style.scoped)?.content || ''
-  const declarations = {}
-  // 实际页面在全局共享主题之后加载 scoped 页面样式；同名选择器按顺序覆盖。
-  postcss.parse(`${sharedTheme}\n${scopedStyle}`).walkRules(rule => {
-    if (!rule.selectors.some(item => item.trim() === selector)) return
-    rule.walkDecls(decl => { declarations[decl.prop] = decl.value })
-  })
-  return declarations
-}
-
-test('alarm metric icon remains in flex flow when the shared page theme is loaded', async () => {
-  const icon = await effectiveDeclarations('.metric-icon')
-  const card = await effectiveDeclarations('.metric')
-  assert.equal(icon.position, 'static', '绝对定位会让图标脱离卡片弹性布局，与数字文字重叠')
-  assert.match(card.display || '', /flex/u)
-})
-
-test('alarm filter title keeps its text adjacent to the search icon', async () => {
-  const heading = await effectiveDeclarations('.card-title')
-  assert.equal(heading['justify-content'], 'flex-start', 'space-between 会将标题推到筛选卡片右侧')
-  assert.ok(Number.parseFloat(heading.gap) > 0)
-})

tests/waterAlarmManagement.test.mjs

@@ -2,108 +2,26 @@ import assert from 'node:assert/strict'
 import { readFile } from 'node:fs/promises'
 import test from 'node:test'
 
-import {
-  WATER_ALARM_ROOT_TYPE_ID,
-  buildWaterAlarmQuery,
-  buildWaterAlarmExportRows,
-  normalizeAlarmDashboard,
-  normalizeWaterAlarmRow,
-  toAlarmCsv
-} from '../src/utils/waterAlarmManagementModel.js'
-
-test('water alarm queries are scoped to the water equipment root', () => {
-  assert.deepEqual(buildWaterAlarmQuery({ keyword: '压力', alarmLevel: 1 }), {
-    rootTypeId: WATER_ALARM_ROOT_TYPE_ID,
-    pageNum: 1,
-    pageSize: 10,
-    keyword: '压力',
-    alarmLevel: 1
-  })
-  assert.deepEqual(buildWaterAlarmQuery({ startDate: '2026-09-01', endDate: '2026-09-28' }), {
-    rootTypeId: 1,
-    pageNum: 1,
-    pageSize: 10,
-    startTime: '2026-09-01 00:00:00',
-    endTime: '2026-09-28 23:59:59.999999'
-  })
-})
-
-test('dashboard normalizes the four alarm-level trends and ratio ledgers', () => {
-  const dashboard = normalizeAlarmDashboard({
-    totalCount: 8,
-    pendingAuditCount: 2,
-    transferredCount: 3,
-    releasedCount: 3,
-    alarmingDeviceCount: 2,
-    trend: [{ date: '2026-09-27', level1Count: 1, level2Count: 2, level3Count: 0, level4Count: 3 }],
-    warningTypeRatio: [{ name: '压力过低', count: 4 }],
-    deviceTypeRatio: [{ name: '压力计', count: 8 }]
-  })
-  assert.equal(dashboard.totalCount, 8)
-  assert.deepEqual(dashboard.trend.levels.map(level => level.data), [[1], [2], [0], [3]])
-  assert.deepEqual(dashboard.warningTypeRatio, [{ name: '压力过低', count: 4 }])
-})
-
-test('alarm ledger row keeps independent monitoring, display and work-order states', () => {
-  const row = normalizeWaterAlarmRow({
-    id: 7,
-    alarmNo: 'BJ202609281200001234',
-    deviceCode: 'CN-GS-202609020001',
-    deviceName: '测试压力计',
-    alarmStatus: 0,
-    monitorStatusName: '异常',
-    deviceAlarmStatus: 0,
-    displayStatus: 2,
-    displayStatusText: '已转工单',
-    orderStatus: 3,
-    orderStatusName: '处理中'
-  })
-  assert.equal(row.monitorStatusText, '异常')
-  assert.equal(row.deviceAlarmStatusText, '正常')
-  assert.equal(row.displayStatusText, '已转工单')
-  assert.equal(row.orderStatusText, '处理中')
-})
-
-test('alarm export contains Chinese headers and preserves alarm number', () => {
-  const csv = toAlarmCsv(buildWaterAlarmExportRows([{ alarmNo: 'BJ202609281200001234', deviceName: '测试压力计', alarmLevelName: '一级报警', displayStatusText: '待审核' }]))
-  assert.ok(csv.startsWith('\ufeff'))
-  assert.match(csv, /报警单号/u)
-  assert.match(csv, /BJ202609281200001234/u)
-  assert.match(csv, /测试压力计/u)
-})
-
-test('water alarm management page exposes ledger, trend and scoped read-only detail', async () => {
-  const source = await readFile('src/views/subSystem/waterSupply/components/WaterAlarmPage.vue', 'utf8')
-  assert.match(source, /getAlarms\(/u)
-  assert.match(source, /getAlarmDashboard\(/u)
-  assert.match(source, /rootTypeId: WATER_ALARM_ROOT_TYPE_ID/u)
-  assert.match(source, /报警流水/u)
-  assert.match(source, /报警趋势/u)
-  assert.match(source, /报警台账/u)
-  assert.match(source, /<AlarmDetail[^>]*water-shortcuts/u)
-  assert.match(source, /批量导出/u)
-  assert.doesNotMatch(source, /dispatchAlarm|auditAlarm|resolveAlarm/u)
-})
-
-test('the water alarm management menu resolves to the dedicated page without changing other subsystems', async () => {
+test('the water alarm management menu resolves to the shared alarm list (scoped by query.rootTypeId)', async () => {
   const { resolveAlarmMenuView } = await import('../src/router/alarmMenuView.js')
-  assert.equal(resolveAlarmMenuView('subSystem/alarm/common/list', '{"rootTypeId":1}'), 'subSystem/waterSupply/monitorAlarm/index')
+  assert.equal(resolveAlarmMenuView('subSystem/alarm/common/list', '{"rootTypeId":1}'), 'subSystem/alarm/common/list')
   assert.equal(resolveAlarmMenuView('subSystem/alarm/common/list', '{"rootTypeId":2}'), 'subSystem/alarm/common/list')
 })
+
 test('water alarm detail offers audit and related work-order shortcuts without changing other systems', async () => {
   const detail = await readFile('src/views/subSystem/alarm/AlarmDetail.vue', 'utf8')
   assert.match(detail, /waterShortcuts/u)
   assert.match(detail, /goWaterWorkOrder/u)
   assert.match(detail, /navigate\('alarmAudit'/u)
 })
+
 test('water menu resolver is wired into dynamic route loading', async () => {
   const source = await readFile('src/store/modules/permission.js', 'utf8')
   assert.match(source, /loadView\(resolveAlarmMenuView\(route.component, route.query\)\)/u)
-  assert.equal(normalizeWaterAlarmRow({ alarmStatus: 0 }).deviceAlarmStatusText, '未获取')
 })
+
 test('misreport remains distinct and the detail shortcut targets a searchable work order', async () => {
-  assert.equal(normalizeWaterAlarmRow({ displayStatus: 4, displayStatusText: '误报警' }).displayStatusText, '误报警')
   const detail = await readFile('src/views/subSystem/alarm/AlarmDetail.vue', 'utf8')
   assert.match(detail, /keyword: alarm.value.orderNo/u)
   assert.ok(detail.includes('min(680px, 100vw)'))
-})
+})