新增全部清洗状态和提示;重新设计定位结果页面

This commit is contained in:
JIANG
2025-12-22 16:12:07 +08:00
parent d4f8d26f81
commit 716ff28898
4 changed files with 350 additions and 171 deletions

View File

@@ -19,7 +19,10 @@ import {
} from "@mui/icons-material";
import AnalysisParameters from "./AnalysisParameters";
import SchemeQuery from "./SchemeQuery";
import LocationResults from "./LocationResults";
import LocationResults, { LocationResult } from "./LocationResults";
import axios from "axios";
import { config } from "@config/config";
import { useNotification } from "@refinedev/core";
interface SchemeDetail {
burst_ID: string[];
burst_size: number[];
@@ -74,6 +77,10 @@ const BurstPipeAnalysisPanel: React.FC<BurstPipeAnalysisPanelProps> = ({
// 持久化方案查询结果
const [schemes, setSchemes] = useState<SchemeRecord[]>([]);
// 定位结果数据
const [locationResults, setLocationResults] = useState<LocationResult[]>([]);
const { open } = useNotification();
// 使用受控或非受控状态
const isOpen = controlledOpen !== undefined ? controlledOpen : internalOpen;
@@ -88,6 +95,24 @@ const BurstPipeAnalysisPanel: React.FC<BurstPipeAnalysisPanelProps> = ({
const handleTabChange = (_event: React.SyntheticEvent, newValue: number) => {
setCurrentTab(newValue);
};
const handleLocateScheme = async (scheme: SchemeRecord) => {
try {
const response = await axios.get(
`${config.BACKEND_URL}/postgresql/burst-locate-result/${scheme.schemeName}`
);
setLocationResults(response.data);
setCurrentTab(2); // 切换到定位结果标签页
} catch (error) {
console.error("获取定位结果失败:", error);
open?.({
type: "error",
message: "获取定位结果失败",
description: "无法从服务器获取该方案的定位结果",
});
}
};
const drawerWidth = 520;
return (
@@ -214,19 +239,21 @@ const BurstPipeAnalysisPanel: React.FC<BurstPipeAnalysisPanelProps> = ({
<SchemeQuery
schemes={schemes}
onSchemesChange={setSchemes}
onLocate={(id) => {
console.log("定位方案:", id);
// TODO: 在地图上定位
}}
onLocate={handleLocateScheme}
/>
</TabPanel>
<TabPanel value={currentTab} index={2}>
<LocationResults
onLocate={(coordinates) => {
console.log("定位到:", coordinates);
results={locationResults}
onLocate={(result) => {
console.log("定位到:", result.locate_result);
// TODO: 地图定位到指定坐标
}}
onLocateAll={(results) => {
console.log("定位全部结果:", results);
// TODO: 地图定位到所有结果坐标
}}
onViewDetail={(id) => {
console.log("查看节点详情:", id);
// TODO: 显示节点详细信息

View File

@@ -1,132 +1,188 @@
"use client";
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import {
Box,
Typography,
Table,
TableBody,
TableCell,
TableContainer,
TableHead,
TableRow,
Paper,
Chip,
IconButton,
Tooltip,
Link,
} from "@mui/material";
import { LocationOn as LocationIcon } from "@mui/icons-material";
import { queryFeaturesByIds } from "@/utils/mapQueryService";
import { useMap } from "@app/OlMap/MapComponent";
import { GeoJSON } from "ol/format";
import VectorLayer from "ol/layer/Vector";
import VectorSource from "ol/source/Vector";
import { Stroke, Style, Icon } from "ol/style";
import Feature, { FeatureLike } from "ol/Feature";
import {
LocationOn as LocationIcon,
Visibility as VisibilityIcon,
} from "@mui/icons-material";
along,
lineString,
length,
toMercator,
bbox,
featureCollection,
} from "@turf/turf";
import { Point } from "ol/geom";
import { toLonLat } from "ol/proj";
import moment from "moment";
import "moment-timezone";
interface LocationResult {
export interface LocationResult {
id: number;
nodeName: string;
nodeId: string;
pressure: number;
waterLevel: number;
flow: number;
status: "normal" | "warning" | "danger";
coordinates: [number, number];
type: string;
burst_incident: string;
leakage: number | null;
detect_time: string;
locate_result: string[] | null;
}
interface LocationResultsProps {
onLocate?: (coordinates: [number, number]) => void;
onViewDetail?: (id: number) => void;
results?: LocationResult[];
}
const LocationResults: React.FC<LocationResultsProps> = ({
onLocate,
onViewDetail,
}) => {
const [results, setResults] = useState<LocationResult[]>([
// 示例数据
// {
// id: 1,
// nodeName: '节点A',
// nodeId: 'N001',
// pressure: 0.35,
// waterLevel: 12.5,
// flow: 85.3,
// status: 'normal',
// coordinates: [120.15, 30.25],
// },
]);
const LocationResults: React.FC<LocationResultsProps> = ({ results = [] }) => {
const [highlightLayer, setHighlightLayer] =
useState<VectorLayer<VectorSource> | null>(null);
const [highlightFeatures, setHighlightFeatures] = useState<Feature[]>([]);
const map = useMap();
const getStatusColor = (status: string) => {
switch (status) {
case "normal":
return "success";
case "warning":
return "warning";
case "danger":
return "error";
default:
return "default";
// 格式化时间为 UTC+8
const formatTime = (timeStr: string) => {
return moment(timeStr).utcOffset(8).format("YYYY-MM-DD HH:mm:ss");
};
const handleLocatePipes = (pipeIds: string[]) => {
if (pipeIds.length > 0) {
queryFeaturesByIds(pipeIds).then((features) => {
if (features.length > 0) {
// 设置高亮要素
setHighlightFeatures(features);
// 将 OpenLayers Feature 转换为 GeoJSON Feature
const geojsonFormat = new GeoJSON();
const geojsonFeatures = features.map((feature) =>
geojsonFormat.writeFeatureObject(feature)
);
const extent = bbox(featureCollection(geojsonFeatures as any));
if (extent) {
map?.getView().fit(extent, { maxZoom: 18, duration: 1000 });
}
}
});
}
};
const getStatusText = (status: string) => {
switch (status) {
case "normal":
return "正常";
case "warning":
return "预警";
case "danger":
return "危险";
default:
return "未知";
// 初始化管道图层和高亮图层
useEffect(() => {
if (!map) return;
const burstPipeStyle = function (feature: FeatureLike) {
const styles = [];
// 线条样式(底层发光,主线条,内层高亮线)
styles.push(
new Style({
stroke: new Stroke({
color: "rgba(255, 0, 0, 0.3)",
width: 12,
}),
}),
new Style({
stroke: new Stroke({
color: "rgba(255, 0, 0, 1)",
width: 6,
lineDash: [15, 10],
}),
}),
new Style({
stroke: new Stroke({
color: "rgba(255, 102, 102, 1)",
width: 3,
lineDash: [15, 10],
}),
})
);
const geometry = feature.getGeometry();
const lineCoords =
geometry?.getType() === "LineString"
? (geometry as any).getCoordinates()
: null;
if (geometry && lineCoords) {
const lineCoordsWGS84 = lineCoords.map((coord: []) => {
const [lon, lat] = toLonLat(coord);
return [lon, lat];
});
// 计算中点
const lineStringFeature = lineString(lineCoordsWGS84);
const lineLength = length(lineStringFeature);
const midPoint = along(lineStringFeature, lineLength / 2).geometry
.coordinates;
// 在中点添加 icon 样式
const midPointMercator = toMercator(midPoint);
styles.push(
new Style({
geometry: new Point(midPointMercator),
image: new Icon({
src: "/icons/burst_pipe.svg",
scale: 0.2,
anchor: [0.5, 1],
}),
})
);
}
return styles;
};
// 创建高亮图层
const highlightLayer = new VectorLayer({
source: new VectorSource(),
style: burstPipeStyle,
maxZoom: 24,
minZoom: 12,
properties: {
name: "爆管管段高亮",
value: "burst_pipe_highlight",
},
});
map.addLayer(highlightLayer);
setHighlightLayer(highlightLayer);
return () => {
map.removeLayer(highlightLayer);
};
}, [map]);
// 高亮要素的函数
useEffect(() => {
if (!highlightLayer) {
return;
}
const source = highlightLayer.getSource();
if (!source) {
return;
}
// 清除之前的高亮
source.clear();
// 添加新的高亮要素
highlightFeatures.forEach((feature) => {
if (feature instanceof Feature) {
source.addFeature(feature);
}
});
}, [highlightFeatures, highlightLayer]);
// 取第一条记录或空对象
const result = results.length > 0 ? results[0] : null;
return (
<Box className="flex flex-col h-full">
{/* 统计信息 */}
<Box className="mb-4 p-4 bg-gray-50 rounded">
<Typography variant="subtitle2" className="mb-2 font-medium">
</Typography>
<Box className="flex gap-4">
<Box>
<Typography variant="caption" className="text-gray-600">
</Typography>
<Typography variant="h6" className="font-bold">
{results.length}
</Typography>
</Box>
<Box>
<Typography variant="caption" className="text-gray-600">
</Typography>
<Typography variant="h6" className="font-bold text-green-600">
{results.filter((r) => r.status === "normal").length}
</Typography>
</Box>
<Box>
<Typography variant="caption" className="text-gray-600">
</Typography>
<Typography variant="h6" className="font-bold text-orange-600">
{results.filter((r) => r.status === "warning").length}
</Typography>
</Box>
<Box>
<Typography variant="caption" className="text-gray-600">
</Typography>
<Typography variant="h6" className="font-bold text-red-600">
{results.filter((r) => r.status === "danger").length}
</Typography>
</Box>
</Box>
</Box>
{/* 结果列表 */}
<Box className="flex-1 overflow-auto">
{results.length === 0 ? (
<Box className="flex flex-col items-center justify-center h-full text-gray-400">
{/* 结果展示 */}
<Box className="flex-1 overflow-auto bg-white rounded border border-gray-200">
{!result ? (
<Box className="flex flex-col items-center justify-center h-full text-gray-400 p-4">
<Box className="mb-4">
<svg
width="80"
@@ -183,65 +239,155 @@ const LocationResults: React.FC<LocationResultsProps> = ({
</Typography>
</Box>
) : (
<TableContainer component={Paper} className="shadow-none">
<Table size="small" stickyHeader>
<TableHead>
<TableRow className="bg-gray-50">
<TableCell></TableCell>
<TableCell>ID</TableCell>
<TableCell align="right"> (MPa)</TableCell>
<TableCell align="right"> (m)</TableCell>
<TableCell align="right"> (m³/h)</TableCell>
<TableCell align="center"></TableCell>
<TableCell align="center"></TableCell>
</TableRow>
</TableHead>
<TableBody>
{results.map((result) => (
<TableRow key={result.id} hover>
<TableCell>{result.nodeName}</TableCell>
<TableCell>{result.nodeId}</TableCell>
<TableCell align="right">
{result.pressure.toFixed(3)}
</TableCell>
<TableCell align="right">
{result.waterLevel.toFixed(3)}
</TableCell>
<TableCell align="right">
{result.flow.toFixed(1)}
</TableCell>
<TableCell align="center">
<Box className="p-5 h-full overflow-auto">
{/* 头部:标识信息 */}
<Box className="mb-5">
<Box className="flex items-center gap-2 mb-1">
<Typography
variant="h6"
className="font-bold text-gray-900"
title={result.burst_incident}
>
{result.burst_incident}
</Typography>
<Chip
label={getStatusText(result.status)}
label={result.type}
size="small"
color={getStatusColor(result.status) as any}
color="primary"
variant="outlined"
sx={{
fontWeight: 600,
fontSize: "0.75rem",
height: "24px",
}}
/>
</TableCell>
<TableCell align="center">
<Tooltip title="定位">
</Box>
<Typography variant="caption" className="text-gray-500">
ID: {result.id}
</Typography>
</Box>
{/* 主要信息:三栏卡片布局 */}
<Box className="grid grid-cols-3 gap-3 mb-5">
{/* 检测时间卡片 */}
<Box className="bg-gradient-to-br from-blue-50 to-blue-100 rounded-lg p-3 border border-blue-200 shadow-sm hover:shadow-md transition-shadow">
<Box className="flex items-center gap-1.5 mb-2">
<Box className="w-1.5 h-1.5 rounded-full bg-blue-600"></Box>
<Typography
variant="caption"
className="text-blue-700 font-semibold uppercase tracking-wide"
sx={{ fontSize: "0.7rem" }}
>
</Typography>
</Box>
<Typography
variant="body2"
className="font-bold text-blue-900 leading-tight"
sx={{ fontSize: "0.875rem" }}
>
{formatTime(result.detect_time)}
</Typography>
</Box>
{/* 漏损量卡片 */}
<Box className="bg-gradient-to-br from-orange-50 to-orange-100 rounded-lg p-3 border border-orange-200 shadow-sm hover:shadow-md transition-shadow">
<Box className="flex items-center gap-1.5 mb-2">
<Box className="w-1.5 h-1.5 rounded-full bg-orange-600"></Box>
<Typography
variant="caption"
className="text-orange-700 font-semibold uppercase tracking-wide"
sx={{ fontSize: "0.7rem" }}
>
</Typography>
</Box>
<Typography
variant="body2"
className="font-bold text-orange-900"
sx={{ fontSize: "0.875rem" }}
>
{result.leakage !== null
? `${result.leakage.toFixed(2)} m³/h`
: "N/A"}
</Typography>
</Box>
{/* 定位管段数量卡片 */}
<Box className="bg-gradient-to-br from-green-50 to-green-100 rounded-lg p-3 border border-green-200 shadow-sm hover:shadow-md transition-shadow">
<Box className="flex items-center gap-1.5 mb-2">
<Box className="w-1.5 h-1.5 rounded-full bg-green-600"></Box>
<Typography
variant="caption"
className="text-green-700 font-semibold uppercase tracking-wide"
sx={{ fontSize: "0.7rem" }}
>
</Typography>
</Box>
<Typography
variant="body2"
className="font-bold text-green-900"
sx={{ fontSize: "0.875rem" }}
>
{result.locate_result ? result.locate_result.length : 0}{" "}
</Typography>
</Box>
</Box>
{/* 定位管段详细列表 */}
{result.locate_result && result.locate_result.length > 0 && (
<Box className="bg-white rounded-lg p-4 border-2 border-blue-200 shadow-sm">
<Box className="flex items-center justify-between mb-3">
<Typography
variant="body1"
className="text-gray-900 font-bold"
sx={{ fontSize: "0.95rem" }}
>
</Typography>
<Tooltip title="定位所有管道">
<IconButton
size="small"
onClick={() => onLocate?.(result.coordinates)}
onClick={() => handleLocatePipes(result.locate_result!)}
color="primary"
sx={{
backgroundColor: "rgba(37, 125, 212, 0.1)",
"&:hover": {
backgroundColor: "rgba(37, 125, 212, 0.2)",
},
}}
>
<LocationIcon fontSize="small" />
<LocationIcon sx={{ fontSize: "1.2rem" }} />
</IconButton>
</Tooltip>
<Tooltip title="查看详情">
<IconButton
size="small"
onClick={() => onViewDetail?.(result.id)}
color="primary"
</Box>
<Box className="grid grid-cols-2 gap-2">
{result.locate_result.map((pipeId, idx) => (
<Box
key={idx}
className="bg-gradient-to-r from-blue-50 to-white rounded-lg px-3 py-2 border border-blue-200 hover:border-blue-400 hover:shadow-md transition-all cursor-pointer group"
onClick={() => handleLocatePipes([pipeId])}
>
<VisibilityIcon fontSize="small" />
</IconButton>
</Tooltip>
</TableCell>
</TableRow>
<Box className="flex items-center justify-between">
<Typography
variant="body2"
className="font-semibold text-blue-700 group-hover:text-blue-900"
>
{pipeId}
</Typography>
<LocationIcon
sx={{ fontSize: "1rem" }}
className="text-blue-400 group-hover:text-blue-600 transition-colors"
/>
</Box>
</Box>
))}
</TableBody>
</Table>
</TableContainer>
</Box>
</Box>
)}
</Box>
)}
</Box>
</Box>

View File

@@ -83,7 +83,7 @@ interface SchemaItem {
interface SchemeQueryProps {
schemes?: SchemeRecord[];
onSchemesChange?: (schemes: SchemeRecord[]) => void;
onLocate?: (id: number) => void;
onLocate?: (scheme: SchemeRecord) => void;
network?: string;
}
@@ -486,7 +486,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
<Tooltip title="定位">
<IconButton
size="small"
onClick={() => onLocate?.(scheme.id)}
onClick={() => onLocate?.(scheme)}
color="primary"
className="p-1"
>

View File

@@ -605,6 +605,12 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
setIsCleaning(true);
open?.({
type: "progress",
message: "正在清洗数据,请稍候...",
undoableTimeout: 3000,
});
try {
const startTime = dayjs(cleanStartTime).toISOString();
const endTime = dayjs(cleanEndTime).toISOString();