feat(chat): 优化分析过程与结果展示

Merge PR #2 after API contract, lint, test, and production build verification.

.env.example

@@ -7,8 +7,8 @@ NEXTAUTH_URL="https://frontend.example.com/"
 BACKEND_URL="https://server.example.com"
 AGENT_URL="https://agent.example.com"
 MAP_URL="https://geoserver.example.com/geoserver"
-MAP_WORKSPACE="tjwater"
+MAP_WORKSPACE="tjwater_next"
-MAP_EXTENT="13490131,3630016,13525879,3666968.25"
+MAP_EXTENT="13508801.93,3608163.35,13555650.64,3633685.14"
-NETWORK_NAME="tjwater"
+NETWORK_NAME="tjwater_next"
 MAPBOX_TOKEN="replace-with-public-mapbox-token"
 TIANDITU_TOKEN="replace-with-public-tianditu-token"

contracts/manifest.json

@@ -4,6 +4,10 @@
     "agent": {
       "file": "agent-v1.openapi.json",
       "sha256": "94bd8914597c56b6429160e8c556993ac0617ad079de2980a4b6cb9fdf89c039"
+    },
+    "server": {
+      "file": "server-v1.openapi.json",
+      "sha256": "404a196c0177faed2aa5b46ee86430a034dfe990e0a77a43428a727748a882b6"
     }
   }
 }

package-lock.json

@@ -5611,6 +5611,18 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@nodable/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodable"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -13640,9 +13652,9 @@
       }
     },
     "node_modules/fast-xml-parser": {
-      "version": "5.5.9",
+      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.5.9.tgz",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.0.tgz",
-      "integrity": "sha512-jldvxr1MC6rtiZKgrFnDSvT8xuH+eJqxqOBThUVjYrxssYTo1avZLGql5l0a0BAERR01CadYzZ83kVEkbyDg+g==",
+      "integrity": "sha512-MTcrUoRQ1GSQ9iG3QJzBGquYYYeA7piZaJoIWbPFGbRn6Jj6z7xgoAyi4DrZX4y2ZIQQBF59gc/zmvvejjgoFQ==",
       "funding": [
         {
           "type": "github",
@@ -13651,9 +13663,10 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "fast-xml-builder": "^1.1.4",
+        "@nodable/entities": "^2.1.0",
-        "path-expression-matcher": "^1.2.0",
+        "fast-xml-builder": "^1.1.5",
-        "strnum": "^2.2.2"
+        "path-expression-matcher": "^1.5.0",
+        "strnum": "^2.2.3"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -18189,9 +18202,9 @@
       "license": "MIT"
     },
     "node_modules/nanoid": {
-      "version": "3.3.16",
+      "version": "3.3.18",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz",
-      "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
+      "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
       "funding": [
         {
           "type": "github",

package.json

@@ -59,7 +59,7 @@
     "zustand": "^5.0.11"
   },
   "overrides": {
-    "fast-xml-parser": "5.5.9",
+    "fast-xml-parser": "5.7.0",
     "postcss": "8.5.25",
     "sharp": "0.35.3"
   },

scripts/generate-runtime-config.mjs

@@ -9,22 +9,22 @@ loadEnvConfig(projectDir, process.env.NODE_ENV !== "production");
 
 const parseExtent = (value) => {
   if (!value) {
-    return [13508849, 3608036, 13555781, 3633813];
+    return [13508801.93, 3608163.35, 13555650.64, 3633685.14];
   }
 
   const extent = value.split(",").map(Number);
   return extent.length === 4 && extent.every(Number.isFinite)
     ? extent
-    : [13508849, 3608036, 13555781, 3633813];
+    : [13508801.93, 3608163.35, 13555650.64, 3633685.14];
 };
 
 const config = {
   BACKEND_URL: process.env.BACKEND_URL || "http://127.0.0.1:8000",
   AGENT_URL: process.env.AGENT_URL || "http://127.0.0.1:8788",
   MAP_URL: process.env.MAP_URL || "http://127.0.0.1:8080/geoserver",
-  MAP_WORKSPACE: process.env.MAP_WORKSPACE || "tjwater",
+  MAP_WORKSPACE: process.env.MAP_WORKSPACE || "tjwater_next",
   MAP_EXTENT: parseExtent(process.env.MAP_EXTENT),
-  NETWORK_NAME: process.env.NETWORK_NAME || "tjwater",
+  NETWORK_NAME: process.env.NETWORK_NAME || "tjwater_next",
   MAPBOX_TOKEN: process.env.MAPBOX_TOKEN || "",
   TIANDITU_TOKEN: process.env.TIANDITU_TOKEN || "",
 };

src/components/chat/AgentActivityTimeline.tsx

@@ -0,0 +1,384 @@
+"use client";
+
+import React, { useEffect, useMemo, useState } from "react";
+import {
+  Box,
+  Collapse,
+  IconButton,
+  LinearProgress,
+  Stack,
+  Typography,
+  alpha,
+  useMediaQuery,
+  useTheme,
+} from "@mui/material";
+import AutoAwesomeRounded from "@mui/icons-material/AutoAwesomeRounded";
+import CheckCircleRounded from "@mui/icons-material/CheckCircleRounded";
+import ErrorOutlineRounded from "@mui/icons-material/ErrorOutlineRounded";
+import KeyboardArrowDownRounded from "@mui/icons-material/KeyboardArrowDownRounded";
+import KeyboardArrowUpRounded from "@mui/icons-material/KeyboardArrowUpRounded";
+import RadioButtonUncheckedRounded from "@mui/icons-material/RadioButtonUncheckedRounded";
+import StopCircleRounded from "@mui/icons-material/StopCircleRounded";
+
+import type { AgentActivity, AgentActivityAction } from "@/lib/chatStream";
+
+const activityAccent = "#0097a7";
+
+type TimedActivityItem = {
+  status: "running" | "completed" | "error" | "cancelled";
+  startedAt: number;
+  endedAt?: number;
+  elapsedMs?: number;
+  elapsedSnapshotAt?: number;
+  durationMs?: number;
+};
+
+const formatDuration = (durationMs: number | undefined) => {
+  if (durationMs === undefined || !Number.isFinite(durationMs)) return undefined;
+  if (durationMs < 10_000) return `${(durationMs / 1000).toFixed(1)}s`;
+  const seconds = Math.round(durationMs / 1000);
+  return seconds < 60 ? `${seconds}s` : `${Math.floor(seconds / 60)}m ${seconds % 60}s`;
+};
+
+const getElapsedMs = (
+  item: TimedActivityItem,
+  now: number,
+) => {
+  if (item.durationMs !== undefined) return item.durationMs;
+  if (item.status === "running") {
+    if (item.elapsedMs !== undefined && item.elapsedSnapshotAt !== undefined) {
+      return Math.max(0, item.elapsedMs + now - item.elapsedSnapshotAt);
+    }
+    return Math.max(0, now - item.startedAt);
+  }
+  return item.endedAt ? Math.max(0, item.endedAt - item.startedAt) : undefined;
+};
+
+const StatusIcon = ({
+  status,
+  size = 18,
+}: {
+  status: AgentActivity["status"];
+  size?: number;
+}) => {
+  if (status === "completed") {
+    return <CheckCircleRounded color="success" sx={{ fontSize: size }} />;
+  }
+  if (status === "error") {
+    return <ErrorOutlineRounded color="error" sx={{ fontSize: size }} />;
+  }
+  if (status === "cancelled") {
+    return <StopCircleRounded color="disabled" sx={{ fontSize: size }} />;
+  }
+  return <AutoAwesomeRounded sx={{ fontSize: size, color: activityAccent }} />;
+};
+
+const ActionStatusIcon = ({ status }: { status: AgentActivityAction["status"] }) => {
+  if (status === "error") {
+    return <ErrorOutlineRounded sx={{ mt: "2px", fontSize: 14, color: "error.main" }} />;
+  }
+  if (status === "completed") {
+    return <CheckCircleRounded sx={{ mt: "2px", fontSize: 14, color: "success.main" }} />;
+  }
+  return (
+    <RadioButtonUncheckedRounded
+      sx={{ mt: "2px", fontSize: 14, color: activityAccent }}
+    />
+  );
+};
+
+const ActionRow = ({ action, now }: { action: AgentActivityAction; now: number }) => {
+  const elapsed = getElapsedMs(action, now);
+  return (
+    <Stack
+      direction="row"
+      spacing={1}
+      alignItems="flex-start"
+      sx={{ minWidth: 0, py: 0.55 }}
+    >
+      <ActionStatusIcon status={action.status} />
+      <Box sx={{ minWidth: 0, flex: 1 }}>
+        <Stack
+          direction={{ xs: "column", sm: "row" }}
+          spacing={{ xs: 0.2, sm: 1 }}
+          justifyContent="space-between"
+        >
+          <Typography variant="body2" fontWeight={650} sx={{ lineHeight: 1.45 }}>
+            {action.title}
+          </Typography>
+          <Typography variant="caption" color="text.secondary" sx={{ flexShrink: 0 }}>
+            {formatDuration(elapsed)}
+          </Typography>
+        </Stack>
+        {action.target ? (
+          <Typography
+            variant="caption"
+            color="text.secondary"
+            sx={{
+              display: "block",
+              mt: 0.2,
+              fontFamily: "monospace",
+              wordBreak: "break-word",
+              whiteSpace: "pre-wrap",
+            }}
+          >
+            {action.target}
+          </Typography>
+        ) : null}
+        {action.error ? (
+          <Typography
+            variant="caption"
+            color="error.main"
+            sx={{ display: "block", mt: 0.2, wordBreak: "break-word" }}
+          >
+            {action.error}
+          </Typography>
+        ) : null}
+      </Box>
+    </Stack>
+  );
+};
+
+export const AgentActivityTimeline = ({
+  activities,
+}: {
+  activities: AgentActivity[];
+}) => {
+  const theme = useTheme();
+  const reduceMotion = useMediaQuery("(prefers-reduced-motion: reduce)");
+  const hasRunning = activities.some((activity) => activity.status === "running");
+  const hasError = activities.some((activity) => activity.status === "error");
+  const hasCancelled = activities.some((activity) => activity.status === "cancelled");
+  const [expanded, setExpanded] = useState(false);
+  const [now, setNow] = useState(() => Date.now());
+
+  useEffect(() => {
+    if (!hasRunning) return;
+    const timer = window.setInterval(() => setNow(Date.now()), 500);
+    return () => window.clearInterval(timer);
+  }, [hasRunning]);
+
+  const current = [...activities]
+    .reverse()
+    .find((activity) => activity.status === "running") ?? activities.at(-1);
+  const totalDuration = useMemo(() => {
+    if (!activities.length) return undefined;
+    const start = Math.min(...activities.map((activity) => activity.startedAt));
+    const end = hasRunning
+      ? now
+      : Math.max(
+          ...activities.map((activity) => activity.endedAt ?? activity.startedAt),
+        );
+    return formatDuration(Math.max(0, end - start));
+  }, [activities, hasRunning, now]);
+  const overallStatus: AgentActivity["status"] = hasRunning
+    ? "running"
+    : hasError
+      ? "error"
+      : hasCancelled
+        ? "cancelled"
+        : "completed";
+  const statusLabel = {
+    running: "进行中",
+    completed: "已完成",
+    error: "失败",
+    cancelled: "已停止",
+  }[overallStatus];
+  const statusColor = {
+    running: activityAccent,
+    completed: theme.palette.success.main,
+    error: theme.palette.error.main,
+    cancelled: theme.palette.text.secondary,
+  }[overallStatus];
+  const summary = hasRunning
+    ? (current?.title ?? "正在分析")
+    : hasError
+      ? "分析未完成"
+      : hasCancelled
+        ? "分析已停止"
+        : `已完成 ${activities.length} 个阶段`;
+
+  return (
+    <Box
+      sx={{
+        overflow: "hidden",
+        borderRadius: 3,
+        border: `1px solid ${alpha(activityAccent, 0.16)}`,
+        bgcolor: alpha(activityAccent, 0.035),
+      }}
+    >
+      <Stack
+        direction="row"
+        spacing={1}
+        alignItems="center"
+        sx={{ px: 1.4, py: 1.05 }}
+      >
+        <Box
+          sx={{
+            width: 28,
+            height: 28,
+            flex: "0 0 auto",
+            display: "grid",
+            placeItems: "center",
+            borderRadius: 2,
+            color: activityAccent,
+            bgcolor: alpha(activityAccent, 0.1),
+          }}
+        >
+          <AutoAwesomeRounded sx={{ fontSize: 17 }} />
+        </Box>
+        <Box sx={{ minWidth: 0, flex: 1 }}>
+          <Stack direction="row" spacing={0.75} alignItems="center">
+            <Typography variant="body2" fontWeight={750}>
+              分析过程
+            </Typography>
+            <Stack
+              component="span"
+              direction="row"
+              spacing={0.45}
+              alignItems="center"
+              sx={{ color: statusColor }}
+            >
+              <Box
+                component="span"
+                sx={{
+                  width: 5,
+                  height: 5,
+                  borderRadius: "50%",
+                  bgcolor: "currentColor",
+                }}
+              />
+              <Typography
+                component="span"
+                variant="caption"
+                fontWeight={700}
+                color="inherit"
+              >
+                {statusLabel}
+              </Typography>
+            </Stack>
+          </Stack>
+          <Typography
+            variant="caption"
+            color="text.secondary"
+            noWrap
+            sx={{ display: "block", mt: 0.1 }}
+          >
+            {summary}
+            {totalDuration ? ` · ${totalDuration}` : ""}
+          </Typography>
+        </Box>
+        <IconButton
+          size="small"
+          aria-label={expanded ? "收起分析过程" : "展开分析过程"}
+          onClick={() => setExpanded((current) => !current)}
+          sx={{
+            width: 28,
+            height: 28,
+            flex: "0 0 auto",
+            color: "text.secondary",
+            bgcolor: alpha("#000", 0.035),
+            "&:hover": { bgcolor: alpha("#000", 0.07) },
+          }}
+        >
+          {expanded ? (
+            <KeyboardArrowUpRounded sx={{ fontSize: 18 }} />
+          ) : (
+            <KeyboardArrowDownRounded sx={{ fontSize: 18 }} />
+          )}
+        </IconButton>
+      </Stack>
+      {hasRunning ? (
+        <LinearProgress
+          sx={{
+            height: 2,
+            bgcolor: alpha(activityAccent, 0.08),
+            "& .MuiLinearProgress-bar": { bgcolor: activityAccent },
+          }}
+        />
+      ) : null}
+      <Collapse in={expanded} timeout={reduceMotion ? 0 : 180}>
+        <Stack
+          spacing={1.1}
+          sx={{
+            px: 1.4,
+            py: 1.15,
+          }}
+        >
+          {activities.map((activity, index) => {
+            const elapsed = formatDuration(getElapsedMs(activity, now));
+            return (
+              <Stack
+                key={activity.id}
+                direction="row"
+                spacing={1}
+                sx={{
+                  position: "relative",
+                  minWidth: 0,
+                }}
+              >
+                <Box
+                  sx={{
+                    width: 18,
+                    flex: "0 0 18px",
+                    position: "relative",
+                    pt: "2px",
+                  }}
+                >
+                  {index < activities.length - 1 ? (
+                    <Box
+                      sx={{
+                        position: "absolute",
+                        top: 19,
+                        bottom: -14,
+                        left: 8.5,
+                        width: "1px",
+                        bgcolor: alpha(activityAccent, 0.18),
+                      }}
+                    />
+                  ) : null}
+                  <StatusIcon status={activity.status} size={17} />
+                </Box>
+                <Box sx={{ minWidth: 0, flex: 1 }}>
+                  <Stack direction="row" spacing={1} justifyContent="space-between">
+                    <Typography variant="body2" fontWeight={700} sx={{ lineHeight: 1.45 }}>
+                      {activity.title}
+                    </Typography>
+                    <Typography
+                      variant="caption"
+                      color="text.secondary"
+                      sx={{ flexShrink: 0 }}
+                    >
+                      {elapsed}
+                    </Typography>
+                  </Stack>
+                  <Typography
+                    variant="caption"
+                    color="text.secondary"
+                    sx={{ display: "block", mt: 0.25, lineHeight: 1.5 }}
+                  >
+                    {activity.reason}
+                  </Typography>
+                  {activity.actions.length ? (
+                    <Stack
+                      spacing={0}
+                      sx={{
+                        mt: 0.6,
+                        pl: 1,
+                        borderLeft: `1px solid ${alpha(activityAccent, 0.2)}`,
+                      }}
+                    >
+                      {activity.actions.map((action) => (
+                        <ActionRow key={action.id} action={action} now={now} />
+                      ))}
+                    </Stack>
+                  ) : null}
+                </Box>
+              </Stack>
+            );
+          })}
+        </Stack>
+      </Collapse>
+    </Box>
+  );
+};

src/components/chat/AgentPermissionRequests.tsx

@@ -118,19 +118,10 @@ const PermissionRequestCard = ({
       sx={{
         borderRadius: 3,
         overflow: "hidden",
-        border: `1px solid ${alpha("#fff", 0.72)}`,
+        border: `1px solid ${alpha(accentColor, 0.18)}`,
-        bgcolor: alpha("#fff", 0.5),
+        bgcolor: alpha(accentColor, 0.035),
-        boxShadow: `0 8px 24px ${alpha("#000", 0.05)}`,
+        boxShadow: `0 6px 18px ${alpha("#000", 0.04)}`,
-        backdropFilter: "blur(20px)",
         position: "relative",
-        "&::before": {
-          content: '""',
-          position: "absolute",
-          inset: "10px auto 10px 0",
-          width: 3,
-          borderRadius: "0 999px 999px 0",
-          bgcolor: accentColor,
-        },
       }}
     >
       <Stack
@@ -180,6 +171,22 @@ const PermissionRequestCard = ({
       </Stack>
 
       <Stack spacing={1.15} sx={{ px: 1.5, pt: 1.25, pb: 1.35, pl: 1.75 }}>
+        <Box
+          sx={{
+            px: 1.25,
+            py: 1,
+            borderRadius: 2.5,
+            bgcolor: alpha(accentColor, 0.055),
+            border: `1px solid ${alpha(accentColor, 0.12)}`,
+          }}
+        >
+          <Typography variant="caption" color="text.secondary" fontWeight={800}>
+            执行目的
+          </Typography>
+          <Typography variant="body2" sx={{ mt: 0.25, lineHeight: 1.55 }}>
+            {permission.reason?.trim() || "Agent 未提供执行目的"}
+          </Typography>
+        </Box>
         <Box
           sx={{
             px: 1.25,

src/components/chat/AgentTodoPlanCard.tsx

@@ -29,7 +29,9 @@ export const TodoPlanCard = ({
   const theme = useTheme();
   const total = todoUpdate.todos.length;
   const completed = todoUpdate.todos.filter((todo) => todo.status === "completed").length;
-  const running = todoUpdate.todos.find((todo) => todo.status === "in_progress");
+  const runningCount = todoUpdate.todos.filter(
+    (todo) => todo.status === "in_progress",
+  ).length;
   const cancelled = todoUpdate.todos.filter((todo) => todo.status === "cancelled").length;
   const pending = todoUpdate.todos.filter((todo) => todo.status === "pending").length;
   const progress = total > 0 ? Math.round((completed / total) * 100) : 0;
@@ -77,7 +79,7 @@ export const TodoPlanCard = ({
     ? `${completed} 完成 / ${cancelled} 中止`
     : [
         completed ? `${completed} 完成` : null,
-        running ? "1 进行中" : null,
+        runningCount ? `${runningCount} 进行中` : null,
         pending ? `${pending} 待办` : null,
         cancelled ? `${cancelled} 中止` : null,
       ].filter(Boolean).join(" / ") || "等待任务";
@@ -221,14 +223,14 @@ export const TodoPlanCard = ({
               </Typography>
               <Chip
                 size="small"
-                label={running ? "执行中" : isAborted ? "已中止" : completed === total ? "已完成" : "已同步"}
+                label={runningCount ? "执行中" : isAborted ? "已中止" : completed === total ? "已完成" : "已同步"}
                 sx={{
                   height: 20,
                   borderRadius: "10px",
                   fontSize: "0.66rem",
                   fontWeight: 800,
-                  color: running ? "#0277bd" : isAborted ? "text.secondary" : "#00838f",
+                  color: runningCount ? "#0277bd" : isAborted ? "text.secondary" : "#00838f",
-                  bgcolor: alpha(running ? "#0288d1" : isAborted ? "#64748b" : "#00838f", 0.08),
+                  bgcolor: alpha(runningCount ? "#0288d1" : isAborted ? "#64748b" : "#00838f", 0.08),
                   "& .MuiChip-label": { px: 0.75 },
                 }}
               />
@@ -305,4 +307,3 @@ export const TodoPlanCard = ({
   );
 };
 
-

src/components/chat/AgentTurn.test.tsx

@@ -14,6 +14,7 @@ jest.mock("next/image", () => ({
 
 jest.mock("framer-motion", () => ({
   AnimatePresence: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  useReducedMotion: () => false,
   motion: {
     div: ({
       children,
@@ -44,6 +45,47 @@ jest.mock("./AgentMarkdownBlock", () => ({
 }));
 
 describe("AgentTurn speech selection", () => {
+  it("mounts the answer only after the complete response is available", () => {
+    const sharedProps = {
+      messageSpeechState: "idle" as const,
+      onSpeak: jest.fn(),
+      onPause: jest.fn(),
+      onResume: jest.fn(),
+      onStopSpeech: jest.fn(),
+      isTtsSupported: true,
+      onCreateBranch: jest.fn(),
+      onReplyPermission: jest.fn(),
+      onReplyQuestion: jest.fn(),
+      onRejectQuestion: jest.fn(),
+    };
+    const { rerender } = render(
+      <AgentTurn
+        {...sharedProps}
+        message={{ id: "assistant-buffered", role: "assistant", content: "" }}
+        isStreaming
+      />,
+    );
+
+    expect(screen.queryByTestId("agent-answer-content")).not.toBeInTheDocument();
+    expect(screen.getByText("正在生成")).toBeInTheDocument();
+
+    rerender(
+      <AgentTurn
+        {...sharedProps}
+        message={{
+          id: "assistant-buffered",
+          role: "assistant",
+          content: "完整分析结果已生成。",
+        }}
+        isStreaming
+      />,
+    );
+
+    expect(screen.getByTestId("agent-answer-content")).toHaveTextContent(
+      "完整分析结果已生成。",
+    );
+  });
+
   it("shows a floating action and reads from the selected text", async () => {
     const content = "第一段内容。\n\n第二段内容。";
     const speechText = "第一段内容。\n第二段内容。";
@@ -136,6 +178,7 @@ describe("AgentTurn speech selection", () => {
               permission: "bash",
               patterns: ["npm test"],
               target: "npm test",
+              reason: "需要运行测试确认本次改动没有引入回归。",
               always: ["npm test"],
               createdAt: 1,
               status: "pending",
@@ -158,10 +201,151 @@ describe("AgentTurn speech selection", () => {
 
     expect(screen.getByRole("button", { name: "允许一次" })).toBeInTheDocument();
     expect(screen.getByText("保存授权范围")).toBeInTheDocument();
+    expect(screen.getByText("执行目的")).toBeInTheDocument();
+    expect(screen.getByText("需要运行测试确认本次改动没有引入回归。")).toBeInTheDocument();
     expect(screen.getAllByText("npm test")).toHaveLength(2);
     expect(screen.getByTestId("GppGoodRoundedIcon")).toBeInTheDocument();
     fireEvent.click(screen.getByRole("button", { name: "保存授权" }));
     expect(onReplyPermission).toHaveBeenCalledWith("permission-1", "always");
     expect(screen.getByRole("button", { name: "拒绝" })).toBeInTheDocument();
   });
+
+  it("groups concrete actions under a business activity", () => {
+    render(
+      <AgentTurn
+        message={{
+          id: "assistant-activity",
+          role: "assistant",
+          content: "",
+          activities: [
+            {
+              id: "activity-1",
+              title: "准备供水分区数据",
+              reason: "需要确认拓扑与水库属性完整，才能计算服务范围。",
+              status: "running",
+              startedAt: Date.now(),
+              actions: [
+                {
+                  id: "action-1",
+                  tool: "tjwater_cli",
+                  title: "查询后端数据",
+                  status: "completed",
+                  target: "network get-all-reservoirs-properties",
+                  startedAt: Date.now() - 100,
+                  endedAt: Date.now(),
+                  durationMs: 100,
+                },
+              ],
+            },
+          ],
+        }}
+        isStreaming
+        messageSpeechState="idle"
+        onSpeak={jest.fn()}
+        onPause={jest.fn()}
+        onResume={jest.fn()}
+        onStopSpeech={jest.fn()}
+        isTtsSupported
+        onCreateBranch={jest.fn()}
+        onReplyPermission={jest.fn()}
+        onReplyQuestion={jest.fn()}
+        onRejectQuestion={jest.fn()}
+      />,
+    );
+
+    expect(screen.getByText("分析过程")).toBeInTheDocument();
+    expect(screen.getByText("进行中")).toBeInTheDocument();
+    expect(screen.getAllByText("准备供水分区数据").length).toBeGreaterThan(0);
+    expect(screen.getByTestId("KeyboardArrowDownRoundedIcon")).toBeInTheDocument();
+    expect(
+      screen.queryByText("需要确认拓扑与水库属性完整，才能计算服务范围。"),
+    ).not.toBeVisible();
+    expect(screen.queryByText("查询后端数据")).not.toBeVisible();
+
+    fireEvent.click(screen.getByRole("button", { name: "展开分析过程" }));
+    expect(screen.getByTestId("KeyboardArrowUpRoundedIcon")).toBeInTheDocument();
+    expect(screen.getByText("需要确认拓扑与水库属性完整，才能计算服务范围。")).toBeVisible();
+    expect(screen.getByText("查询后端数据")).toBeVisible();
+  });
+
+  it("shows the actual number of in-progress session tasks", () => {
+    render(
+      <AgentTurn
+        message={{
+          id: "assistant-todos",
+          role: "assistant",
+          content: "",
+          todos: {
+            sessionId: "session-1",
+            createdAt: 1,
+            todos: [
+              { id: "todo-1", content: "准备数据", status: "completed" },
+              { id: "todo-2", content: "分析结果", status: "completed" },
+              { id: "todo-3", content: "生成建议", status: "in_progress" },
+              { id: "todo-4", content: "生成图表", status: "in_progress" },
+            ],
+          },
+        }}
+        isStreaming
+        messageSpeechState="idle"
+        onSpeak={jest.fn()}
+        onPause={jest.fn()}
+        onResume={jest.fn()}
+        onStopSpeech={jest.fn()}
+        isTtsSupported
+        onCreateBranch={jest.fn()}
+        onReplyPermission={jest.fn()}
+        onReplyQuestion={jest.fn()}
+        onRejectQuestion={jest.fn()}
+      />,
+    );
+
+    expect(screen.getByText(/2 完成 \/ 2 进行中/u)).toBeInTheDocument();
+  });
+
+  it("keeps a failed activity compact until the user expands it", () => {
+    render(
+      <AgentTurn
+        message={{
+          id: "assistant-activity-error",
+          role: "assistant",
+          content: "⚠️ **错误：** 模型请求失败",
+          activities: [
+            {
+              id: "activity-error",
+              title: "正在准备分析",
+              reason: "正在理解请求并确定本次分析需要完成的业务步骤。",
+              status: "error",
+              startedAt: Date.now() - 4100,
+              endedAt: Date.now(),
+              durationMs: 4100,
+              actions: [],
+            },
+          ],
+        }}
+        isStreaming={false}
+        messageSpeechState="idle"
+        onSpeak={jest.fn()}
+        onPause={jest.fn()}
+        onResume={jest.fn()}
+        onStopSpeech={jest.fn()}
+        isTtsSupported
+        onCreateBranch={jest.fn()}
+        onReplyPermission={jest.fn()}
+        onReplyQuestion={jest.fn()}
+        onRejectQuestion={jest.fn()}
+      />,
+    );
+
+    expect(screen.getByText("失败")).toBeInTheDocument();
+    expect(screen.getByText("分析未完成 · 4.1s")).toBeInTheDocument();
+    expect(
+      screen.queryByText("正在理解请求并确定本次分析需要完成的业务步骤。"),
+    ).not.toBeVisible();
+
+    fireEvent.click(screen.getByRole("button", { name: "展开分析过程" }));
+    expect(
+      screen.getByText("正在理解请求并确定本次分析需要完成的业务步骤。"),
+    ).toBeInTheDocument();
+  });
 });

src/components/chat/AgentTurn.tsx

@@ -2,7 +2,7 @@
 
 import Image from "next/image";
 import React, { useMemo } from "react";
-import { motion } from "framer-motion";
+import { motion, useReducedMotion } from "framer-motion";
 import {
   Avatar,
   Box,
@@ -33,6 +33,7 @@ import type {
 import { stripMarkdown } from "./globalChatboxUtils";
 import { findSpeechSelectionStartOffset } from "./speechStartOptions";
 import { AgentProgressTimeline } from "./AgentProgressTimeline";
+import { AgentActivityTimeline } from "./AgentActivityTimeline";
 import { ChartGenerationSkeleton, ChatInlineChart } from "./ChatInlineChart";
 import { ChatToolCallBlock } from "./ChatToolCallBlock";
 import { MarkdownBlock, normalizeClipboardText } from "./AgentMarkdownBlock";
@@ -149,61 +150,6 @@ const StreamingStatus = () => {
   );
 };
 
-const StreamingMarkdownBlock = ({
-  text,
-  isStreaming,
-  segmentKey,
-}: {
-  text: string;
-  isStreaming: boolean;
-  segmentKey: string;
-}) => {
-  const [streamTextState, setStreamTextState] = React.useState<{
-    displayText: string;
-    animatedTailLength: number;
-  }>({
-    displayText: text,
-    animatedTailLength: 0,
-  });
-
-  React.useLayoutEffect(() => {
-    setStreamTextState((current) => {
-      if (current.displayText === text) {
-        return current;
-      }
-
-      if (!isStreaming) {
-        return {
-          displayText: text,
-          animatedTailLength: 0,
-        };
-      }
-
-      if (current.displayText === text) {
-        return current;
-      }
-
-      return {
-        displayText: text,
-        animatedTailLength:
-          text.length > current.displayText.length &&
-          text.startsWith(current.displayText)
-            ? Math.min(48, text.length - current.displayText.length)
-            : 0,
-      };
-    });
-  }, [isStreaming, text]);
-
-  return (
-    <MarkdownBlock
-      streamFadeKey={`${segmentKey}-${streamTextState.displayText.length}`}
-      streamFadeLength={streamTextState.animatedTailLength}
-    >
-      {streamTextState.displayText}
-    </MarkdownBlock>
-  );
-};
-
 export const AgentTurn = React.memo(
   ({
     message,
@@ -220,9 +166,11 @@ export const AgentTurn = React.memo(
     onRejectQuestion,
   }: AgentTurnProps) => {
     const theme = useTheme();
+    const reduceMotion = useReducedMotion();
     const isUser = message.role === "user";
     const isErrorMessage = Boolean(message.isError);
     const isStreamingAssistant = !isUser && !isErrorMessage && isStreaming;
+    const hasFinalAnswer = message.content.trim().length > 0;
     const [isHovered, setIsHovered] = React.useState(false);
     const answerContentRef = React.useRef<HTMLDivElement | null>(null);
     const [speechSelection, setSpeechSelection] = React.useState<SpeechSelection | null>(null);
@@ -230,7 +178,8 @@ export const AgentTurn = React.memo(
       (item) => item.phase === "complete" && item.status === "completed",
     ) ?? false;
     const isProgressRunning = !isErrorMessage && !isProgressComplete && (
-      message.progress?.some((item) => item.status === "running") ?? false
+      (message.activities?.some((item) => item.status === "running") ?? false) ||
+      (message.progress?.some((item) => item.status === "running") ?? false)
     );
 
     const parsedAssistantSections = useMemo(
@@ -456,7 +405,9 @@ export const AgentTurn = React.memo(
             }}
           >
             <Stack spacing={1.5}>
-              {message.progress?.length ? (
+              {message.activities?.length ? (
+                <AgentActivityTimeline activities={message.activities} />
+              ) : message.progress?.length ? (
                 <AgentProgressTimeline progress={message.progress} isAborted={isErrorMessage} />
               ) : null}
 
@@ -493,23 +444,45 @@ export const AgentTurn = React.memo(
                 }}
               >
                 <Stack spacing={1.2}>
-                  <Stack direction="row" alignItems="center" justifyContent="space-between" spacing={1}>
+                  <Stack
-                    <Typography variant="caption" color="text.secondary" fontWeight={800} sx={{ letterSpacing: 0.5 }}>
+                    direction="row"
+                    alignItems="center"
+                    justifyContent="space-between"
+                    spacing={1}
+                  >
+                    <Typography
+                      variant="caption"
+                      color="text.secondary"
+                      fontWeight={800}
+                      sx={{ letterSpacing: 0.5 }}
+                    >
                       分析结果
                     </Typography>
                     {isStreamingAssistant ? <StreamingStatus /> : null}
                   </Stack>
+                  {hasFinalAnswer || !isStreamingAssistant ? (
+                    <motion.div
+                      data-testid="agent-answer-content"
+                      initial={
+                        reduceMotion
+                          ? false
+                          : { opacity: 0, y: 6, filter: "blur(2px)" }
+                      }
+                      animate={{ opacity: 1, y: 0, filter: "blur(0px)" }}
+                      transition={{
+                        duration: reduceMotion ? 0 : 0.24,
+                        ease: [0.16, 1, 0.3, 1],
+                      }}
+                    >
+                      <Stack spacing={1.2}>
                         {contentSegments.map((segment, segIdx) => {
                           if (segment.type === "text") {
                             const text = segment.content.trim();
                             if (!text && contentSegments.length > 1) return null;
                             return (
-                        <StreamingMarkdownBlock
+                              <MarkdownBlock key={segIdx}>
-                          key={segIdx}
+                                {text || "..."}
-                          text={text || "..."}
+                              </MarkdownBlock>
-                          isStreaming={isStreamingAssistant}
-                          segmentKey={`${message.id}-${segIdx}`}
-                        />
                             );
                           }
                           if (segment.type === "tool_call") {
@@ -523,12 +496,22 @@ export const AgentTurn = React.memo(
                                   key={segment.toolCall.id}
                                   title={(p.title as string) ?? undefined}
                                   chart_type={
-                              (p.chart_type as "line" | "bar" | "pie") ?? "line"
+                                    (p.chart_type as "line" | "bar" | "pie") ??
+                                    "line"
+                                  }
+                                  x_data={
+                                    p.x_data ??
+                                    p.xData ??
+                                    p.labels ??
+                                    p.categories
                                   }
-                            x_data={p.x_data ?? p.xData ?? p.labels ?? p.categories}
                                   series={p.series}
-                            x_axis_name={(p.x_axis_name as string) ?? undefined}
+                                  x_axis_name={
-                            y_axis_name={(p.y_axis_name as string) ?? undefined}
+                                    (p.x_axis_name as string) ?? undefined
+                                  }
+                                  y_axis_name={
+                                    (p.y_axis_name as string) ?? undefined
+                                  }
                                   isStreaming={isStreamingAssistant}
                                 />
                               );
@@ -551,6 +534,9 @@ export const AgentTurn = React.memo(
                           return null;
                         })}
                       </Stack>
+                    </motion.div>
+                  ) : null}
+                </Stack>
               </Box>
 
               <Popper

src/components/chat/ChatToolCallBlock.tsx

@@ -45,12 +45,12 @@ type ToolMeta = {
 
 const LOCATE_TOOL_TO_LAYER: Record<string, string> = {
   locate_features: "",
-  locate_junctions: "geo_junctions_mat",
+  locate_junctions: "junctions",
-  locate_pipes: "geo_pipes_mat",
+  locate_pipes: "pipes",
-  locate_valves: "geo_valves",
+  locate_valves: "valves",
-  locate_reservoirs: "geo_reservoirs",
+  locate_reservoirs: "reservoirs",
-  locate_pumps: "geo_pumps",
+  locate_pumps: "pumps",
-  locate_tanks: "geo_tanks",
+  locate_tanks: "tanks",
 };
 
 const LOCATE_LINE_TOOLS = new Set<string>(["locate_pipes"]);
@@ -672,22 +672,22 @@ export const ChatToolCallBlock: React.FC<ChatToolCallBlockProps> = ({
     switch (featureType) {
       case "junction":
       case "junctions":
-        return { layer: "geo_junctions_mat", geometryKind: "point" };
+        return { layer: "junctions", geometryKind: "point" };
       case "pipe":
       case "pipes":
-        return { layer: "geo_pipes_mat", geometryKind: "line" };
+        return { layer: "pipes", geometryKind: "line" };
       case "valve":
       case "valves":
-        return { layer: "geo_valves", geometryKind: "point" };
+        return { layer: "valves", geometryKind: "point" };
       case "reservoir":
       case "reservoirs":
-        return { layer: "geo_reservoirs", geometryKind: "point" };
+        return { layer: "reservoirs", geometryKind: "point" };
       case "pump":
       case "pumps":
-        return { layer: "geo_pumps", geometryKind: "point" };
+        return { layer: "pumps", geometryKind: "point" };
       case "tank":
       case "tanks":
-        return { layer: "geo_tanks", geometryKind: "point" };
+        return { layer: "tanks", geometryKind: "point" };
       default:
         return null;
     }

src/components/chat/GlobalChatbox.tsx

@@ -229,18 +229,23 @@ export const GlobalChatbox: React.FC<Props> = ({ open, onClose }) => {
 
   useEffect(() => {
     if (isStreaming) {
+      const latestAssistant = [...messages]
+        .reverse()
+        .find((message) => message.role === "assistant");
+      if (latestAssistant?.content.trim()) {
+        cancelStreamingScroll();
+        return;
+      }
       if (!isNearBottomRef.current) return;
       scheduleStreamingScrollToBottom();
       return;
     }
     cancelStreamingScroll();
-    scrollToBottom("smooth");
   }, [
     cancelStreamingScroll,
     isStreaming,
     messages,
     scheduleStreamingScrollToBottom,
-    scrollToBottom,
   ]);
 
   useEffect(

src/components/chat/GlobalChatbox.types.ts

@@ -1,4 +1,5 @@
 import type {
+  AgentActivity,
   AgentQuestionRequest,
   AgentTodoUpdate,
 } from "@/lib/chatStream";
@@ -42,6 +43,8 @@ export type AgentPermissionRequest = {
   permission: string;
   patterns: string[];
   target?: string;
+  activityId?: string;
+  reason?: string;
   always: string[];
   tool?: {
     messageID: string;
@@ -59,6 +62,7 @@ export type Message = {
   content: string;
   isError?: boolean;
   progress?: ChatProgress[];
+  activities?: AgentActivity[];
   artifacts?: AgentArtifact[];
   permissions?: AgentPermissionRequest[];
   questions?: AgentQuestionRequest[];

src/components/chat/hooks/agentChatSessionState.ts

@@ -1,4 +1,5 @@
 import type {
+  AgentActivity,
   AgentQuestionRequest,
   AgentTodoUpdate,
   PermissionReply,
@@ -79,6 +80,48 @@ export const completeRunningProgress = (progress: ChatProgress[] | undefined) =>
     };
   });
 
+export const upsertActivity = (
+  activities: AgentActivity[] | undefined,
+  event: StreamEvent & { type: "activity_update" },
+) => {
+  const next = [...(activities ?? [])];
+  const index = next.findIndex((activity) => activity.id === event.activity.id);
+  if (index >= 0) next[index] = event.activity;
+  else next.push(event.activity);
+  return next;
+};
+
+export const completeRunningActivities = (
+  activities: AgentActivity[] | undefined,
+  status: "completed" | "error" | "cancelled" = "completed",
+) => activities?.map((activity) => {
+  if (activity.status !== "running") return activity;
+  const endedAt = Date.now();
+  return {
+    ...activity,
+    status,
+    actions: activity.actions.map((action) =>
+      action.status === "running"
+        ? {
+            ...action,
+            status: status === "error" ? "error" as const : "completed" as const,
+            endedAt,
+            elapsedMs: undefined,
+            elapsedSnapshotAt: undefined,
+            durationMs: Math.max(0, endedAt - action.startedAt),
+            ...(status === "error"
+              ? { error: action.error ?? "活动执行失败" }
+              : {}),
+          }
+        : action,
+    ),
+    endedAt,
+    elapsedMs: undefined,
+    elapsedSnapshotAt: undefined,
+    durationMs: Math.max(0, endedAt - activity.startedAt),
+  };
+});
+
 export const cancelRunningTodos = (todoUpdate: AgentTodoUpdate | undefined) =>
   todoUpdate
     ? {
@@ -107,6 +150,8 @@ export const upsertPermission = (
     permission: event.permission,
     patterns: event.patterns,
     target: event.target,
+    activityId: event.activityId,
+    reason: event.reason,
     always: event.always,
     tool: event.tool,
     createdAt: event.createdAt,
@@ -405,6 +450,7 @@ export const rejectOpenQuestionsAfterAbort = (
 
 export const finalizeAssistantMessageAfterAbort = (message: Message): Message => {
   const completedProgress = completeRunningProgress(message.progress);
+  const cancelledActivities = completeRunningActivities(message.activities, "cancelled");
   const cancelledTodos = cancelRunningTodos(message.todos);
   const abortedPermissions = abortOpenPermissionsAfterAbort(message.permissions);
   const rejectedQuestions = rejectOpenQuestionsAfterAbort(message.questions);
@@ -414,6 +460,7 @@ export const finalizeAssistantMessageAfterAbort = (message: Message): Message =>
     Boolean(abortedPermissions?.length) ||
     Boolean(rejectedQuestions?.length) ||
     Boolean(completedProgress?.length) ||
+    Boolean(cancelledActivities?.length) ||
     Boolean(cancelledTodos);
 
   if (!hasVisibleOutput) {
@@ -425,6 +472,7 @@ export const finalizeAssistantMessageAfterAbort = (message: Message): Message =>
     content: message.content || "⚠️ **请求已中断**",
     isError: true,
     progress: completedProgress,
+    activities: cancelledActivities,
     permissions: abortedPermissions,
     questions: rejectedQuestions,
     todos: cancelledTodos,

src/components/chat/hooks/useAgentChatSession.actions.test.tsx

@@ -132,6 +132,80 @@ describe("useAgentChatSession actions", () => {
     );
   });
 
+  it("applies an activity phase and todo snapshot atomically before revealing the final answer", async () => {
+    listChatSessions.mockResolvedValue([]);
+    jest.mocked(streamAgentChat).mockImplementationOnce(async ({ onEvent }) => {
+      onEvent({
+        type: "activity_update",
+        sessionId: "session-1",
+        activity: {
+          id: "activity-analyze",
+          title: "分析管网数据",
+          reason: "需要识别影响供水能力的关键管段。",
+          status: "running",
+          actions: [],
+          startedAt: 1000,
+        },
+        todos: [
+          {
+            id: "todo-data",
+            content: "准备管网数据",
+            status: "completed",
+            priority: "high",
+          },
+          {
+            id: "todo-analysis",
+            content: "识别瓶颈管段",
+            status: "in_progress",
+            priority: "high",
+          },
+        ],
+        todosCreatedAt: 1001,
+      });
+      onEvent({
+        type: "final_answer",
+        sessionId: "session-1",
+        content: "已识别关键瓶颈管段。",
+      });
+      onEvent({ type: "done", sessionId: "session-1" });
+    });
+
+    const { result } = renderHook(() =>
+      useAgentChatSession({
+        projectId: "project-1",
+        onToolCall: jest.fn(),
+      }),
+    );
+
+    await waitFor(() => expect(result.current.isHydrating).toBe(false));
+
+    await act(async () => {
+      await result.current.sendPrompt("分析管网瓶颈");
+    });
+
+    const assistantMessage = result.current.messages.at(-1);
+    expect(assistantMessage).toMatchObject({
+      role: "assistant",
+      content: "已识别关键瓶颈管段。",
+      todos: {
+        sessionId: "session-1",
+        createdAt: 1001,
+        todos: [
+          expect.objectContaining({ id: "todo-data", status: "completed" }),
+          expect.objectContaining({ id: "todo-analysis", status: "completed" }),
+        ],
+      },
+    });
+    expect(
+      assistantMessage?.activities?.find(
+        (activity) => activity.id === "activity-analyze",
+      ),
+    ).toMatchObject({
+      title: "分析管网数据",
+      status: "completed",
+    });
+  });
+
   it("finalizes running progress when aborting an active prompt", async () => {
     listChatSessions.mockResolvedValue([]);
     jest.mocked(streamAgentChat).mockImplementationOnce(

src/components/chat/hooks/useAgentChatSession.lifecycle.test.tsx

@@ -340,7 +340,7 @@ describe("useAgentChatSession lifecycle and resume", () => {
           }),
           expect.objectContaining({
             id: "todo-2",
-            status: "in_progress",
+            status: "completed",
           }),
         ],
       }),

src/components/chat/hooks/useAgentChatSession.ts

@@ -31,6 +31,7 @@ import {
 import {
   applyQuestionResponse,
   cancelRunningTodos,
+  completeRunningActivities,
   completeRunningProgress,
   createAssistantMessage,
   createTodoUpdateFromEvent,
@@ -40,6 +41,7 @@ import {
   normalizeSessionTodos,
   toPermissionStatus,
   upsertPermission,
+  upsertActivity,
   upsertProgress,
   upsertQuestionAcrossMessages,
 } from "./agentChatSessionState";
@@ -48,68 +50,21 @@ import type {
   UseAgentChatSessionOptions,
 } from "./useAgentChatSession.types";
 
-const TOKEN_PLAYBACK_INTERVAL_MS = 16;
+const completeTodos = (todoUpdate: Message["todos"]) =>
-const TOKEN_PLAYBACK_BASE_CHARS = 28;
+  todoUpdate
-const TOKEN_PLAYBACK_MAX_CHARS = 160;
+    ? {
-
+        ...todoUpdate,
-const sliceCodePoints = (value: string, count: number) =>
+        todos: todoUpdate.todos.map((todo) =>
-  Array.from(value).slice(0, count).join("");
+          todo.status === "pending" || todo.status === "in_progress"
-
+            ? {
-let cachedSegmenter: Intl.Segmenter | null | undefined;
+                ...todo,
-
+                status: "completed" as const,
-const getSegmenter = () => {
+                updatedAt: Date.now(),
-  if (cachedSegmenter !== undefined) return cachedSegmenter;
-  cachedSegmenter =
-    typeof Intl !== "undefined" && "Segmenter" in Intl
-      ? new Intl.Segmenter("zh", { granularity: "word" })
-      : null;
-  return cachedSegmenter;
-};
-
-const getPlaybackChunkSize = (bufferLength: number) => {
-  if (bufferLength >= 600) return TOKEN_PLAYBACK_MAX_CHARS;
-  if (bufferLength >= 300) return 112;
-  if (bufferLength >= 140) return 72;
-  if (bufferLength >= 64) return 44;
-  return TOKEN_PLAYBACK_BASE_CHARS;
-};
-
-const takeNextTokenPlaybackChunk = (content: string, maxChars: number) => {
-  if (content.length <= maxChars) return content;
-  const targetChars = Math.max(12, Math.floor(maxChars * 0.68));
-
-  const segmenter = getSegmenter();
-  if (segmenter) {
-    let chunk = "";
-    for (const segment of segmenter.segment(content)) {
-      chunk += segment.segment;
-      if (
-        chunk.length >= maxChars ||
-        (chunk.length >= targetChars &&
-          /[\s，。！？、；：,.!?;:]/u.test(segment.segment))
-      ) {
-        return chunk;
               }
+            : todo,
+        ),
       }
-  }
+    : undefined;
-
-  const phrase = content.match(/^.{1,12}?[\s，。！？、；：,.!?;:]+/u)?.[0];
-  if (phrase) return phrase;
-
-  const cjkChunk = content.match(
-    /^[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]+/u,
-  )?.[0];
-  if (cjkChunk) return sliceCodePoints(cjkChunk, Math.min(maxChars, 18));
-
-  const wordChunk = content.match(/^\S+\s*/u)?.[0];
-  if (wordChunk) {
-    return wordChunk.length <= maxChars
-      ? wordChunk
-      : sliceCodePoints(wordChunk, maxChars);
-  }
-
-  return sliceCodePoints(content, Math.min(maxChars, 12));
-};
 
 export const useAgentChatSession = ({
   projectId,
@@ -136,11 +91,6 @@ export const useAgentChatSession = ({
   const isSessionTitleManuallyEditedRef = useRef(false);
   const cancelPromiseRef = useRef<Promise<void> | null>(null);
   const titleUpdateNonceRef = useRef(0);
-  const pendingTokenRef = useRef<{
-    assistantMessageId: string;
-    content: string;
-  } | null>(null);
-  const tokenPlaybackIntervalRef = useRef<number | null>(null);
   const credentialRefreshRequestIdsRef = useRef(new Set<string>());
 
   useEffect(() => {
@@ -168,83 +118,6 @@ export const useAgentChatSession = ({
     });
   }, []);
 
-  const cancelTokenPlayback = useCallback(() => {
-    const intervalId = tokenPlaybackIntervalRef.current;
-    if (intervalId === null) return;
-    window.clearInterval(intervalId);
-    tokenPlaybackIntervalRef.current = null;
-  }, []);
-
-  const flushPendingTokens = useCallback(() => {
-    const pending = pendingTokenRef.current;
-    pendingTokenRef.current = null;
-    cancelTokenPlayback();
-    if (!pending) return;
-    applyTokenContent(pending.assistantMessageId, pending.content);
-  }, [applyTokenContent, cancelTokenPlayback]);
-
-  const scheduleTokenPlayback = useCallback(() => {
-    if (tokenPlaybackIntervalRef.current !== null) return;
-    const id = window.setInterval(() => {
-      const pending = pendingTokenRef.current;
-      if (!pending) {
-        window.clearInterval(id);
-        tokenPlaybackIntervalRef.current = null;
-        return;
-      }
-
-      const chunk = takeNextTokenPlaybackChunk(
-        pending.content,
-        getPlaybackChunkSize(pending.content.length),
-      );
-      if (!chunk) {
-        window.clearInterval(id);
-        tokenPlaybackIntervalRef.current = null;
-        pendingTokenRef.current = null;
-        return;
-      }
-
-      const remaining = pending.content.slice(chunk.length);
-      pendingTokenRef.current = remaining
-        ? { assistantMessageId: pending.assistantMessageId, content: remaining }
-        : null;
-      applyTokenContent(pending.assistantMessageId, chunk);
-
-      if (!remaining) {
-        window.clearInterval(id);
-        tokenPlaybackIntervalRef.current = null;
-      }
-    }, TOKEN_PLAYBACK_INTERVAL_MS);
-    tokenPlaybackIntervalRef.current = id;
-  }, [applyTokenContent]);
-
-  const queueTokenContent = useCallback(
-    (assistantMessageId: string, content: string) => {
-      const pending = pendingTokenRef.current;
-      if (pending && pending.assistantMessageId !== assistantMessageId) {
-        flushPendingTokens();
-      }
-      pendingTokenRef.current = {
-        assistantMessageId,
-        content:
-          pending?.assistantMessageId === assistantMessageId
-            ? pending.content + content
-            : content,
-      };
-      scheduleTokenPlayback();
-    },
-    [flushPendingTokens, scheduleTokenPlayback],
-  );
-
-  useEffect(
-    () => () => {
-      pendingTokenRef.current = null;
-      cancelTokenPlayback();
-    },
-    [cancelTokenPlayback],
-  );
-
-
   useEffect(() => {
     isSessionTitleManuallyEditedRef.current = isSessionTitleManuallyEdited;
   }, [isSessionTitleManuallyEdited]);
@@ -391,10 +264,6 @@ export const useAgentChatSession = ({
         assistantMessageId?: string;
       },
     ) => {
-      if (event.type !== "token") {
-        flushPendingTokens();
-      }
-
       if (
         event.type !== "session_title" &&
         "sessionId" in event &&
@@ -447,7 +316,36 @@ export const useAgentChatSession = ({
       }
 
       if (event.type === "token") {
-        queueTokenContent(assistantMessageId, event.content);
+        applyTokenContent(assistantMessageId, event.content);
+      } else if (event.type === "final_answer") {
+        setMessages((prev) => {
+          const next = prev.map((message) =>
+            message.id === assistantMessageId
+              ? { ...message, content: event.content, isError: false }
+              : message,
+          );
+          messagesRef.current = next;
+          return next;
+        });
+      } else if (event.type === "activity_update") {
+        setMessages((prev) => {
+          const next = prev.map((message) =>
+            message.id === assistantMessageId
+              ? { ...message, activities: upsertActivity(message.activities, event) }
+              : message,
+          );
+          return event.todos
+            ? normalizeSessionTodos(
+                next,
+                {
+                  sessionId: event.sessionId,
+                  todos: event.todos,
+                  createdAt: event.todosCreatedAt ?? Date.now(),
+                },
+                assistantMessageId,
+              )
+            : next;
+        });
       } else if (event.type === "progress") {
         setMessages((prev) =>
           prev.map((message) =>
@@ -583,6 +481,7 @@ export const useAgentChatSession = ({
           prev.map((message) => {
             if (message.id !== assistantMessageId) return message;
             const completedProgress = completeRunningProgress(message.progress);
+            const completedActivities = completeRunningActivities(message.activities);
             if (
               message.content.trim().length === 0 &&
               !(message.artifacts?.length)
@@ -592,9 +491,16 @@ export const useAgentChatSession = ({
                 content:
                   "Agent 已完成处理，但没有生成文本回答。请查看过程记录，或换个更具体的问题重试。",
                 progress: completedProgress,
+                activities: completedActivities,
+                todos: completeTodos(message.todos),
               };
             }
-            return { ...message, progress: completedProgress };
+            return {
+              ...message,
+              progress: completedProgress,
+              activities: completedActivities,
+              todos: completeTodos(message.todos),
+            };
           }),
         );
         setIsStreaming(false);
@@ -607,6 +513,7 @@ export const useAgentChatSession = ({
                   content: message.content || `⚠️ **错误：** ${event.message}`,
                   isError: true,
                   progress: completeRunningProgress(message.progress),
+                  activities: completeRunningActivities(message.activities, "error"),
                   todos: cancelRunningTodos(message.todos),
                 }
               : message,
@@ -623,6 +530,7 @@ export const useAgentChatSession = ({
                   content: message.content || `⚠️ **${event.message}**`,
                   isError: true,
                   progress: completeRunningProgress(message.progress),
+                  activities: completeRunningActivities(message.activities, "error"),
                   todos: cancelRunningTodos(message.todos),
                 }
               : message,
@@ -632,12 +540,11 @@ export const useAgentChatSession = ({
       }
     },
     [
+      applyTokenContent,
       appendArtifact,
-      flushPendingTokens,
       getLastAssistantMessageId,
       handleCredentialRefresh,
       onToolCall,
-      queueTokenContent,
     ],
   );
 
@@ -654,20 +561,18 @@ export const useAgentChatSession = ({
         onEvent: (event) => applyStreamEvent(event),
       })
         .catch((error) => {
-          flushPendingTokens();
           if (!controller.signal.aborted) {
             console.error("[GlobalChatbox] Failed to resume chat stream:", error);
             setIsStreaming(false);
           }
         })
         .finally(() => {
-          flushPendingTokens();
           if (abortRef.current === controller) {
             abortRef.current = null;
           }
         });
     },
-    [applyStreamEvent, flushPendingTokens],
+    [applyStreamEvent],
   );
   resumeStreamingSessionRef.current = resumeStreamingSession;
 
@@ -716,7 +621,6 @@ export const useAgentChatSession = ({
             }),
         });
       } catch (error) {
-        flushPendingTokens();
         if (controller.signal.aborted) {
           setMessages((prev) =>
             prev
@@ -733,6 +637,7 @@ export const useAgentChatSession = ({
                     message.content.trim().length === 0 &&
                     !(message.artifacts?.length) &&
                     !(message.progress?.length) &&
+                    !(message.activities?.length) &&
                     !message.todos
                   ),
               ),
@@ -747,20 +652,19 @@ export const useAgentChatSession = ({
                   content: `⚠️ **错误：** ${String(error)}`,
                   isError: true,
                   progress: completeRunningProgress(message.progress),
+                  activities: completeRunningActivities(message.activities, "error"),
                 }
               : message,
           ),
         );
         setIsStreaming(false);
       } finally {
-        flushPendingTokens();
         abortRef.current = null;
         setIsStreaming(false);
       }
     },
     [
       applyStreamEvent,
-      flushPendingTokens,
       getApprovalMode,
       getModel,
       isHydrating,
@@ -773,7 +677,6 @@ export const useAgentChatSession = ({
   const abort = useCallback(() => {
     const controller = abortRef.current;
     controller?.abort();
-    flushPendingTokens();
     setIsStreaming(false);
     const assistantMessageId = getLastAssistantMessageId();
 
@@ -796,7 +699,7 @@ export const useAgentChatSession = ({
       }
     });
     cancelPromiseRef.current = trackedCancelPromise;
-  }, [flushPendingTokens, getLastAssistantMessageId]);
+  }, [getLastAssistantMessageId]);
 
   const replyPermission = useCallback(
     async (requestId: string, reply: PermissionDecision) => {
@@ -1009,7 +912,6 @@ export const useAgentChatSession = ({
   const createSession = useCallback(() => {
     if (isHydrating || isStreaming) return;
 
-    flushPendingTokens();
     const controller = abortRef.current;
     controller?.abort();
     hydrationNonceRef.current += 1;
@@ -1020,7 +922,7 @@ export const useAgentChatSession = ({
     setIsSessionTitleManuallyEdited(false);
     setSessionId(undefined);
     setIsStreaming(false);
-  }, [flushPendingTokens, isHydrating, isStreaming]);
+  }, [isHydrating, isStreaming]);
 
   const switchSession = useCallback(
     async (nextSessionId: string, optimisticTitle?: string) => {

src/components/chat/hooks/useAgentToolActions.ts

@@ -22,30 +22,30 @@ const FEATURE_TYPE_MAP: Record<
   string,
   { layer: string; geometryKind: "point" | "line"; label: string }
 > = {
-  junction: { layer: "geo_junctions_mat", geometryKind: "point", label: "节点" },
+  junction: { layer: "junctions", geometryKind: "point", label: "节点" },
-  junctions: { layer: "geo_junctions_mat", geometryKind: "point", label: "节点" },
+  junctions: { layer: "junctions", geometryKind: "point", label: "节点" },
-  pipe: { layer: "geo_pipes_mat", geometryKind: "line", label: "管道" },
+  pipe: { layer: "pipes", geometryKind: "line", label: "管道" },
-  pipes: { layer: "geo_pipes_mat", geometryKind: "line", label: "管道" },
+  pipes: { layer: "pipes", geometryKind: "line", label: "管道" },
-  valve: { layer: "geo_valves", geometryKind: "point", label: "阀门" },
+  valve: { layer: "valves", geometryKind: "point", label: "阀门" },
-  valves: { layer: "geo_valves", geometryKind: "point", label: "阀门" },
+  valves: { layer: "valves", geometryKind: "point", label: "阀门" },
-  reservoir: { layer: "geo_reservoirs", geometryKind: "point", label: "水源" },
+  reservoir: { layer: "reservoirs", geometryKind: "point", label: "水源" },
-  reservoirs: { layer: "geo_reservoirs", geometryKind: "point", label: "水源" },
+  reservoirs: { layer: "reservoirs", geometryKind: "point", label: "水源" },
-  pump: { layer: "geo_pumps", geometryKind: "point", label: "泵站" },
+  pump: { layer: "pumps", geometryKind: "point", label: "泵站" },
-  pumps: { layer: "geo_pumps", geometryKind: "point", label: "泵站" },
+  pumps: { layer: "pumps", geometryKind: "point", label: "泵站" },
-  tank: { layer: "geo_tanks", geometryKind: "point", label: "水池" },
+  tank: { layer: "tanks", geometryKind: "point", label: "水池" },
-  tanks: { layer: "geo_tanks", geometryKind: "point", label: "水池" },
+  tanks: { layer: "tanks", geometryKind: "point", label: "水池" },
 };
 
 const LOCATE_TOOL_CONFIG: Record<
   string,
   { layer: string; geometryKind: "point" | "line"; label: string }
 > = {
-  locate_pipes: { layer: "geo_pipes_mat", geometryKind: "line", label: "管道" },
+  locate_pipes: { layer: "pipes", geometryKind: "line", label: "管道" },
-  locate_junctions: { layer: "geo_junctions_mat", geometryKind: "point", label: "节点" },
+  locate_junctions: { layer: "junctions", geometryKind: "point", label: "节点" },
-  locate_valves: { layer: "geo_valves", geometryKind: "point", label: "阀门" },
+  locate_valves: { layer: "valves", geometryKind: "point", label: "阀门" },
-  locate_reservoirs: { layer: "geo_reservoirs", geometryKind: "point", label: "水源" },
+  locate_reservoirs: { layer: "reservoirs", geometryKind: "point", label: "水源" },
-  locate_pumps: { layer: "geo_pumps", geometryKind: "point", label: "泵站" },
+  locate_pumps: { layer: "pumps", geometryKind: "point", label: "泵站" },
-  locate_tanks: { layer: "geo_tanks", geometryKind: "point", label: "水池" },
+  locate_tanks: { layer: "tanks", geometryKind: "point", label: "水池" },
 };
 
 const LOCATE_ID_PARAM_KEYS = [

src/components/olmap/BurstDetection/AnalysisParameters.tsx

@@ -21,7 +21,15 @@ import { api } from "@/lib/api";
 import { NETWORK_NAME } from "@config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useSessionRecoveryDraft } from "@/lib/sessionRecoveryDraft";
+import { getApiErrorMessage } from "@/lib/apiError";
 import { BurstDetectionResult } from "./types";
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_MAX_LENGTH,
+  SCHEME_NAME_PREFIXES,
+} from "@utils/schemeName";
 
 interface Props {
   onResult: (result: BurstDetectionResult) => void;
@@ -49,7 +57,7 @@ const currentQuarterHour = () => {
 
 export const createBurstDetectionAnalysisParametersState =
   (): BurstDetectionAnalysisParametersState => ({
-    schemeName: `Burst_Detection_${Date.now()}`,
+    schemeName: createSchemeName(SCHEME_NAME_PREFIXES.burstDetection),
     detectionMode: "latest",
     targetTime: currentQuarterHour(),
     samplingIntervalMinutes: 15,
@@ -94,7 +102,7 @@ export const resolvePressureSamplingInterval = (items: ScadaInfoItem[]) => {
 export const buildBurstDetectionRequest = (
   parameters: BurstDetectionAnalysisParametersState,
 ) => ({
-  scheme_name: parameters.schemeName.trim(),
+  scheme_name: normalizeSchemeName(parameters.schemeName),
   sampling_interval_minutes: parameters.samplingIntervalMinutes,
   ...(parameters.detectionMode === "historical" && parameters.targetTime
     ? { target_time: parameters.targetTime.toISOString() }
@@ -164,7 +172,7 @@ const AnalysisParameters: React.FC<Props> = ({
 
   const isValid = useMemo(
     () =>
-      schemeName.trim().length > 0 &&
+      isSchemeNameValid(schemeName) &&
       samplingIntervalValid &&
       (detectionMode === "latest" || Boolean(targetTime?.isValid())),
     [detectionMode, samplingIntervalValid, schemeName, targetTime],
@@ -203,12 +211,12 @@ const AnalysisParameters: React.FC<Props> = ({
           ? "目标时刻存在异常信号，请优先复核相关测点。"
           : "目标时刻未发现爆管异常。",
       });
-    } catch (error: any) {
+    } catch (error) {
       open?.({
         key: "burst-detection-analysis-error",
         type: "error",
         message: "侦测失败",
-        description: error?.response?.data?.detail ?? error?.message ?? "请求失败",
+        description: getApiErrorMessage(error, "爆管侦测请求失败"),
       });
     } finally {
       setRunning(false);
@@ -226,6 +234,13 @@ const AnalysisParameters: React.FC<Props> = ({
             value={schemeName}
             onChange={(event) => setFormField("schemeName", event.target.value)}
             placeholder="请输入方案名称"
+            error={schemeName.trim().length > SCHEME_NAME_MAX_LENGTH}
+            helperText={
+              schemeName.trim().length > SCHEME_NAME_MAX_LENGTH
+                ? `方案名称不能超过 ${SCHEME_NAME_MAX_LENGTH} 个字符`
+                : undefined
+            }
+            inputProps={{ maxLength: SCHEME_NAME_MAX_LENGTH }}
             fullWidth
             size="small"
           />

src/components/olmap/BurstDetection/DetectionResults.tsx

@@ -179,10 +179,7 @@ const DetectionResults: React.FC<Props> = ({ result, state, onStateChange }) =>
 
   const locateSensors = async (sensorIds: string[]) => {
     if (!map || sensorIds.length === 0) return;
-    let features = await queryFeaturesByIds(sensorIds, "geo_junctions_mat");
+    const features = await queryFeaturesByIds(sensorIds, "junctions");
-    if (features.length === 0) {
-      features = await queryFeaturesByIds(sensorIds, "geo_junctions");
-    }
     if (features.length === 0) return;
     setHighlightFeatures(features);
     const format = new GeoJSON();

src/components/olmap/BurstDetection/SchemeQuery.tsx

@@ -21,7 +21,7 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import dayjs, { Dayjs } from "dayjs";
 import "dayjs/locale/zh-cn";
 import { useNotification } from "@refinedev/core";
-import { api } from "@/lib/api";
+import { getAnalysisScheme, listAnalysisSchemes } from "@/lib/analysisRuns";
 import { NETWORK_NAME } from "@config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { SchemeQueryEmptyState } from "@components/olmap/common/PanelEmptyState";
@@ -42,7 +42,7 @@ interface Props {
 export interface BurstDetectionSchemeQueryState {
   queryAll: boolean;
   queryDate: Dayjs | null;
-  expandedId: number | null;
+  expandedId: string | null;
   hasQueried: boolean;
 }
 
@@ -130,15 +130,12 @@ const SchemeQuery: React.FC<Props> = ({
   const handleQuery = async () => {
     setLoading(true);
     try {
-      const params: Record<string, string> = {
+      const nextSchemes = (await listAnalysisSchemes({
-        scheme_type: "burst_detection",
+        runType: "burst_detection",
-      };
+        queryDate: !queryAll && queryDate
-      if (!queryAll && queryDate) {
+          ? queryDate.format("YYYY-MM-DD")
-        params.query_date = queryDate.startOf("day").toISOString();
+          : undefined,
-      }
+      })) as BurstDetectionSchemeRecord[];
-
-      const response = await api.get("/api/v1/schemes", { params });
-      const nextSchemes = response.data as BurstDetectionSchemeRecord[];
       setSchemes(nextSchemes);
       setQueryField("hasQueried", true);
       open?.({
@@ -157,13 +154,9 @@ const SchemeQuery: React.FC<Props> = ({
     }
   };
 
-  const handleViewSchemeResult = async (schemeName: string) => {
+  const handleViewSchemeResult = async (runId: string) => {
     try {
-      const response = await api.get(
+      const schemeRecord = (await getAnalysisScheme(runId)) as BurstDetectionSchemeRecord & {
-        `/api/v1/schemes/${encodeURIComponent(schemeName)}`,
-        { params: { scheme_type: "burst_detection" } },
-      );
-      const schemeRecord = response.data as BurstDetectionSchemeRecord & {
         result_payload?: BurstDetectionResult;
       };
       const normalizedResult =
@@ -185,7 +178,7 @@ const SchemeQuery: React.FC<Props> = ({
       open?.({
         type: "success",
         message: "方案加载成功",
-        description: `已加载方案：${schemeName}`,
+        description: `已加载方案：${schemeRecord.scheme_name}`,
       });
     } catch (error: any) {
       open?.({
@@ -398,7 +391,7 @@ const SchemeQuery: React.FC<Props> = ({
                             size="small"
                             className="bg-blue-600 hover:bg-blue-700"
                             sx={{ textTransform: "none", fontWeight: 500 }}
-                            onClick={() => handleViewSchemeResult(scheme.scheme_name)}
+                            onClick={() => handleViewSchemeResult(scheme.scheme_id)}
                           >
                             查看侦测结果
                           </Button>

src/components/olmap/BurstDetection/types.ts

@@ -97,7 +97,7 @@ export interface BurstDetectionSchemeDetail {
 }
 
 export interface BurstDetectionSchemeRecord {
-  scheme_id: number;
+  scheme_id: string;
   scheme_name: string;
   scheme_type?: string;
   create_time: string;

src/components/olmap/BurstLocation/AnalysisParameters.tsx

@@ -24,12 +24,21 @@ import { useNotification } from "@refinedev/core";
 import dayjs, { Dayjs } from "dayjs";
 import "dayjs/locale/zh-cn";
 import { api } from "@/lib/api";
+import { listAnalysisSchemes } from "@/lib/analysisRuns";
 import { NETWORK_NAME, config } from "@config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useSessionRecoveryDraft } from "@/lib/sessionRecoveryDraft";
+import { getApiErrorMessage } from "@/lib/apiError";
 import { FLOW_DISPLAY_UNIT, toM3s } from "@utils/units";
 import { BurstLocationResult } from "./types";
 import { getBurstLocationErrorNotice } from "./burstLocationError";
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_MAX_LENGTH,
+  SCHEME_NAME_PREFIXES,
+} from "@utils/schemeName";
 
 interface Props {
   onResult: (result: BurstLocationResult) => void;
@@ -38,7 +47,7 @@ interface Props {
 }
 
 export interface SchemeItem {
-  scheme_id: number;
+  scheme_id: string;
   scheme_name: string;
   scheme_type: string;
   create_time: string;
@@ -55,7 +64,7 @@ export interface BurstLocationAnalysisParametersState {
   schemeName: string;
   dataSource: DataSource;
   schemes: SchemeItem[];
-  selectedSchemeId: number | "";
+  selectedSchemeId: string;
   burstLeakage: number;
   enableFlow: boolean;
   burstStartTime: Dayjs | null;
@@ -67,7 +76,7 @@ export interface BurstLocationAnalysisParametersState {
 
 export const createBurstLocationAnalysisParametersState =
   (): BurstLocationAnalysisParametersState => ({
-    schemeName: `Burst_Locate_${Date.now()}`,
+    schemeName: createSchemeName(SCHEME_NAME_PREFIXES.burstLocation),
     dataSource: "monitoring",
     schemes: [],
     selectedSchemeId: "",
@@ -133,12 +142,9 @@ const AnalysisParameters: React.FC<Props> = ({
 
       setSchemeLoading(true);
       try {
-        const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, {
+        const burstSchemes = (await listAnalysisSchemes({
-          params: { scheme_type: "burst_analysis" },
+          runType: "burst_analysis",
-        });
+        }) as unknown as SchemeItem[]).sort(
-        const burstSchemes = (response.data as SchemeItem[]).filter(
-          (scheme) => scheme.scheme_type === "burst_analysis",
-        ).sort(
           (a, b) =>
             dayjs(b.create_time).valueOf() - dayjs(a.create_time).valueOf(),
         );
@@ -163,12 +169,14 @@ const AnalysisParameters: React.FC<Props> = ({
             description: `当前可选爆管分析方案 ${burstSchemes.length} 个`,
           });
         }
-      } catch (error: any) {
+      } catch (error) {
         open?.({
           type: "error",
           message: "刷新方案失败",
-          description:
+          description: getApiErrorMessage(
-            error?.response?.data?.detail ?? error?.message ?? "无法获取爆管分析方案列表",
+            error,
+            "无法获取爆管分析方案列表",
+          ),
         });
       } finally {
         setSchemeLoading(false);
@@ -184,7 +192,7 @@ const AnalysisParameters: React.FC<Props> = ({
     }
   };
 
-  const handleSchemeSelect = (schemeId: number) => {
+  const handleSchemeSelect = (schemeId: string) => {
     setFormField("selectedSchemeId", schemeId);
     const scheme = schemes.find((item) => item.scheme_id === schemeId);
     if (scheme) {
@@ -193,6 +201,7 @@ const AnalysisParameters: React.FC<Props> = ({
   };
 
   const isValid = useMemo(() => {
+    if (!isSchemeNameValid(schemeName)) return false;
     if (!Number.isFinite(burstLeakage) || burstLeakage <= 0) return false;
     if (!burstStartTime || !burstEndTime) {
       return false;
@@ -204,6 +213,7 @@ const AnalysisParameters: React.FC<Props> = ({
     return burstStartTime.isBefore(burstEndTime);
   }, [
     burstLeakage,
+    schemeName,
     burstStartTime,
     burstEndTime,
     dataSource,
@@ -234,15 +244,14 @@ const AnalysisParameters: React.FC<Props> = ({
         `${config.BACKEND_URL}/api/v1/burst-locations`,
         {
           data_source: dataSource,
-          scheme_name: schemeName.trim() || undefined,
+          scheme_name: normalizeSchemeName(schemeName),
           burst_leakage: toM3s(burstLeakage, FLOW_DISPLAY_UNIT),
           min_dpressure: minDpressure,
           basic_pressure: basicPressure,
           scada_burst_start: burstStartTime.toISOString(),
           scada_burst_end: burstEndTime.toISOString(),
           use_scada_flow: enableFlow || undefined,
-          simulation_scheme_name: selectedScheme?.scheme_name,
+          simulation_run_id: selectedScheme?.scheme_id,
-          simulation_scheme_type: selectedScheme?.scheme_type,
         },
       );
 
@@ -270,7 +279,7 @@ const AnalysisParameters: React.FC<Props> = ({
         message: "爆管定位成功",
         description: `定位到管段: ${(response.data as BurstLocationResult).located_pipe}`,
       });
-    } catch (error: any) {
+    } catch (error) {
       const notice = getBurstLocationErrorNotice(error);
       open?.({
         key: "burst-location-analysis-error",
@@ -294,6 +303,13 @@ const AnalysisParameters: React.FC<Props> = ({
             value={schemeName}
             onChange={(e) => setFormField("schemeName", e.target.value)}
             placeholder="请输入方案名称"
+            error={schemeName.trim().length > SCHEME_NAME_MAX_LENGTH}
+            helperText={
+              schemeName.trim().length > SCHEME_NAME_MAX_LENGTH
+                ? `方案名称不能超过 ${SCHEME_NAME_MAX_LENGTH} 个字符`
+                : undefined
+            }
+            inputProps={{ maxLength: SCHEME_NAME_MAX_LENGTH }}
             fullWidth
             size="small"
           />
@@ -351,7 +367,7 @@ const AnalysisParameters: React.FC<Props> = ({
               <FormControl fullWidth size="small">
                 <Select
                   value={selectedSchemeId}
-                  onChange={(e) => handleSchemeSelect(Number(e.target.value))}
+                  onChange={(e) => handleSchemeSelect(String(e.target.value))}
                   disabled={schemeLoading}
                   displayEmpty
                 >

src/components/olmap/BurstLocation/LocationResults.tsx

@@ -202,10 +202,7 @@ const LocationResults: React.FC<Props> = ({ result }) => {
     if (!pipeIds.length || !map) return;
 
     try {
-      let features = await queryFeaturesByIds(pipeIds, "geo_pipes_mat");
+      const features = await queryFeaturesByIds(pipeIds, "pipes");
-      if (features.length === 0) {
-        features = await queryFeaturesByIds(pipeIds, "geo_pipes");
-      }
       if (features.length === 0) return;
 
       setHighlightFeatures(features);

src/components/olmap/BurstLocation/SchemeQuery.tsx

@@ -25,8 +25,8 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import "dayjs/locale/zh-cn";
 import dayjs, { Dayjs } from "dayjs";
 import { useNotification } from "@refinedev/core";
-import { api } from "@/lib/api";
+import { getAnalysisScheme, listAnalysisSchemes } from "@/lib/analysisRuns";
-import { NETWORK_NAME, config } from "@config/config";
+import { NETWORK_NAME } from "@config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useMap } from "@components/olmap/core/MapComponent";
 import { queryFeaturesByIds } from "@/utils/mapQueryService";
@@ -56,7 +56,7 @@ interface Props {
 export interface BurstLocationSchemeQueryState {
   queryAll: boolean;
   queryDate: Dayjs | null;
-  expandedId: number | null;
+  expandedId: string | null;
   simulationBurstIdsByName: Record<string, string[]>;
   hasQueried: boolean;
 }
@@ -147,10 +147,7 @@ const SchemeQuery: React.FC<Props> = ({
     if (!uniquePipeIds.length || !map) return;
 
     try {
-      let features = await queryFeaturesByIds(uniquePipeIds, "geo_pipes_mat");
+      const features = await queryFeaturesByIds(uniquePipeIds, "pipes");
-      if (features.length === 0) {
-        features = await queryFeaturesByIds(uniquePipeIds, "geo_pipes");
-      }
       if (features.length === 0) return;
 
       setHighlightFeatures(features);
@@ -227,23 +224,17 @@ const SchemeQuery: React.FC<Props> = ({
   const handleQuery = async () => {
     setLoading(true);
     try {
-      const params: Record<string, string> = {
+      const [nextSchemes, simulationSchemes] = await Promise.all([
-        scheme_type: "burst_location",
+        listAnalysisSchemes({
-      };
+          runType: "burst_location",
-      if (!queryAll && queryDate) {
+          queryDate: !queryAll && queryDate
-        params.query_date = queryDate.startOf("day").toISOString();
+            ? queryDate.format("YYYY-MM-DD")
-      }
+            : undefined,
-
-      const [response, simulationResponse] = await Promise.all([
-        api.get(`${config.BACKEND_URL}/api/v1/schemes`, { params }),
-        api.get(`${config.BACKEND_URL}/api/v1/schemes`, {
-          params: { scheme_type: "burst_analysis" },
         }),
+        listAnalysisSchemes({ runType: "burst_analysis" }),
       ]);
-      const nextSchemes = response.data as BurstSchemeRecord[];
       const nextSimulationBurstIdsByName = Object.fromEntries(
-        (simulationResponse.data as BurstSimulationSchemeItem[])
+        (simulationSchemes as BurstSimulationSchemeItem[])
-          .filter((scheme) => scheme.scheme_type === "burst_analysis")
           .map((scheme) => [
             scheme.scheme_name,
             normalizeBurstIds(scheme.scheme_detail?.burst_ID),
@@ -253,7 +244,7 @@ const SchemeQuery: React.FC<Props> = ({
       setSchemes(
         nextSchemes.map((scheme) =>
           enrichSchemeWithSimulationBurstIds(
-            scheme,
+            scheme as BurstSchemeRecord,
             nextSimulationBurstIdsByName,
           ),
         ),
@@ -276,13 +267,9 @@ const SchemeQuery: React.FC<Props> = ({
     }
   };
 
-  const handleViewSchemeResult = async (schemeName: string) => {
+  const handleViewSchemeResult = async (runId: string) => {
     try {
-      const response = await api.get(
+      const schemeRecord = (await getAnalysisScheme(runId)) as BurstSchemeRecord & {
-        `${config.BACKEND_URL}/api/v1/schemes/${encodeURIComponent(schemeName)}`,
-        { params: { scheme_type: "burst_location" } },
-      );
-      const schemeRecord = response.data as BurstSchemeRecord & {
         result_payload?: BurstLocationResult;
       };
       const normalizedResult =
@@ -302,7 +289,7 @@ const SchemeQuery: React.FC<Props> = ({
       open?.({
         type: "success",
         message: "方案加载成功",
-        description: `已加载方案: ${schemeName}`,
+        description: `已加载方案: ${schemeRecord.scheme_name}`,
       });
     } catch (error: any) {
       open?.({
@@ -516,7 +503,7 @@ const SchemeQuery: React.FC<Props> = ({
                             size="small"
                             className="bg-blue-600 hover:bg-blue-700"
                             sx={{ textTransform: "none", fontWeight: 500 }}
-                            onClick={() => handleViewSchemeResult(scheme.scheme_name)}
+                            onClick={() => handleViewSchemeResult(scheme.scheme_id)}
                           >
                             查看定位结果
                           </Button>

src/components/olmap/BurstLocation/burstLocationError.ts

@@ -1,3 +1,5 @@
+import { getApiErrorMessage } from "@/lib/apiError";
+
 export interface BurstLocationErrorNotice {
   message: string;
   description: string;
@@ -6,26 +8,10 @@ export interface BurstLocationErrorNotice {
 const DATA_GAP_PATTERN =
   /^(爆管压力数据|正常压力数据|爆管流量数据|正常流量数据) 在时间窗内无有效模拟数据: (.+)$/;
 
-const extractErrorDetail = (error: unknown): string => {
-  const candidate = error as {
-    message?: string;
-    response?: { data?: { detail?: unknown } };
-  };
-  const detail = candidate?.response?.data?.detail;
-
-  if (typeof detail === "string" && detail.trim()) {
-    return detail.trim();
-  }
-  if (typeof candidate?.message === "string" && candidate.message.trim()) {
-    return candidate.message.trim();
-  }
-  return "请求失败";
-};
-
 export const getBurstLocationErrorNotice = (
   error: unknown,
 ): BurstLocationErrorNotice => {
-  const detail = extractErrorDetail(error);
+  const detail = getApiErrorMessage(error);
   const match = detail.match(DATA_GAP_PATTERN);
 
   if (!match) {

src/components/olmap/BurstLocation/types.ts

@@ -66,7 +66,7 @@ export interface BurstLocationSchemeDetail {
 }
 
 export interface BurstSchemeRecord {
-  scheme_id: number;
+  scheme_id: string;
   scheme_name: string;
   scheme_type?: string;
   create_time: string;

src/components/olmap/BurstSimulation/AnalysisParameters.tsx

@@ -30,9 +30,17 @@ import { api } from "@/lib/api";
 import { config, NETWORK_NAME } from "@/config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useSessionRecoveryDraft } from "@/lib/sessionRecoveryDraft";
+import { getApiErrorMessage } from "@/lib/apiError";
 import { along, lineString, length, toMercator } from "@turf/turf";
 import { Point } from "ol/geom";
 import { toLonLat } from "ol/proj";
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_MAX_LENGTH,
+  SCHEME_NAME_PREFIXES,
+} from "@utils/schemeName";
 
 export interface PipePoint {
   id: string;
@@ -52,7 +60,7 @@ export const createBurstAnalysisParametersState = (): BurstAnalysisParametersSta
   pipePoints: [],
   startTime: dayjs(new Date()),
   duration: 3600,
-  schemeName: "FANGAN" + new Date().getTime(),
+  schemeName: createSchemeName(SCHEME_NAME_PREFIXES.burstAnalysis),
   network: NETWORK_NAME,
 });
 
@@ -104,7 +112,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
     pipePoints.length > 0 &&
     startTime !== null &&
     duration > 0 &&
-    schemeName.trim() !== "";
+    isSchemeNameValid(schemeName);
 
   // 地图点击选择要素事件处理函数
   const handleMapClickSelectFeatures = useCallback(
@@ -116,7 +124,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
       if (!feature) return;
       if (
         feature.getGeometry()?.getType() === "Point" ||
-        (layer !== "geo_pipes_mat" && layer !== "geo_pipes")
+        layer !== "pipes"
       ) {
         open?.({
           type: "error",
@@ -240,7 +248,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
     if (highlightFeatures.length > 0 || pipePoints.length === 0) return;
     queryFeaturesByIds(
       pipePoints.map((pipe) => pipe.id),
-      "geo_pipes_mat",
+      "pipes",
     ).then((features) => {
       if (features.length > 0) {
         setHighlightFeatures(features);
@@ -333,7 +341,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
       burst_id: burst_ID,
       burst_size: burst_size,
       modify_total_duration: modify_total_duration,
-      scheme_name: schemeName,
+      scheme_name: normalizeSchemeName(schemeName),
     };
 
     try {
@@ -358,8 +366,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
         key: "burst-analysis",
         type: "error",
         message: "提交分析失败",
-        description:
+        description: getApiErrorMessage(error, "爆管模拟请求失败"),
-          error instanceof Error ? error.message : "请检查网络连接或稍后重试",
       });
     } finally {
       setAnalyzing(false);
@@ -525,6 +532,13 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
           value={schemeName}
           onChange={(e) => setParameterField("schemeName", e.target.value)}
           placeholder="输入方案名称"
+          error={schemeName.trim().length > SCHEME_NAME_MAX_LENGTH}
+          helperText={
+            schemeName.trim().length > SCHEME_NAME_MAX_LENGTH
+              ? `方案名称不能超过 ${SCHEME_NAME_MAX_LENGTH} 个字符`
+              : undefined
+          }
+          inputProps={{ maxLength: SCHEME_NAME_MAX_LENGTH }}
         />
       </Box>
 

src/components/olmap/BurstSimulation/AnalysisReport.test.tsx

@@ -21,7 +21,7 @@ jest.mock("@/utils/mapQueryService", () => ({
 }));
 
 const scheme: SchemeRecord = {
-  id: 17,
+  id: "17",
   schemeName: "burst-report-demo",
   type: "burst_analysis",
   username: "operator",
@@ -52,10 +52,12 @@ const feature = (id: string, diameter: number) => ({
 describe("AnalysisReport", () => {
   beforeEach(() => {
     (queryFeaturesByIds as jest.Mock).mockImplementation(
-      async (_ids: string[], layerName: string) =>
+      async (ids: string[], layerName: string) =>
-        layerName === "geo_pipes_mat"
+        layerName === "pipes"
-          ? [feature("P-1", 315)]
+          ? ids.map((id) =>
-          : [feature("P-2", 800)],
+              id === "P-1" ? feature(id, 315) : feature(id, 800),
+            )
+          : [],
     );
   });
 
@@ -109,8 +111,8 @@ describe("AnalysisReport", () => {
       expect(preview.getByText("800 mm")).toBeInTheDocument();
     });
     expect(queryFeaturesByIds).toHaveBeenCalledWith(
-      ["P-2"],
+      ["P-1", "P-2"],
-      "geo_pipes",
+      "pipes",
     );
   });
 
@@ -263,7 +265,7 @@ describe("AnalysisReport", () => {
         ),
       ).toBeInTheDocument(),
     );
-    expect(queryFeaturesByIds).toHaveBeenCalledTimes(2);
+    expect(queryFeaturesByIds).toHaveBeenCalledTimes(1);
 
     firstRender.unmount();
     render(<AnalysisReport {...props} />);
@@ -273,6 +275,6 @@ describe("AnalysisReport", () => {
         "800 mm",
       ),
     ).toBeInTheDocument();
-    expect(queryFeaturesByIds).toHaveBeenCalledTimes(2);
+    expect(queryFeaturesByIds).toHaveBeenCalledTimes(1);
   });
 });

src/components/olmap/BurstSimulation/SchemeQuery.tsx

@@ -27,9 +27,9 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import "dayjs/locale/zh-cn"; // 引入中文包
 import dayjs, { Dayjs } from "dayjs";
-import { api } from "@/lib/api";
+import { listAnalysisSchemes } from "@/lib/analysisRuns";
 import moment from "moment";
-import { config, NETWORK_NAME } from "@config/config";
+import { NETWORK_NAME } from "@config/config";
 import { useNotification } from "@refinedev/core";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 
@@ -51,7 +51,7 @@ import {
 import { Point } from "ol/geom";
 import { toLonLat } from "ol/proj";
 import Timeline from "@components/olmap/core/Controls/Timeline";
-import { SchemaItem, SchemeRecord } from "./types";
+import { SchemeRecord } from "./types";
 import {
   getCachedPipeDiameters,
   getPipeDiameterDisplay,
@@ -78,7 +78,7 @@ export interface BurstSchemeQueryState {
   showTimeline: boolean;
   selectedDate: Date | undefined;
   timeRange: { start: Date; end: Date } | undefined;
-  expandedId: number | null;
+  expandedId: string | null;
   hasQueried: boolean;
 }
 
@@ -123,17 +123,17 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
   const creatorName = useSchemeCreatorName();
   const [mapContainer, setMapContainer] = useState<HTMLElement | null>(null); // 地图容器元素
   const [pipeDiametersByScheme, setPipeDiametersByScheme] = useState<
-    Record<number, PipeDiameterMap>
+    Record<string, PipeDiameterMap>
   >({});
   const [loadingDiameterByScheme, setLoadingDiameterByScheme] = useState<
-    Record<number, boolean>
+    Record<string, boolean>
   >({});
 
   const { open } = useNotification();
 
   const map = useMap();
   const data = useData();
-  const { schemeName, setSchemeName } = data || {};
+  const { schemeName, setSchemeName, schemeRunId, setSchemeRunId } = data || {};
 
   // 使用外部提供的 schemes 或内部状态
   const schemes =
@@ -161,38 +161,16 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
 
     setLoading(true);
     try {
-      const params: Record<string, string> = {
+      const nextSchemes = (await listAnalysisSchemes({
-        scheme_type: SCHEME_TYPE,
+        runType: SCHEME_TYPE,
-      };
+        queryDate: !queryAll && queryDate
-      if (!queryAll && queryDate) {
+          ? queryDate.format("YYYY-MM-DD")
-        params.query_date = queryDate.startOf("day").toISOString();
+          : undefined,
-      }
+      })) as unknown as SchemeRecord[];
-      const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, {
-        params,
-      });
-      let filteredResults = response.data;
-
-      if (!queryAll) {
-        const formattedDate = queryDate!.format("YYYY-MM-DD");
-        filteredResults = response.data.filter((item: SchemaItem) => {
-          const itemDate = moment(item.create_time).format("YYYY-MM-DD");
-          return itemDate === formattedDate;
-        });
-      }
-
-      const nextSchemes = filteredResults.map((item: SchemaItem) => ({
-        id: item.scheme_id,
-        schemeName: item.scheme_name,
-        type: item.scheme_type,
-        username: item.username,
-        create_time: item.create_time,
-        startTime: item.scheme_start_time,
-        schemeDetail: item.scheme_detail,
-      }));
       setSchemes(nextSchemes);
       setQueryField("hasQueried", true);
 
-      if (filteredResults.length === 0) {
+      if (nextSchemes.length === 0) {
         open?.({
           type: "success",
           message: "查询结果",
@@ -204,7 +182,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
         open?.({
           type: "success",
           message: "查询成功",
-          description: `共找到 ${filteredResults.length} 条方案记录`,
+          description: `共找到 ${nextSchemes.length} 条方案记录`,
         });
       }
     } catch (error) {
@@ -221,7 +199,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
 
   const handleLocatePipes = (pipeIds: string[]) => {
     if (pipeIds.length > 0) {
-      queryFeaturesByIds(pipeIds, "geo_pipes_mat").then((features) => {
+      queryFeaturesByIds(pipeIds, "pipes").then((features) => {
         if (features.length > 0) {
           // 设置高亮要素
           setHighlightFeatures(features);
@@ -299,7 +277,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
   }, [expandedId, filteredSchemes, pipeDiametersByScheme]);
 
   // 内部的方案查询函数
-  const handleViewDetails = (id: number) => {
+  const handleViewDetails = (id: string) => {
     const scheme = filteredSchemes.find((s) => s.id === id);
     if (!scheme) return;
 
@@ -321,6 +299,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
       }));
     }
     setSchemeName?.(scheme.schemeName);
+    setSchemeRunId?.(scheme.id);
     handleLocatePipes(scheme.schemeDetail?.burst_ID || []);
   };
 
@@ -438,6 +417,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
             timeRange={timeRange}
             disableDateSelection={!!timeRange}
             schemeName={schemeName}
+            schemeRunId={schemeRunId}
             schemeType={SCHEME_TYPE}
           />,
           mapContainer, // 渲染到地图容器中，而不是 body

src/components/olmap/BurstSimulation/ValveIsolation.tsx

@@ -210,7 +210,7 @@ const ValveIsolation: React.FC<ValveIsolationProps> = ({
 
   useEffect(() => {
     if (!selectedPipeId || highlightFeature) return;
-    queryFeaturesByIds([selectedPipeId], "geo_pipes_mat").then((features) => {
+    queryFeaturesByIds([selectedPipeId], "pipes").then((features) => {
       setHighlightFeature(features[0] ?? null);
     });
   }, [highlightFeature, selectedPipeId]);
@@ -245,7 +245,7 @@ const ValveIsolation: React.FC<ValveIsolationProps> = ({
 
   const handleLocatePipes = (pipeIds: string[], highlight: boolean = true) => {
     if (pipeIds.length > 0) {
-      queryFeaturesByIds(pipeIds, "geo_pipes_mat").then((features) => {
+      queryFeaturesByIds(pipeIds, "pipes").then((features) => {
         if (features.length > 0) {
           if (highlight) {
             // 设置高亮类型为管段
@@ -270,7 +270,7 @@ const ValveIsolation: React.FC<ValveIsolationProps> = ({
 
   const handleLocateNodes = (nodeIds: string[]) => {
     if (nodeIds.length > 0) {
-      queryFeaturesByIds(nodeIds, "geo_junctions").then((features) => {
+      queryFeaturesByIds(nodeIds, "junctions").then((features) => {
         if (features.length > 0) {
           // 设置高亮类型为受影响节点
           setHighlightType("affected_node");
@@ -294,7 +294,7 @@ const ValveIsolation: React.FC<ValveIsolationProps> = ({
 
   const handleLocateMustCloseValves = (valveIds: string[]) => {
     if (valveIds.length > 0) {
-      queryFeaturesByIds(valveIds, "geo_valves").then((features) => {
+      queryFeaturesByIds(valveIds, "valves").then((features) => {
         if (features.length > 0) {
           // 设置高亮类型为必关阀门
           setHighlightType("must_close");
@@ -318,7 +318,7 @@ const ValveIsolation: React.FC<ValveIsolationProps> = ({
 
   const handleLocateOptionalValves = (valveIds: string[]) => {
     if (valveIds.length > 0) {
-      queryFeaturesByIds(valveIds, "geo_valves").then((features) => {
+      queryFeaturesByIds(valveIds, "valves").then((features) => {
         if (features.length > 0) {
           // 设置高亮类型为可选阀门
           setHighlightType("optional");
@@ -411,7 +411,7 @@ const ValveIsolation: React.FC<ValveIsolationProps> = ({
       setSelectedPipeId(initialPipeIds[0]);
 
       // 尝试获取Feature以高亮 (可选)
-      queryFeaturesByIds(initialPipeIds, "geo_pipes_mat").then((features) => {
+      queryFeaturesByIds(initialPipeIds, "pipes").then((features) => {
         if (features && features.length > 0) {
           setHighlightFeature(features[0]);
         }

src/components/olmap/BurstSimulation/schemePipeDiameters.ts

@@ -44,24 +44,10 @@ export const loadPipeDiameters = async (
   }
 
   const request = (async () => {
-    let features = await queryFeaturesByIds(
+    const features = await queryFeaturesByIds(
       normalizedPipeIds,
-      "geo_pipes_mat",
+      "pipes",
     );
-    const foundPipeIds = new Set(
-      features.map((feature) => String(feature.getProperties().id)),
-    );
-    const missingPipeIds = normalizedPipeIds.filter(
-      (pipeId) => !foundPipeIds.has(pipeId),
-    );
-
-    if (missingPipeIds.length > 0) {
-      const fallbackFeatures = await queryFeaturesByIds(
-        missingPipeIds,
-        "geo_pipes",
-      );
-      features = [...features, ...fallbackFeatures];
-    }
 
     const diameters: PipeDiameterMap = Object.fromEntries(
       normalizedPipeIds.map((pipeId) => [pipeId, null]),

src/components/olmap/BurstSimulation/types.ts

@@ -8,7 +8,7 @@ export interface SchemeDetail {
 }
 
 export interface SchemeRecord {
-  id: number;
+  id: string;
   schemeName: string;
   type: string;
   username: string;
@@ -18,16 +18,6 @@ export interface SchemeRecord {
   schemeDetail?: SchemeDetail;
 }
 
-export interface SchemaItem {
-  scheme_id: number;
-  scheme_name: string;
-  scheme_type: string;
-  username: string;
-  create_time: string;
-  scheme_start_time: string;
-  scheme_detail?: SchemeDetail;
-}
-
 export interface ValveIsolationResult {
   accident_elements: string[];
   affected_nodes: string[];

src/components/olmap/ContaminantSimulation/AnalysisParameters.tsx

@@ -30,6 +30,14 @@ import {
 } from "@/utils/mapQueryService";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useSessionRecoveryDraft } from "@/lib/sessionRecoveryDraft";
+import { getApiErrorMessage } from "@/lib/apiError";
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_MAX_LENGTH,
+  SCHEME_NAME_PREFIXES,
+} from "@utils/schemeName";
 
 export interface ContaminantAnalysisParametersState {
   schemeName: string;
@@ -42,7 +50,7 @@ export interface ContaminantAnalysisParametersState {
 
 export const createContaminantAnalysisParametersState =
   (): ContaminantAnalysisParametersState => ({
-    schemeName: "WQ_" + new Date().getTime(),
+    schemeName: createSchemeName(SCHEME_NAME_PREFIXES.contaminantAnalysis),
     startTime: dayjs(new Date()),
     sourceNode: "",
     concentration: 100,
@@ -98,7 +106,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
       Boolean(sourceNode) &&
       concentration > 0 &&
       duration > 0 &&
-      schemeName.trim() !== ""
+      isSchemeNameValid(schemeName)
     );
   }, [network, startTime, sourceNode, concentration, duration, schemeName]);
 
@@ -194,7 +202,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
       return;
     }
     if (highlightFeature) return;
-    queryFeaturesByIds([sourceNode], "geo_junctions_mat").then((features) => {
+    queryFeaturesByIds([sourceNode], "junctions").then((features) => {
       setHighlightFeature(features[0] ?? null);
     });
   }, [highlightFeature, sourceNode]);
@@ -240,7 +248,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
         concentration,
         duration,
         pattern: pattern || undefined,
-        scheme_name: schemeName,
+        scheme_name: normalizeSchemeName(schemeName),
       };
 
       await api.post(`${config.BACKEND_URL}/api/v1/contaminant-simulations`, undefined, {
@@ -259,8 +267,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
         key: "contaminant-analysis",
         type: "error",
         message: "提交分析失败",
-        description:
+        description: getApiErrorMessage(error, "污染物模拟请求失败"),
-          error instanceof Error ? error.message : "请检查网络连接或稍后重试",
       });
     } finally {
       setSubmitting(false);
@@ -391,6 +398,13 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
           value={schemeName}
           onChange={(e) => setFormField("schemeName", e.target.value)}
           placeholder="输入方案名称"
+          error={schemeName.trim().length > SCHEME_NAME_MAX_LENGTH}
+          helperText={
+            schemeName.trim().length > SCHEME_NAME_MAX_LENGTH
+              ? `方案名称不能超过 ${SCHEME_NAME_MAX_LENGTH} 个字符`
+              : undefined
+          }
+          inputProps={{ maxLength: SCHEME_NAME_MAX_LENGTH }}
         />
       </Box>
 

src/components/olmap/ContaminantSimulation/SchemeQuery.tsx

@@ -25,10 +25,10 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import "dayjs/locale/zh-cn";
 import dayjs, { Dayjs } from "dayjs";
-import { api } from "@/lib/api";
+import { listAnalysisSchemes } from "@/lib/analysisRuns";
 import moment from "moment";
 import { useNotification } from "@refinedev/core";
-import { config, NETWORK_NAME } from "@config/config";
+import { NETWORK_NAME } from "@config/config";
 import { queryFeaturesByIds } from "@/utils/mapQueryService";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useData, useMap } from "@components/olmap/core/MapComponent";
@@ -39,7 +39,7 @@ import { Style, Icon, Circle, Fill, Stroke } from "ol/style";
 import Feature from "ol/Feature";
 import { bbox, featureCollection } from "@turf/turf";
 import Timeline from "@components/olmap/core/Controls/Timeline";
-import { ContaminantSchemaItem, ContaminantSchemeRecord } from "./types";
+import { ContaminantSchemeRecord } from "./types";
 import { useSchemeCreatorName } from "@components/olmap/core/useSchemeCreatorName";
 import { SchemeQueryEmptyState } from "@components/olmap/common/PanelEmptyState";
 
@@ -60,7 +60,7 @@ export interface ContaminantSchemeQueryState {
   showTimeline: boolean;
   selectedDate: Date | undefined;
   timeRange: { start: Date; end: Date } | undefined;
-  expandedId: number | null;
+  expandedId: string | null;
   hasQueried: boolean;
 }
 
@@ -111,7 +111,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
   const { open } = useNotification();
   const map = useMap();
   const data = useData();
-  const { schemeName, setSchemeName } = data || {};
+  const { schemeName, setSchemeName, schemeRunId, setSchemeRunId } = data || {};
 
   const schemes =
     externalSchemes !== undefined ? externalSchemes : internalSchemes;
@@ -222,40 +222,16 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
     if (!queryAll && !queryDate) return;
     setLoading(true);
     try {
-      const params: Record<string, string> = {
+      const nextSchemes = (await listAnalysisSchemes({
-        scheme_type: SCHEME_TYPE,
+        runType: SCHEME_TYPE,
-      };
+        queryDate: !queryAll && queryDate
-      if (!queryAll && queryDate) {
+          ? queryDate.format("YYYY-MM-DD")
-        params.query_date = queryDate.startOf("day").toISOString();
+          : undefined,
-      }
+      })) as unknown as ContaminantSchemeRecord[];
-      const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, {
-        params,
-      });
-      let filteredResults = response.data;
-
-      if (!queryAll) {
-        const formattedDate = queryDate!.format("YYYY-MM-DD");
-        filteredResults = response.data.filter(
-          (item: ContaminantSchemaItem) => {
-            const itemDate = moment(item.create_time).format("YYYY-MM-DD");
-            return itemDate === formattedDate;
-          },
-        );
-      }
-
-      const nextSchemes = filteredResults.map((item: ContaminantSchemaItem) => ({
-        id: item.scheme_id,
-        schemeName: item.scheme_name,
-        type: item.scheme_type,
-        username: item.username,
-        create_time: item.create_time,
-        startTime: item.scheme_start_time,
-        schemeDetail: item.scheme_detail,
-      }));
       setSchemes(nextSchemes);
       setQueryField("hasQueried", true);
 
-      if (filteredResults.length === 0) {
+      if (nextSchemes.length === 0) {
         open?.({
           type: "success",
           message: "查询结果",
@@ -267,7 +243,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
         open?.({
           type: "success",
           message: "查询成功",
-          description: `共找到 ${filteredResults.length} 条方案记录`,
+          description: `共找到 ${nextSchemes.length} 条方案记录`,
         });
       }
     } catch (error) {
@@ -284,7 +260,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
 
   const handleLocateSource = (sourceIds: string[]) => {
     if (sourceIds.length > 0) {
-      queryFeaturesByIds(sourceIds, "geo_junctions_mat").then((features) => {
+      queryFeaturesByIds(sourceIds, "junctions").then((features) => {
         if (features.length > 0) {
           // 设置高亮要素
           setHighlightFeatures(features);
@@ -307,7 +283,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
     }
   };
 
-  const handleViewDetails = (id: number) => {
+  const handleViewDetails = (id: string) => {
     const scheme = filteredSchemes.find((s) => s.id === id);
     if (!scheme) return;
 
@@ -328,6 +304,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
       }));
     }
     setSchemeName?.(scheme.schemeName);
+    setSchemeRunId?.(scheme.id);
     if (scheme.schemeDetail?.source) {
       handleLocateSource([scheme.schemeDetail.source]);
     }
@@ -343,6 +320,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
             timeRange={timeRange}
             disableDateSelection={!!timeRange}
             schemeName={schemeName}
+            schemeRunId={schemeRunId}
             schemeType={SCHEME_TYPE}
           />,
           mapContainer,

src/components/olmap/ContaminantSimulation/types.ts

@@ -6,7 +6,7 @@ export interface ContaminantSchemeDetail {
 }
 
 export interface ContaminantSchemeRecord {
-  id: number;
+  id: string;
   schemeName: string;
   type: string;
   username: string;
@@ -14,13 +14,3 @@ export interface ContaminantSchemeRecord {
   startTime: string;
   schemeDetail?: ContaminantSchemeDetail;
 }
-
-export interface ContaminantSchemaItem {
-  scheme_id: number;
-  scheme_name: string;
-  scheme_type: string;
-  username: string;
-  create_time: string;
-  scheme_start_time: string;
-  scheme_detail?: ContaminantSchemeDetail;
-}

src/components/olmap/DMALeakDetection/AnalysisParameters.tsx

@@ -21,8 +21,16 @@ import { api } from "@/lib/api";
 import { config } from "@config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useSessionRecoveryDraft } from "@/lib/sessionRecoveryDraft";
+import { getApiErrorMessage } from "@/lib/apiError";
 import { LeakageResultDetail } from "./types";
 import { FLOW_DISPLAY_UNIT, toM3s } from "@utils/units";
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_MAX_LENGTH,
+  SCHEME_NAME_PREFIXES,
+} from "@utils/schemeName";
 
 interface Props {
   onResult: (result: LeakageResultDetail) => void;
@@ -43,7 +51,7 @@ export interface DMALeakAnalysisParametersState {
 
 export const createDMALeakAnalysisParametersState =
   (): DMALeakAnalysisParametersState => ({
-    schemeName: `DMA_Leak_${Date.now()}`,
+    schemeName: createSchemeName(SCHEME_NAME_PREFIXES.dmaLeakIdentification),
     dmaCount: 5,
     startTime: dayjs().subtract(2, "hour"),
     endTime: dayjs(),
@@ -93,7 +101,7 @@ const AnalysisParameters: React.FC<Props> = ({
     qSumInput.trim() !== "" && Number.isFinite(parsedQSum) && parsedQSum >= 0;
 
   const isValid = useMemo(() => {
-    if (!schemeName.trim() || !startTime || !endTime) return false;
+    if (!isSchemeNameValid(schemeName) || !startTime || !endTime) return false;
     return startTime.isBefore(endTime) && qSumIsValid;
   }, [schemeName, startTime, endTime, qSumIsValid]);
 
@@ -118,7 +126,7 @@ const AnalysisParameters: React.FC<Props> = ({
       const response = await api.post(
         `${config.BACKEND_URL}/api/v1/leakage-identifications`,
         {
-          scheme_name: schemeName.trim(),
+          scheme_name: normalizeSchemeName(schemeName),
           dma_count: dmaCount,
           scada_start: startTime.toISOString(),
           scada_end: endTime.toISOString(),
@@ -136,12 +144,12 @@ const AnalysisParameters: React.FC<Props> = ({
         message: "方案分析成功",
         description: "DMA 漏损识别完成，请在方案查询中查看结果。",
       });
-    } catch (error: any) {
+    } catch (error) {
       open?.({
         key: "dma-leak-analysis-error",
         type: "error",
         message: "提交分析失败",
-        description: error?.response?.data?.detail ?? "请求失败",
+        description: getApiErrorMessage(error, "DMA 漏损识别请求失败"),
       });
     } finally {
       setRunning(false);
@@ -163,6 +171,13 @@ const AnalysisParameters: React.FC<Props> = ({
             value={schemeName}
             onChange={(e) => setFormField("schemeName", e.target.value)}
             placeholder="请输入方案名称"
+            error={schemeName.trim().length > SCHEME_NAME_MAX_LENGTH}
+            helperText={
+              schemeName.trim().length > SCHEME_NAME_MAX_LENGTH
+                ? `方案名称不能超过 ${SCHEME_NAME_MAX_LENGTH} 个字符`
+                : undefined
+            }
+            inputProps={{ maxLength: SCHEME_NAME_MAX_LENGTH }}
             fullWidth
             size="small"
           />

src/components/olmap/DMALeakDetection/SchemeQuery.tsx

@@ -21,8 +21,11 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import "dayjs/locale/zh-cn";
 import dayjs, { Dayjs } from "dayjs";
 import { useNotification } from "@refinedev/core";
-import { api } from "@/lib/api";
+import {
-import { NETWORK_NAME, config } from "@config/config";
+  getAnalysisResults,
+  getAnalysisScheme,
+  listAnalysisSchemes,
+} from "@/lib/analysisRuns";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { LeakageResultDetail, LeakageSchemeRecord } from "./types";
 import { FLOW_DISPLAY_UNIT, toM3h } from "@utils/units";
@@ -40,7 +43,7 @@ interface Props {
 export interface DMALeakSchemeQueryState {
   queryAll: boolean;
   queryDate: Dayjs | null;
-  expandedId: number | null;
+  expandedId: string | null;
   hasQueried: boolean;
 }
 
@@ -84,16 +87,12 @@ const SchemeQuery: React.FC<Props> = ({
   const handleQuery = async () => {
     setLoading(true);
     try {
-      const params: Record<string, string> = {
+      const nextSchemes = (await listAnalysisSchemes({
-        scheme_type: "dma_leak_identification",
+        runType: "dma_leak_identification",
-      };
+        queryDate: !queryAll && queryDate
-      if (!queryAll && queryDate) {
+          ? queryDate.format("YYYY-MM-DD")
-        params.query_date = queryDate.startOf("day").toISOString();
+          : undefined,
-      }
+      })) as LeakageSchemeRecord[];
-      const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, {
-        params,
-      });
-      const nextSchemes = response.data as LeakageSchemeRecord[];
       setSchemes(nextSchemes);
       setQueryField("hasQueried", true);
       if (nextSchemes.length === 0) {
@@ -122,22 +121,30 @@ const SchemeQuery: React.FC<Props> = ({
     }
   };
 
-  const handleViewSchemeResult = async (schemeName: string) => {
+  const handleViewSchemeResult = async (runId: string) => {
     try {
-      const response = await api.get(
+      const [scheme, results] = await Promise.all([
-        `${config.BACKEND_URL}/api/v1/schemes/${encodeURIComponent(schemeName)}`,
+        getAnalysisScheme(runId),
-        {
+        getAnalysisResults(runId, "leakage_identification"),
-          params: {
+      ]);
-            scheme_type: "dma_leak_identification",
+      const result = results[0]?.payload;
-          },
+      if (!result) {
-        },
+        throw new Error("方案详情缺少漏损识别结果");
-      );
+      }
-      onViewResult(response.data as LeakageResultDetail);
+      onViewResult({
+        ...result,
+        scheme_name: scheme.scheme_name,
+        scheme_detail: scheme.scheme_detail,
+        scheme_start_time: scheme.scheme_start_time,
+        create_time: scheme.create_time,
+        username: scheme.username,
+      } as LeakageResultDetail);
     } catch (error: any) {
       open?.({
         type: "error",
         message: "查看详情失败",
-        description: error?.response?.data?.detail ?? "无法获取方案详情",
+        description:
+          error?.response?.data?.detail ?? error?.message ?? "无法获取方案详情",
       });
     }
   };
@@ -293,7 +300,7 @@ const SchemeQuery: React.FC<Props> = ({
                           size="small"
                           className="bg-blue-600 hover:bg-blue-700"
                           sx={{ textTransform: "none", fontWeight: 500 }}
-                          onClick={() => handleViewSchemeResult(scheme.scheme_name)}
+                          onClick={() => handleViewSchemeResult(scheme.scheme_id)}
                         >
                           查看识别结果
                         </Button>

src/components/olmap/DMALeakDetection/types.ts

@@ -6,7 +6,7 @@ export interface LeakageRow {
 }
 
 export interface LeakageSchemeRecord {
-  scheme_id: number;
+  scheme_id: string;
   scheme_name: string;
   scheme_type: string;
   username: string;

src/components/olmap/FlushingAnalysis/AnalysisParameters.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useState, useEffect, useCallback } from "react";
+import React, { useState, useEffect, useCallback, useRef } from "react";
 import {
   Box,
   TextField,
@@ -8,8 +8,8 @@ import {
   Typography,
   IconButton,
   Stack,
-  Alert,
   Divider,
+  MenuItem,
 } from "@mui/material";
 import {
   AdjustOutlined,
@@ -33,14 +33,34 @@ import {
 import Feature, { FeatureLike } from "ol/Feature";
 import { useNotification } from "@refinedev/core";
 import { api } from "@/lib/api";
-import { config, NETWORK_NAME } from "@/config/config";
+import { config } from "@/config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
 import { useSessionRecoveryDraft } from "@/lib/sessionRecoveryDraft";
+import { getApiErrorMessage } from "@/lib/apiError";
 import PanelEmptyState from "@components/olmap/common/PanelEmptyState";
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_MAX_LENGTH,
+  SCHEME_NAME_PREFIXES,
+} from "@utils/schemeName";
+import {
+  type LinkStatus,
+  getValveSettingHelperText,
+  isLinkStatus,
+  normalizeValveSetting,
+  VALVE_STATUS_OPTIONS,
+  validateValveSetting,
+} from "@components/olmap/core/Controls/valveControl";
+import { getValveListClassName } from "./analysisParametersLayout";
 
 export interface ValveItem {
   id: string;
-  k: number;
+  setting?: string | null;
+  vType?: string | null;
+  status?: LinkStatus | null;
+  detailsLoaded?: boolean;
 }
 
 export interface FlushingAnalysisParametersState {
@@ -54,7 +74,7 @@ export interface FlushingAnalysisParametersState {
 
 export const createFlushingAnalysisParametersState =
   (): FlushingAnalysisParametersState => ({
-    schemeName: "Flushing_" + new Date().getTime(),
+    schemeName: createSchemeName(SCHEME_NAME_PREFIXES.flushingAnalysis),
     valves: [],
     drainageNode: null,
     startTime: dayjs(new Date()),
@@ -92,6 +112,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
 
   const [selectionMode, setSelectionMode] = useState<'none' | 'valve' | 'drainage'>('none');
   const [analyzing, setAnalyzing] = useState<boolean>(false);
+  const valveSettingRequests = useRef(new Set<string>());
 
   const [highlightLayer, setHighlightLayer] = useState<VectorLayer<VectorSource> | null>(null);
 
@@ -119,10 +140,10 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
       if (!feature) return;
 
       const layer = feature.getId()?.toString().split(".")[0];
-      const featureId = feature.getProperties().id;
+      const featureId = String(feature.getProperties().id);
 
       if (selectionMode === 'valve') {
-        if (layer !== 'geo_valves') {
+        if (layer !== 'valves') {
           open?.({
             type: "error",
             message: "请选择阀门要素",
@@ -139,11 +160,20 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
             return prev;
           }
           setValveFeatures((features) => [...features, feature]);
-          return [...prev, { id: featureId, k: 1.0 }];
+          return [
+            ...prev,
+            {
+              id: featureId,
+              setting: undefined,
+              vType: undefined,
+              status: undefined,
+              detailsLoaded: false,
+            },
+          ];
         });
 
       } else if (selectionMode === 'drainage') {
-        if (layer !== 'geo_junctions') {
+        if (layer !== 'junctions') {
           open?.({
             type: "error",
             message: "请选择节点要素作为排水点",
@@ -247,19 +277,104 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
     if (valveFeatures.length > 0) return;
     queryFeaturesByIds(
       valves.map((valve) => valve.id),
-      "geo_valves",
+      "valves",
     ).then((features) => {
       setValveFeatures(features);
     });
   }, [valveFeatures.length, valves]);
 
+  useEffect(() => {
+    valves.forEach((valve) => {
+      if (valve.detailsLoaded || valveSettingRequests.current.has(valve.id)) {
+        return;
+      }
+
+      valveSettingRequests.current.add(valve.id);
+      void Promise.allSettled([
+        api.get(`${config.BACKEND_URL}/api/v1/valves/properties`, {
+          params: { valve: valve.id },
+        }),
+        api.get(`${config.BACKEND_URL}/api/v1/status`, {
+          params: { link: valve.id },
+        }),
+      ])
+        .then(([propertiesResult, statusResult]) => {
+          const properties =
+            propertiesResult.status === "fulfilled"
+              ? propertiesResult.value.data
+              : null;
+          const rawSetting = properties?.setting;
+          const rawStatus =
+            statusResult.status === "fulfilled"
+              ? statusResult.value.data?.status
+              : null;
+          const status = isLinkStatus(rawStatus) ? rawStatus : null;
+
+          setValves((previous) =>
+            previous.map((item) =>
+              item.id === valve.id
+                ? {
+                    ...item,
+                    setting: normalizeValveSetting(rawSetting),
+                    vType: properties?.v_type
+                      ? String(properties.v_type)
+                      : null,
+                    status,
+                    detailsLoaded: true,
+                  }
+                : item,
+            ),
+          );
+
+          if (
+            propertiesResult.status === "rejected" ||
+            statusResult.status === "rejected"
+          ) {
+            console.error("读取阀门属性失败", {
+              propertiesError:
+                propertiesResult.status === "rejected"
+                  ? propertiesResult.reason
+                  : undefined,
+              statusError:
+                statusResult.status === "rejected"
+                  ? statusResult.reason
+                  : undefined,
+            });
+            open?.({
+              type: "error",
+              message: `阀门 ${valve.id} 的部分属性读取失败`,
+              description: [
+                propertiesResult.status === "rejected"
+                  ? `阀门属性：${getApiErrorMessage(
+                      propertiesResult.reason,
+                      "读取失败",
+                    )}`
+                  : null,
+                statusResult.status === "rejected"
+                  ? `开关状态：${getApiErrorMessage(
+                      statusResult.reason,
+                      "读取失败",
+                    )}`
+                  : null,
+              ]
+                .filter(Boolean)
+                .join("；"),
+            });
+          }
+        })
+        .finally(() => {
+          valveSettingRequests.current.delete(valve.id);
+        });
+    });
+  }, [open, setValves, valves]);
+
   useEffect(() => {
     if (!drainageNode) {
       setDrainageFeature(null);
       return;
     }
     if (drainageFeature) return;
-    queryFeaturesByIds([drainageNode], "geo_junctions").then((features) => {
+    queryFeaturesByIds([drainageNode], "junctions").then((features) => {
       setDrainageFeature(features[0] ?? null);
     });
   }, [drainageFeature, drainageNode]);
@@ -292,13 +407,25 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
     );
   };
 
-  const handleValveKChange = (id: string, k: string) => {
+  const handleValveStatusChange = (id: string, status: string) => {
-    const numK = parseFloat(k);
+    if (!isLinkStatus(status)) return;
-    setValves(prev => prev.map(v => v.id === id ? { ...v, k: isNaN(numK) ? 0 : numK } : v));
+    setValves((previous) =>
+      previous.map((valve) =>
+        valve.id === id ? { ...valve, status } : valve,
+      ),
+    );
+  };
+
+  const handleValveSettingChange = (id: string, setting: string) => {
+    setValves((previous) =>
+      previous.map((valve) =>
+        valve.id === id ? { ...valve, setting } : valve,
+      ),
+    );
   };
 
   const handleAnalyze = async () => {
-    if (!startTime || !drainageNode || !schemeName.trim()) {
+    if (!startTime || !drainageNode || !isSchemeNameValid(schemeName)) {
       open?.({
         type: "error",
         message: "请填写完整参数",
@@ -307,16 +434,48 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
       return;
     }
 
+    if (valves.some((valve) => !isLinkStatus(valve.status))) {
+      open?.({
+        type: "error",
+        message: "阀门开关状态未设置",
+        description: "请为所有参与阀门选择开启、关闭或激活状态",
+      });
+      return;
+    }
+
+    const invalidActiveValve = valves.find(
+      (valve) =>
+        valve.status === "ACTIVE" &&
+        validateValveSetting(valve.vType, valve.setting ?? ""),
+    );
+    if (invalidActiveValve) {
+      open?.({
+        type: "error",
+        message: `阀门 ${invalidActiveValve.id} 的设置值无效`,
+        description:
+          validateValveSetting(
+            invalidActiveValve.vType,
+            invalidActiveValve.setting ?? "",
+          ) ?? undefined,
+      });
+      return;
+    }
+
     setAnalyzing(true);
 
     try {
       const formattedTime = startTime.format("YYYY-MM-DDTHH:mm:00Z"); // ISO format with seconds set to 00
 
       const params = {
-        scheme_name: schemeName,
+        scheme_name: normalizeSchemeName(schemeName),
         start_time: formattedTime,
+        ...(valves.length > 0 && {
           valves: valves.map(v => v.id),
-        valves_k: valves.map(v => v.k),
+          valve_statuses: valves.map((v) => v.status),
+          valve_settings: valves.map((v) =>
+            v.status === "ACTIVE" ? (v.setting ?? "").trim() : "",
+          ),
+        }),
         drainage_node_id: drainageNode,
         flush_flow: flushFlow,
         duration: duration
@@ -346,7 +505,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
       open?.({
         type: "error",
         message: "提交分析失败",
-        description: error instanceof Error ? error.message : "未知错误",
+        description: getApiErrorMessage(error, "管道冲洗分析请求失败"),
       });
     } finally {
       setAnalyzing(false);
@@ -355,62 +514,11 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
 
   return (
     <Box className="flex flex-col h-full gap-4 pb-4">
-      {/* 1. Valve Selection */}
+      {/* 1. Drainage Node Selection */}
       <Box>
         <Box className="flex items-center justify-between mb-2">
           <Typography variant="subtitle2" className="font-medium">
-            参与阀门
+            排水节点（必选）
-          </Typography>
-          <Button
-            variant={selectionMode === 'valve' ? "contained" : "outlined"}
-            color={selectionMode === 'valve' ? "error" : "primary"}
-            size="small"
-            onClick={() => toggleSelection('valve')}
-          >
-            {selectionMode === 'valve' ? "停止选择" : "选择阀门"}
-          </Button>
-        </Box>
-        {selectionMode === 'valve' && (
-          <Box className="mb-2 p-2 bg-blue-50 text-xs text-blue-700 rounded">
-            💡 点击地图上的阀门进行添加
-          </Box>
-        )}
-        <Stack spacing={1} className="max-h-50 h-48 overflow-auto">
-          {valves.map((valve) => (
-            <Box key={valve.id} className="flex items-center gap-2 p-2 bg-gray-50 rounded">
-              <Typography className="text-sm flex-1 pl-1">{valve.id}</Typography>
-              <TextField
-                label="开度"
-                size="small"
-                type="number"
-                value={valve.k}
-                onChange={(e) => handleValveKChange(valve.id, e.target.value)}
-                className="w-20"
-                slotProps={{ htmlInput: { step: 0.1, min: 0, max: 1 } }}
-              />
-              <IconButton size="small" onClick={() => handleRemoveValve(valve.id)}>
-                <CloseIcon fontSize="small" />
-              </IconButton>
-            </Box>
-          ))}
-          {valves.length === 0 && (
-            <PanelEmptyState
-              variant="compact"
-              icon={<AdjustOutlined />}
-              title="尚未选择阀门"
-              description="点击“选择阀门”，然后在地图上添加。"
-            />
-          )}
-        </Stack>
-      </Box>
-
-      <Divider />
-
-      {/* 2. Drainage Node Selection */}
-      <Box>
-        <Box className="flex items-center justify-between mb-2">
-          <Typography variant="subtitle2" className="font-medium">
-            排水节点
           </Typography>
           <Button
             variant={selectionMode === 'drainage' ? "contained" : "outlined"}
@@ -444,6 +552,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
           {!drainageNode && (
             <PanelEmptyState
               variant="compact"
+              horizontalAlign="start"
               icon={<WaterDropOutlined />}
               title="尚未选择排水节点"
               description="点击“选择节点”，然后在地图上指定排水点。"
@@ -454,6 +563,110 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
 
       <Divider />
 
+      {/* 2. Optional Valve Selection */}
+      <Box>
+        <Box className="flex items-center justify-between mb-2">
+          <Typography variant="subtitle2" className="font-medium">
+            参与阀门（可选）
+          </Typography>
+          <Button
+            variant={selectionMode === 'valve' ? "contained" : "outlined"}
+            color={selectionMode === 'valve' ? "error" : "primary"}
+            size="small"
+            onClick={() => toggleSelection('valve')}
+          >
+            {selectionMode === 'valve' ? "停止选择" : "选择阀门"}
+          </Button>
+        </Box>
+        {selectionMode === 'valve' && (
+          <Box className="mb-2 p-2 bg-blue-50 text-xs text-blue-700 rounded">
+            💡 点击地图上的阀门进行添加
+          </Box>
+        )}
+        <Stack
+          spacing={1}
+          className={getValveListClassName(valves.length)}
+        >
+          {valves.map((valve) => {
+            const settingValidation =
+              valve.status === "ACTIVE"
+                ? validateValveSetting(valve.vType, valve.setting ?? "")
+                : null;
+            const isSettingDisabled =
+              !valve.detailsLoaded ||
+              valve.status === "OPEN" ||
+              valve.status === "CLOSED";
+
+            return (
+              <Box key={valve.id} className="p-2 bg-gray-50 rounded">
+                <Box className="flex items-center gap-2 mb-2">
+                  <Typography className="text-sm min-w-0 flex-1 pl-1">
+                    {valve.id}
+                  </Typography>
+                  <IconButton
+                    size="small"
+                    aria-label={`移除阀门 ${valve.id}`}
+                    onClick={() => handleRemoveValve(valve.id)}
+                  >
+                    <CloseIcon fontSize="small" />
+                  </IconButton>
+                </Box>
+                <Box className="grid grid-cols-2 gap-2">
+                  <TextField
+                    select
+                    fullWidth
+                    size="small"
+                    label="开关状态"
+                    value={valve.status ?? ""}
+                    disabled={!valve.detailsLoaded}
+                    onChange={(event) =>
+                      handleValveStatusChange(valve.id, event.target.value)
+                    }
+                  >
+                    {VALVE_STATUS_OPTIONS.map((option) => (
+                      <MenuItem key={option.value} value={option.value}>
+                        {option.label}
+                      </MenuItem>
+                    ))}
+                  </TextField>
+                  <TextField
+                    fullWidth
+                    size="small"
+                    label="阀门设置值"
+                    value={valve.setting ?? ""}
+                    disabled={isSettingDisabled}
+                    error={Boolean(settingValidation)}
+                    helperText={
+                      valve.detailsLoaded
+                        ? settingValidation ??
+                          getValveSettingHelperText(
+                            valve.vType,
+                            valve.status,
+                          )
+                        : "加载中"
+                    }
+                    onChange={(event) =>
+                      handleValveSettingChange(valve.id, event.target.value)
+                    }
+                  />
+                </Box>
+              </Box>
+            );
+          })}
+          {valves.length === 0 && (
+            <PanelEmptyState
+              variant="compact"
+              horizontalAlign="start"
+              icon={<AdjustOutlined />}
+              title="未选择参与阀门"
+              description="无需调整阀门时可跳过，也可点击“选择阀门”添加。"
+            />
+          )}
+        </Stack>
+      </Box>
+
+      <Divider />
+
       {/* 3. Parameters */}
       <Box className="flex flex-col gap-3">
         <Box>
@@ -485,6 +698,13 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
             value={schemeName}
             onChange={(e) => setFormField("schemeName", e.target.value)}
             placeholder="请输入方案名称"
+            error={schemeName.trim().length > SCHEME_NAME_MAX_LENGTH}
+            helperText={
+              schemeName.trim().length > SCHEME_NAME_MAX_LENGTH
+                ? `方案名称不能超过 ${SCHEME_NAME_MAX_LENGTH} 个字符`
+                : undefined
+            }
+            inputProps={{ maxLength: SCHEME_NAME_MAX_LENGTH }}
           />
         </Box>
 
@@ -527,7 +747,7 @@ const AnalysisParameters: React.FC<AnalysisParametersProps> = ({
           onClick={handleAnalyze}
           disabled={
             analyzing ||
-            !schemeName.trim() ||
+            !isSchemeNameValid(schemeName) ||
             !drainageNode ||
             !startTime ||
             // !flushFlow ||

src/components/olmap/FlushingAnalysis/SchemeQuery.tsx

@@ -26,9 +26,9 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import "dayjs/locale/zh-cn";
 import dayjs, { Dayjs } from "dayjs";
-import { api } from "@/lib/api";
+import { listAnalysisSchemes } from "@/lib/analysisRuns";
 import moment from "moment";
-import { config, NETWORK_NAME } from "@config/config";
+import { NETWORK_NAME } from "@config/config";
 import { useNotification } from "@refinedev/core";
 import { useData, useMap } from "@components/olmap/core/MapComponent";
 import { queryFeaturesByIds } from "@/utils/mapQueryService";
@@ -40,10 +40,11 @@ import { Style, Icon, Circle, Fill, Stroke } from "ol/style";
 import Feature, { FeatureLike } from "ol/Feature";
 import { bbox, featureCollection } from "@turf/turf";
 import Timeline from "@components/olmap/core/Controls/Timeline";
-import { SchemeRecord, SchemaItem } from "./types";
+import { SchemeRecord } from "./types";
 import { FLOW_DISPLAY_UNIT } from "@utils/units";
 import { useSchemeCreatorName } from "@components/olmap/core/useSchemeCreatorName";
 import { SchemeQueryEmptyState } from "@components/olmap/common/PanelEmptyState";
+import { formatValveControlSummary } from "@components/olmap/core/Controls/toolbarFeatureHelpers";
 
 interface SchemeQueryProps {
   schemes?: SchemeRecord[];
@@ -58,7 +59,7 @@ const SCHEME_TYPE = "flushing_analysis";
 export interface FlushingSchemeQueryState {
   queryAll: boolean;
   queryDate: Dayjs | null;
-  expandedId: number | null;
+  expandedId: string | null;
   showTimeline: boolean;
   selectedDate: Date | undefined;
   timeRange: { start: Date; end: Date } | undefined;
@@ -110,7 +111,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
   const { open } = useNotification();
   const map = useMap();
   const data = useData();
-  const { schemeName, setSchemeName } = data || {};
+  const { schemeName, setSchemeName, schemeRunId, setSchemeRunId } = data || {};
 
   const schemes = externalSchemes !== undefined ? externalSchemes : internalSchemes;
   const setSchemes = onSchemesChange || setInternalSchemes;
@@ -213,7 +214,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
 
   const handleLocateDrainageNode = (nodeId: string) => {
     if (!nodeId) return;
-    queryFeaturesByIds([nodeId], "geo_junctions_mat").then((features) => {
+    queryFeaturesByIds([nodeId], "junctions").then((features) => {
       if (features.length > 0) {
         // Add type property to distinguish styling
         features.forEach(f => f.set("type", "drainage"));
@@ -230,7 +231,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
 
   const handleLocateValves = (valveIds: string[]) => {
     if (!valveIds || valveIds.length === 0) return;
-    queryFeaturesByIds(valveIds, "geo_valves").then((features) => {
+    queryFeaturesByIds(valveIds, "valves").then((features) => {
       if (features.length > 0) {
         features.forEach(f => f.set("type", "valve"));
         setHighlightFeatures(features);
@@ -268,42 +269,16 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
 
     setLoading(true);
     try {
-      const params: Record<string, string> = {
+      const nextSchemes = (await listAnalysisSchemes({
-        scheme_type: SCHEME_TYPE,
+        runType: SCHEME_TYPE,
-      };
+        queryDate: !queryAll && queryDate
-      if (!queryAll && queryDate) {
+          ? queryDate.format("YYYY-MM-DD")
-        params.query_date = queryDate.startOf("day").toISOString();
+          : undefined,
-      }
+      })) as unknown as SchemeRecord[];
-      const response = await api.get(`${config.BACKEND_URL}/api/v1/schemes`, {
-        params,
-      });
-
-      let filteredResults = response.data;
-
-      // Filter by type
-      filteredResults = filteredResults.filter((item: SchemaItem) => item.scheme_type === SCHEME_TYPE);
-
-      if (!queryAll && queryDate) {
-        const formattedDate = queryDate.format("YYYY-MM-DD");
-        filteredResults = filteredResults.filter((item: SchemaItem) => {
-          const itemDate = moment(item.create_time).format("YYYY-MM-DD");
-          return itemDate === formattedDate;
-        });
-      }
-
-      const nextSchemes = filteredResults.map((item: SchemaItem) => ({
-        id: item.scheme_id,
-        schemeName: item.scheme_name,
-        type: item.scheme_type,
-        username: item.username,
-        create_time: item.create_time,
-        startTime: item.scheme_start_time,
-        schemeDetail: item.scheme_detail,
-      }));
       setSchemes(nextSchemes);
       setQueryField("hasQueried", true);
 
-      if (filteredResults.length === 0) {
+      if (nextSchemes.length === 0) {
         open?.({
           type: "success",
           message: "未找到相关方案",
@@ -313,7 +288,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
         open?.({
           type: "success",
           message: "查询成功",
-          description: `共找到 ${filteredResults.length} 条方案记录`,
+          description: `共找到 ${nextSchemes.length} 条方案记录`,
         });
       }
     } catch (error) {
@@ -345,6 +320,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
     }
 
     setSchemeName?.(scheme.schemeName);
+    setSchemeRunId?.(scheme.id);
 
     // Locate drainage node by default if available
     if (scheme.schemeDetail?.drainage_node_ID) {
@@ -362,6 +338,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
             timeRange={timeRange}
             disableDateSelection={!!timeRange}
             schemeName={schemeName}
+            schemeRunId={schemeRunId}
             schemeType={SCHEME_TYPE}
           />,
           mapContainer,
@@ -589,10 +566,22 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
                           {/* 阀门列表 */}
                           <Box className="col-span-2 pl-2">
                             <Typography variant="caption" className="text-gray-600 block mb-1">
-                              参与阀门及开度:
+                              参与阀门及设置:
                             </Typography>
                             <Box className="flex flex-wrap gap-2">
-                              {scheme.schemeDetail?.valve_opening && Object.entries(scheme.schemeDetail.valve_opening).length > 0 ? (
+                              {scheme.schemeDetail?.valve_control && Object.entries(scheme.schemeDetail.valve_control).length > 0 ? (
+                                Object.entries(scheme.schemeDetail.valve_control).map(([id, control]) => (
+                                  <Tooltip key={id} title="点击定位阀门">
+                                    <Chip
+                                      label={formatValveControlSummary(id, control)}
+                                      size="small"
+                                      variant="outlined"
+                                      onClick={() => handleLocateValves([id])}
+                                      className="text-xs h-6 bg-gray-50 cursor-pointer hover:bg-orange-50 hover:border-orange-200"
+                                    />
+                                  </Tooltip>
+                                ))
+                              ) : scheme.schemeDetail?.valve_opening && Object.entries(scheme.schemeDetail.valve_opening).length > 0 ? (
                                 Object.entries(scheme.schemeDetail.valve_opening).map(([id, k]) => (
                                   <Tooltip key={id} title="点击定位阀门">
                                     <Chip

src/components/olmap/FlushingAnalysis/analysisParametersLayout.test.ts

@@ -0,0 +1,13 @@
+import { getValveListClassName } from "./analysisParametersLayout";
+
+describe("getValveListClassName", () => {
+  it("uses compact height when no valves are selected", () => {
+    expect(getValveListClassName(0)).toBe("min-h-16 overflow-auto");
+  });
+
+  it("restores the fixed scroll region when valves are selected", () => {
+    expect(getValveListClassName(1)).toBe(
+      "max-h-50 h-48 overflow-auto",
+    );
+  });
+});

src/components/olmap/FlushingAnalysis/analysisParametersLayout.ts

@@ -0,0 +1,4 @@
+export const getValveListClassName = (valveCount: number): string =>
+  valveCount > 0
+    ? "max-h-50 h-48 overflow-auto"
+    : "min-h-16 overflow-auto";

src/components/olmap/FlushingAnalysis/types.ts

@@ -1,12 +1,20 @@
 export interface SchemeDetail {
-  valve_opening: Record<string, number>;
+  valve_opening?: Record<string, number> | null;
+  valve_control?: Record<
+    string,
+    {
+      status?: "OPEN" | "CLOSED" | "ACTIVE";
+      setting?: string | number;
+      k?: number;
+    }
+  > | null;
   drainage_node_ID: string;
   flushing_flow: number;
   duration: number;
 }
 
 export interface SchemeRecord {
-  id: number;
+  id: string;
   schemeName: string;
   type: string;
   username: string;
@@ -15,13 +23,3 @@ export interface SchemeRecord {
   // 详情信息
   schemeDetail?: SchemeDetail;
 }
-
-export interface SchemaItem {
-  scheme_id: number;
-  scheme_name: string;
-  scheme_type: string;
-  username: string;
-  create_time: string;
-  scheme_start_time: string;
-  scheme_detail?: SchemeDetail;
-}

src/components/olmap/MonitoringPlaceOptimization/MonitoringPlaceOptimizationPanel.test.tsx

@@ -26,11 +26,11 @@ jest.mock("./SchemeQuery", () => ({
     onEdit,
     active,
   }: {
-    onEdit: (schemeId: number) => void;
+    onEdit: (schemeId: string) => void;
     active?: boolean;
   }) => {
     mockSchemeQueryRender(active);
-    return <button onClick={() => onEdit(7)}>打开测试方案</button>;
+    return <button onClick={() => onEdit("run-7")}>打开测试方案</button>;
   },
   createMonitoringSchemeQueryState: () => ({}),
 }));
@@ -61,7 +61,7 @@ jest.mock("@components/olmap/common/PanelEmptyState", () => ({
 const mockGetSensorPlacementScheme = jest.mocked(getSensorPlacementScheme);
 
 const scheme: SensorPlacementScheme = {
-  id: 7,
+  id: "run-7",
   scheme_name: "测试方案",
   sensor_number: 1,
   min_diameter: 100,

src/components/olmap/MonitoringPlaceOptimization/MonitoringPlaceOptimizationPanel.tsx

@@ -103,7 +103,7 @@ const MonitoringPlaceOptimizationPanel: React.FC<
   const [activeScheme, setActiveScheme] =
     useState<SensorPlacementScheme | null>(null);
   const [loadingScheme, setLoadingScheme] = useState(false);
-  const [pendingOpenSchemeId, setPendingOpenSchemeId] = useState<number | null>(
+  const [pendingOpenSchemeId, setPendingOpenSchemeId] = useState<string | null>(
     null,
   );
   const { open: notify } = useNotification();
@@ -138,7 +138,7 @@ const MonitoringPlaceOptimizationPanel: React.FC<
     setPendingOpenSchemeId(null);
   }, []);
 
-  const handleOpenScheme = async (schemeId: number) => {
+  const handleOpenScheme = async (schemeId: string) => {
     setLoadingScheme(true);
     try {
       const scheme = await getSensorPlacementScheme(schemeId);

src/components/olmap/MonitoringPlaceOptimization/OptimizationParameters.tsx

@@ -12,8 +12,16 @@ import { PlayArrow as PlayArrowIcon } from "@mui/icons-material";
 import { useNotification } from "@refinedev/core";
 import { NETWORK_NAME } from "@/config/config";
 import { useControllableObjectState } from "@components/olmap/core/useControllableState";
+import { getApiErrorMessage } from "@/lib/apiError";
 import { optimizeSensorPlacement } from "./schemeApi";
 import type { SensorPlacementScheme } from "./types";
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_MAX_LENGTH,
+  SCHEME_NAME_PREFIXES,
+} from "@utils/schemeName";
 
 export interface OptimizationParametersState {
   method: string;
@@ -27,7 +35,7 @@ export const createOptimizationParametersState =
     method: "kmeans",
     sensorCount: 5,
     minDiameter: 5,
-    schemeName: "Fangan" + new Date().getTime(),
+    schemeName: createSchemeName(SCHEME_NAME_PREFIXES.sensorPlacement),
   });
 
 interface OptimizationParametersProps {
@@ -62,7 +70,7 @@ const OptimizationParameters: React.FC<OptimizationParametersProps> = ({
   // 创建方案
   const handleCreateScheme = async () => {
     // 验证输入
-    if (!schemeName.trim()) {
+    if (!isSchemeNameValid(schemeName)) {
       open?.({
         type: "error",
         message: "请输入方案名称",
@@ -90,7 +98,7 @@ const OptimizationParameters: React.FC<OptimizationParametersProps> = ({
 
     try {
       const created = await optimizeSensorPlacement({
-        scheme_name: schemeName,
+        run_name: normalizeSchemeName(schemeName),
         sensor_type: "pressure",
         method: method as "sensitivity" | "kmeans",
         sensor_count: sensorCount,
@@ -102,14 +110,16 @@ const OptimizationParameters: React.FC<OptimizationParametersProps> = ({
         description: `方案 "${schemeName}" 已完成优化分析`,
       });
       onSchemeCreated?.(created);
-      setFormField("schemeName", "Fangan" + new Date().getTime());
+      setFormField(
-    } catch (error: any) {
+        "schemeName",
+        createSchemeName(SCHEME_NAME_PREFIXES.sensorPlacement),
+      );
+    } catch (error) {
       console.error("创建方案失败:", error);
       open?.({
         type: "error",
         message: "创建方案失败",
-        description:
+        description: getApiErrorMessage(error, "监测点优化请求失败"),
-          error.response?.data?.message || error.message || "未知错误",
       });
     } finally {
       setAnalyzing(false);
@@ -255,6 +265,13 @@ const OptimizationParameters: React.FC<OptimizationParametersProps> = ({
           value={schemeName}
           onChange={(e) => setFormField("schemeName", e.target.value)}
           placeholder="请输入方案名称"
+          error={schemeName.trim().length > SCHEME_NAME_MAX_LENGTH}
+          helperText={
+            schemeName.trim().length > SCHEME_NAME_MAX_LENGTH
+              ? `方案名称不能超过 ${SCHEME_NAME_MAX_LENGTH} 个字符`
+              : undefined
+          }
+          inputProps={{ maxLength: SCHEME_NAME_MAX_LENGTH }}
           sx={{
             "& .MuiOutlinedInput-root": {
               "&:hover fieldset": {

src/components/olmap/MonitoringPlaceOptimization/SchemeEditor.test.tsx

@@ -146,7 +146,7 @@ jest.mock("./schemeApi", () => ({
 }));
 
 const scheme: SensorPlacementScheme = {
-  id: 1,
+  id: "run-1",
   scheme_name: "测试方案",
   sensor_number: 1,
   min_diameter: 300,

src/components/olmap/MonitoringPlaceOptimization/SchemeQuery.tsx

@@ -24,9 +24,8 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
 import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
 import "dayjs/locale/zh-cn"; // 引入中文包
 import dayjs, { Dayjs } from "dayjs";
-import { api } from "@/lib/api";
 import moment from "moment";
-import { config, NETWORK_NAME } from "@config/config";
+import { NETWORK_NAME } from "@config/config";
 import { useNotification } from "@refinedev/core";
 import { useMap } from "@components/olmap/core/MapComponent";
 import { queryFeaturesByIds } from "@/utils/mapQueryService";
@@ -40,22 +39,13 @@ import { bbox, featureCollection } from "@turf/turf";
 import type { SchemeRecord } from "./types";
 import { useSchemeCreatorName } from "@components/olmap/core/useSchemeCreatorName";
 import { SchemeQueryEmptyState } from "@components/olmap/common/PanelEmptyState";
-
+import { listSensorPlacementSchemes } from "./schemeApi";
-interface SchemaItem {
-  id: number;
-  scheme_name: string;
-  sensor_number: number;
-  min_diameter: number;
-  username: string;
-  create_time: string;
-  sensor_location?: string[];
-}
 
 interface SchemeQueryProps {
   schemes?: SchemeRecord[];
   active?: boolean;
   onSchemesChange?: (schemes: SchemeRecord[]) => void;
-  onEdit?: (id: number) => void;
+  onEdit?: (id: string) => void;
   network?: string;
   state?: MonitoringSchemeQueryState;
   onStateChange?: (state: MonitoringSchemeQueryState) => void;
@@ -64,7 +54,7 @@ interface SchemeQueryProps {
 export interface MonitoringSchemeQueryState {
   queryAll: boolean;
   queryDate: Dayjs | null;
-  expandedId: number | null;
+  expandedId: string | null;
   hasQueried: boolean;
 }
 
@@ -185,22 +175,18 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
 
     setLoading(true);
     try {
-      const response = await api.get(
+      let filteredResults = await listSensorPlacementSchemes();
-        `${config.BACKEND_URL}/api/v1/sensor-placement-schemes`,
-      );
-
-      let filteredResults = response.data;
 
       // 按日期过滤
       if (!queryAll && queryDate) {
         const formattedDate = queryDate.format("YYYY-MM-DD");
-        filteredResults = filteredResults.filter((item: SchemaItem) => {
+        filteredResults = filteredResults.filter((item) => {
           const itemDate = moment(item.create_time).format("YYYY-MM-DD");
           return itemDate === formattedDate;
         });
       }
 
-      const nextSchemes = filteredResults.map((item: SchemaItem) => ({
+      const nextSchemes = filteredResults.map((item) => ({
         id: item.id,
         schemeName: item.scheme_name,
         sensorNumber: item.sensor_number,
@@ -250,7 +236,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
     }
 
     if (sensorIds.length > 0) {
-      queryFeaturesByIds(sensorIds, "geo_junctions_mat").then((features) => {
+      queryFeaturesByIds(sensorIds, "junctions").then((features) => {
         if (features.length > 0) {
           // 设置高亮要素
           setHighlightFeatures(features);
@@ -271,7 +257,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
   };
 
   // 查看详情（展开/收起）
-  const handleViewDetails = (id: number) => {
+  const handleViewDetails = (id: string) => {
     setQueryField("expandedId", expandedId === id ? null : id);
   };
 

src/components/olmap/MonitoringPlaceOptimization/engineeringDrawing.test.ts

@@ -122,7 +122,7 @@ const point = (
 const rows = [point("A", 1, 400, 200), point("B", 2, 500, 300)];
 
 const scheme: SensorPlacementScheme = {
-  id: 1,
+  id: "run-1",
   scheme_name: "测试方案",
   sensor_number: rows.length,
   min_diameter: 300,

src/components/olmap/MonitoringPlaceOptimization/schemeApi.test.ts

@@ -0,0 +1,98 @@
+import { api } from "@/lib/api";
+import {
+  exportSensorPlacementExcel,
+  getSensorPlacementScheme,
+  listSensorPlacementSchemes,
+  optimizeSensorPlacement,
+  overwriteSensorPlacementScheme,
+} from "./schemeApi";
+
+jest.mock("@/lib/api", () => ({
+  api: {
+    get: jest.fn(),
+    post: jest.fn(),
+    put: jest.fn(),
+  },
+}));
+
+const run = {
+  run_id: "9fb546cb-5f72-4ddd-8a46-d13e9aee2c6b",
+  name: "sensor-plan-a",
+  sensor_count: 2,
+  min_diameter: 300,
+  created_by: "operator",
+  created_at: "2026-08-25T08:00:00Z",
+  sensor_locations: ["J-1", "J-2"],
+  sensor_points: [],
+  can_edit: true,
+  status: "completed",
+};
+
+describe("sensor placement runs API adapter", () => {
+  beforeEach(() => jest.clearAllMocks());
+
+  it("lists paged runs and maps run fields to the existing screen model", async () => {
+    jest.mocked(api.get).mockResolvedValue({
+      data: { items: [run], total: 1, limit: 1000, offset: 0 },
+    });
+
+    await expect(listSensorPlacementSchemes()).resolves.toEqual([
+      expect.objectContaining({
+        id: run.run_id,
+        scheme_name: run.name,
+        sensor_number: 2,
+        sensor_location: ["J-1", "J-2"],
+      }),
+    ]);
+    expect(api.get).toHaveBeenCalledWith(
+      expect.stringContaining("/api/v1/sensor-placement-runs"),
+      { params: { limit: 1000, offset: 0 } },
+    );
+  });
+
+  it("uses run endpoints for creation and detail lookup", async () => {
+    jest.mocked(api.post).mockResolvedValue({ data: run });
+    jest.mocked(api.get).mockResolvedValue({ data: run });
+
+    await optimizeSensorPlacement({
+      run_name: run.name,
+      sensor_type: "pressure",
+      method: "sensitivity",
+      sensor_count: 2,
+      min_diameter: 300,
+    });
+    await getSensorPlacementScheme(run.run_id);
+
+    expect(api.post).toHaveBeenCalledWith(
+      expect.stringMatching(/\/api\/v1\/sensor-placement-runs$/),
+      expect.objectContaining({ run_name: run.name }),
+    );
+    expect(api.get).toHaveBeenLastCalledWith(
+      expect.stringContaining(`/api/v1/sensor-placement-runs/${run.run_id}`),
+    );
+  });
+
+  it("uses the plural result fields required by update and export", async () => {
+    jest.mocked(api.put).mockResolvedValue({ data: run });
+    jest.mocked(api.post).mockResolvedValue({ data: new Blob() });
+
+    await overwriteSensorPlacementScheme(run.run_id, ["J-1"], ["J-2"]);
+    await exportSensorPlacementExcel(run.run_id, ["J-2"], { "J-2": "added" });
+
+    expect(api.put).toHaveBeenCalledWith(
+      expect.stringContaining(`/sensor-placement-runs/${run.run_id}`),
+      {
+        expected_sensor_locations: ["J-1"],
+        sensor_locations: ["J-2"],
+      },
+    );
+    expect(api.post).toHaveBeenCalledWith(
+      expect.stringContaining(`/sensor-placement-runs/${run.run_id}/exports/excel`),
+      {
+        sensor_locations: ["J-2"],
+        adjustment_status: { "J-2": "added" },
+      },
+      { responseType: "blob" },
+    );
+  });
+});

src/components/olmap/MonitoringPlaceOptimization/schemeApi.ts

@@ -7,30 +7,67 @@ import type {
 } from "./types";
 
 export interface OptimizeSchemeInput {
-  scheme_name: string;
+  run_name: string;
   sensor_type: "pressure";
   method: "sensitivity" | "kmeans";
   sensor_count: number;
   min_diameter: number;
 }
 
+type SensorPlacementRunResponse = {
+  run_id: string;
+  name: string;
+  sensor_count: number;
+  min_diameter: number;
+  created_by: string;
+  created_at: string;
+  sensor_locations: string[];
+  sensor_points: SensorPoint[];
+  can_edit: boolean;
+};
+
+const toSensorPlacementScheme = (
+  run: SensorPlacementRunResponse,
+): SensorPlacementScheme => ({
+  id: run.run_id,
+  scheme_name: run.name,
+  sensor_number: run.sensor_count,
+  min_diameter: run.min_diameter,
+  username: run.created_by,
+  create_time: run.created_at,
+  sensor_location: run.sensor_locations,
+  sensor_points: run.sensor_points,
+  can_edit: run.can_edit,
+});
+
 export const optimizeSensorPlacement = async (
   input: OptimizeSchemeInput,
 ): Promise<SensorPlacementScheme> => {
-  const response = await api.post<SensorPlacementScheme>(
+  const response = await api.post<SensorPlacementRunResponse>(
-    `${config.BACKEND_URL}/api/v1/sensor-placement-optimization-runs`,
+    `${config.BACKEND_URL}/api/v1/sensor-placement-runs`,
     input,
   );
-  return response.data;
+  return toSensorPlacementScheme(response.data);
+};
+
+export const listSensorPlacementSchemes = async (): Promise<
+  SensorPlacementScheme[]
+> => {
+  const response = await api.get<{
+    items: SensorPlacementRunResponse[];
+  }>(`${config.BACKEND_URL}/api/v1/sensor-placement-runs`, {
+    params: { limit: 1000, offset: 0 },
+  });
+  return response.data.items.map(toSensorPlacementScheme);
 };
 
 export const getSensorPlacementScheme = async (
-  schemeId: number,
+  schemeId: string,
 ): Promise<SensorPlacementScheme> => {
-  const response = await api.get<SensorPlacementScheme>(
+  const response = await api.get<SensorPlacementRunResponse>(
-    `${config.BACKEND_URL}/api/v1/sensor-placement-schemes/${schemeId}`,
+    `${config.BACKEND_URL}/api/v1/sensor-placement-runs/${encodeURIComponent(schemeId)}`,
   );
-  return response.data;
+  return toSensorPlacementScheme(response.data);
 };
 
 export const getSensorPlacementCandidate = async (
@@ -43,29 +80,29 @@ export const getSensorPlacementCandidate = async (
 };
 
 export const overwriteSensorPlacementScheme = async (
-  schemeId: number,
+  schemeId: string,
   expectedSensorLocation: string[],
   sensorLocation: string[],
 ): Promise<SensorPlacementScheme> => {
-  const response = await api.put<SensorPlacementScheme>(
+  const response = await api.put<SensorPlacementRunResponse>(
-    `${config.BACKEND_URL}/api/v1/sensor-placement-schemes/${schemeId}`,
+    `${config.BACKEND_URL}/api/v1/sensor-placement-runs/${encodeURIComponent(schemeId)}`,
     {
-      expected_sensor_location: expectedSensorLocation,
+      expected_sensor_locations: expectedSensorLocation,
-      sensor_location: sensorLocation,
+      sensor_locations: sensorLocation,
     },
   );
-  return response.data;
+  return toSensorPlacementScheme(response.data);
 };
 
 export const exportSensorPlacementExcel = async (
-  schemeId: number,
+  schemeId: string,
   sensorLocation: string[],
   adjustmentStatus: Record<string, AdjustmentStatus>,
 ) => {
   const response = await api.post<Blob>(
-    `${config.BACKEND_URL}/api/v1/sensor-placement-schemes/${schemeId}/exports/excel`,
+    `${config.BACKEND_URL}/api/v1/sensor-placement-runs/${encodeURIComponent(schemeId)}/exports/excel`,
     {
-      sensor_location: sensorLocation,
+      sensor_locations: sensorLocation,
       adjustment_status: adjustmentStatus,
     },
     {

src/components/olmap/MonitoringPlaceOptimization/schemeEditor.test.ts

@@ -24,7 +24,7 @@ const point = (node_id: string): SensorPoint => ({
 });
 
 const scheme: SensorPlacementScheme = {
-  id: 1,
+  id: "run-1",
   scheme_name: "测试方案",
   sensor_number: 2,
   min_diameter: 300,

src/components/olmap/MonitoringPlaceOptimization/types.ts

@@ -13,7 +13,7 @@ export interface SensorPoint {
 }
 
 export interface SensorPlacementScheme {
-  id: number;
+  id: string;
   scheme_name: string;
   sensor_number: number;
   min_diameter: number;
@@ -25,7 +25,7 @@ export interface SensorPlacementScheme {
 }
 
 export interface SchemeRecord {
-  id: number;
+  id: string;
   schemeName: string;
   sensorNumber: number;
   minDiameter: number;

src/components/olmap/SCADA/SCADADeviceList.tsx

@@ -192,7 +192,7 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
       setLoading(true);
       try {
         const activeWorkspace = workspace || config.MAP_WORKSPACE;
-        const url = `${config.MAP_URL}/${activeWorkspace}/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=${activeWorkspace}:geo_scada&outputFormat=application/json`;
+        const url = `${config.MAP_URL}/${activeWorkspace}/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=${activeWorkspace}:scada_devices&outputFormat=application/json`;
         const response = await fetch(url);
         if (!response.ok) throw new Error("Failed to fetch SCADA devices");
         const json = await response.json();
@@ -202,7 +202,8 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
           name: feature.get("id") || feature.getId(),
           transmission_frequency: feature.get("transmission_frequency"),
           reliability: feature.get("reliability"),
-          type: feature.get("type") === "pipe_flow" ? "流量" : "压力",
+          type:
+            feature.get("device_type") === "pipe_flow" ? "流量" : "压力",
           status: STATUS_OPTIONS[Math.floor(Math.random() * 4)],
           coordinates: (feature.getGeometry() as Point)?.getCoordinates() as [
             number,
@@ -488,7 +489,7 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
       const layer = feature?.getId()?.toString().split(".")[0];
 
       if (!feature) return;
-      if (layer !== "geo_scada_mat" && layer !== "geo_scada") {
+      if (layer !== "scada_devices") {
         open?.({
           type: "error",
           message: "请选择 SCADA 设备。",

src/components/olmap/common/PanelEmptyState.test.tsx

@@ -36,11 +36,15 @@ describe("PanelEmptyState", () => {
     render(
       <PanelEmptyState
         variant="compact"
+        horizontalAlign="start"
         title="尚未选择阀门"
         description="点击“选择阀门”，然后在地图上添加。"
       />,
     );
 
     expect(screen.getByText("尚未选择阀门")).toBeInTheDocument();
+    expect(screen.getByRole("status")).toHaveStyle({
+      justifyContent: "flex-start",
+    });
   });
 });

src/components/olmap/common/PanelEmptyState.tsx

@@ -10,6 +10,7 @@ export interface PanelEmptyStateProps {
   title: string;
   description?: string;
   variant?: "panel" | "compact";
+  horizontalAlign?: "center" | "start";
 }
 
 const PanelEmptyState = ({
@@ -17,6 +18,7 @@ const PanelEmptyState = ({
   title,
   description,
   variant = "panel",
+  horizontalAlign = "center",
 }: PanelEmptyStateProps) => {
   const compact = variant === "compact";
 
@@ -32,7 +34,8 @@ const PanelEmptyState = ({
         display: "flex",
         flexDirection: compact ? "row" : { xs: "column", sm: "row" },
         alignItems: "center",
-        justifyContent: "center",
+        justifyContent:
+          horizontalAlign === "start" ? "flex-start" : "center",
         gap: compact ? 1.5 : { xs: 1.75, sm: 2.5 },
         px: compact ? 1.5 : { xs: 2, sm: 4 },
         py: compact ? 1.25 : { xs: 4, sm: 5 },

src/components/olmap/core/Controls/Timeline.tsx

@@ -45,6 +45,7 @@ interface TimelineProps {
   timeRange?: { start: Date; end: Date };
   disableDateSelection?: boolean;
   schemeName?: string;
+  schemeRunId?: string;
   schemeType?: string;
 }
 
@@ -80,6 +81,7 @@ const Timeline: React.FC<TimelineProps> = ({
   timeRange,
   disableDateSelection = false,
   schemeName = "",
+  schemeRunId = "",
   schemeType = "burst_analysis",
 }) => {
   const data = useData();
@@ -207,6 +209,7 @@ const Timeline: React.FC<TimelineProps> = ({
       sourceType,
       target,
       schemeName,
+      schemeRunId,
       schemeType,
       signal,
     }: {
@@ -216,6 +219,7 @@ const Timeline: React.FC<TimelineProps> = ({
       sourceType: "scheme" | "realtime";
       target: "primary" | "compare";
       schemeName?: string;
+      schemeRunId?: string;
       schemeType?: string;
       signal?: AbortSignal;
     }) => {
@@ -232,16 +236,16 @@ const Timeline: React.FC<TimelineProps> = ({
           junctionProperties,
           sourceType,
           "node",
-          schemeName || "",
+          schemeRunId || schemeName || "",
           schemeType || ""
         );
         if (nodeCacheRef.current.has(nodeCacheKey)) {
           nodeRecords = nodeCacheRef.current.get(nodeCacheKey)!;
         } else {
           nodePromise =
-            sourceType === "scheme" && schemeName
+            sourceType === "scheme" && schemeRunId
               ? apiFetch(
-                  `${config.BACKEND_URL}/api/v1/timeseries/schemes/records?scheme_type=${schemeType}&scheme_name=${schemeName}&query_time=${query_time}&type=node&property=${junctionProperties}`,
+                  `${config.BACKEND_URL}/api/v1/timeseries/analysis/runs/${encodeURIComponent(schemeRunId)}/values?result_time=${encodeURIComponent(query_time)}&element_type=node&field=${encodeURIComponent(junctionProperties)}`,
                   { signal },
                 )
               : apiFetch(
@@ -261,16 +265,16 @@ const Timeline: React.FC<TimelineProps> = ({
           normalizedPipeProperties,
           sourceType,
           "link",
-          schemeName || "",
+          schemeRunId || schemeName || "",
           schemeType || ""
         );
         if (linkCacheRef.current.has(linkCacheKey)) {
           linkRecords = linkCacheRef.current.get(linkCacheKey)!;
         } else {
           linkPromise =
-            sourceType === "scheme" && schemeName
+            sourceType === "scheme" && schemeRunId
               ? apiFetch(
-                  `${config.BACKEND_URL}/api/v1/timeseries/schemes/records?scheme_type=${schemeType}&scheme_name=${schemeName}&query_time=${query_time}&type=link&property=${normalizedPipeProperties}`,
+                  `${config.BACKEND_URL}/api/v1/timeseries/analysis/runs/${encodeURIComponent(schemeRunId)}/values?result_time=${encodeURIComponent(query_time)}&element_type=link&field=${encodeURIComponent(normalizedPipeProperties)}`,
                   { signal },
                 )
               : apiFetch(
@@ -288,14 +292,22 @@ const Timeline: React.FC<TimelineProps> = ({
         if (!nodeResponse.ok) {
           throw new Error(`Node fetch failed: ${nodeResponse.status}`);
         }
-        nodeRecords = await nodeResponse.json();
+        const payload = await nodeResponse.json();
+        nodeRecords = sourceType === "scheme"
+          ? {
+              results: Object.entries(payload ?? {}).map(([ID, value]) => ({
+                ID,
+                value,
+              })),
+            }
+          : payload;
         nodeCacheRef.current.set(
           buildCacheKey(
             query_time,
             junctionProperties,
             sourceType,
             "node",
-            schemeName || "",
+            schemeRunId || schemeName || "",
             schemeType || ""
           ),
           nodeRecords || []
@@ -307,14 +319,22 @@ const Timeline: React.FC<TimelineProps> = ({
         if (!linkResponse.ok) {
           throw new Error(`Link fetch failed: ${linkResponse.status}`);
         }
-        linkRecords = await linkResponse.json();
+        const payload = await linkResponse.json();
+        linkRecords = sourceType === "scheme"
+          ? {
+              results: Object.entries(payload ?? {}).map(([ID, value]) => ({
+                ID,
+                value,
+              })),
+            }
+          : payload;
         linkCacheRef.current.set(
           buildCacheKey(
             query_time,
             normalizedPipeProperties,
             sourceType,
             "link",
-            schemeName || "",
+            schemeRunId || schemeName || "",
             schemeType || ""
           ),
           linkRecords || []
@@ -336,6 +356,7 @@ const Timeline: React.FC<TimelineProps> = ({
       junctionProperties: string,
       pipeProperties: string,
       schemeName: string,
+      schemeRunId: string,
       schemeType: string
     ) => {
       const revision = frameRequestRevisionRef.current + 1;
@@ -344,7 +365,7 @@ const Timeline: React.FC<TimelineProps> = ({
       const abortController = new AbortController();
       frameAbortControllerRef.current = abortController;
       const primarySourceType =
-        disableDateSelection && schemeName ? "scheme" : "realtime";
+        disableDateSelection && schemeRunId ? "scheme" : "realtime";
       const tasks = [
         fetchDataBySource({
           queryTime,
@@ -353,12 +374,13 @@ const Timeline: React.FC<TimelineProps> = ({
           sourceType: primarySourceType,
           target: "primary",
           schemeName,
+          schemeRunId,
           schemeType,
           signal: abortController.signal,
         }),
       ];
 
-      if (isCompareMode && disableDateSelection && schemeName) {
+      if (isCompareMode && disableDateSelection && schemeRunId) {
         tasks.push(
           fetchDataBySource({
             queryTime,
@@ -600,6 +622,7 @@ const Timeline: React.FC<TimelineProps> = ({
         junctionText,
         pipeText,
         schemeName,
+        schemeRunId,
         schemeType,
       );
     }
@@ -612,6 +635,7 @@ const Timeline: React.FC<TimelineProps> = ({
     timelineCurrentTime,
     selectedDate,
     schemeName,
+    schemeRunId,
     schemeType,
   ]);
 
@@ -687,6 +711,7 @@ const Timeline: React.FC<TimelineProps> = ({
       junctionText,
       pipeText,
       schemeName,
+      schemeRunId,
       schemeType,
     );
   };

src/components/olmap/core/Controls/Toolbar.tsx

@@ -22,13 +22,22 @@ import { useNotification } from "@refinedev/core";
 import ToolbarHistoryPanel from "./ToolbarHistoryPanel";
 import {
   buildFeatureProperties,
+  getSimulationElementType,
+  getValvePropertySource,
 } from "./toolbarFeatureHelpers";
 import { useToolbarChatActions } from "./useToolbarChatActions";
 import { useStyleEditor } from "./useStyleEditor";
+import {
+  type LinkStatus,
+  isLinkStatus,
+  normalizeValveSetting,
+  validateValveSetting,
+} from "./valveControl";
 
 import { config, NETWORK_NAME } from "@/config/config";
 import { useProject } from "@/contexts/ProjectContext";
 import { apiFetch } from "@/lib/apiFetch";
+import { getAnalysisScheme } from "@/lib/analysisRuns";
 import { permissionCodes } from "@/lib/permissions";
 import { useAccessStore } from "@/store/accessStore";
 
@@ -41,51 +50,24 @@ interface ToolbarProps {
   enableCompare?: boolean;
 }
 
-type LinkStatus = "OPEN" | "CLOSED" | "ACTIVE";
 type ValveProperties = {
   vType: string | null;
   setting: string | null;
 };
 
-const isValveLayer = (layerId: string | undefined) =>
+type SchemeValveControl = {
-  layerId === "geo_valves_mat" || layerId === "geo_valves";
+  status?: string;
-
+  setting?: string | number;
-const isLinkStatus = (value: unknown): value is LinkStatus =>
+  k?: number;
-  value === "OPEN" || value === "CLOSED" || value === "ACTIVE";
-
-const normalizeValveSetting = (value: unknown): string | null => {
-  if (value === undefined || value === null) return null;
-  return String(value);
 };
 
-const validateValveSetting = (
+type ActiveSchemeDetail = {
-  valveType: string | null,
+  valve_control?: Record<string, SchemeValveControl> | null;
-  value: string,
+  valve_opening?: Record<string, number> | null;
-): string | null => {
-  const normalizedType = valveType?.toUpperCase();
-  const trimmedValue = value.trim();
-  const numericTypes = new Set(["PRV", "PSV", "PBV", "FCV", "TCV"]);
-
-  if (normalizedType === "GPV") {
-    return trimmedValue ? null : "GPV 阀门设置值必须是非空曲线 ID。";
-  }
-
-  if (numericTypes.has(normalizedType ?? "")) {
-    if (!trimmedValue) {
-      return "阀门设置值必须是 0 或正数。";
-    }
-
-    const numericValue = Number(trimmedValue);
-    if (!Number.isFinite(numericValue) || numericValue < 0) {
-      return "阀门设置值必须是有限数字，且大于或等于 0。";
-    }
-
-    return null;
-  }
-
-  return trimmedValue ? null : "阀门设置值不能为空。";
 };
 
+const isValveLayer = (layerId: string | undefined) => layerId === "valves";
+
 const Toolbar: React.FC<ToolbarProps> = ({
   hiddenButtons,
   queryType,
@@ -111,11 +93,12 @@ const Toolbar: React.FC<ToolbarProps> = ({
   const currentTime = data?.currentTime;
   const selectedDate = data?.selectedDate;
   const schemeName = data?.schemeName;
+  const schemeRunId = data?.schemeRunId;
   const networkName = project?.networkName || NETWORK_NAME;
   const isCompareMode = data?.isCompareMode ?? false;
   const toggleCompareMode = data?.toggleCompareMode;
   const canToggleCompare = Boolean(
-    enableCompare && (isCompareMode || (queryType === "scheme" && schemeName)),
+    enableCompare && (isCompareMode || (queryType === "scheme" && schemeRunId)),
   );
 
   useEffect(() => {
@@ -400,6 +383,8 @@ const Toolbar: React.FC<ToolbarProps> = ({
   const [isValvePropertiesLoading, setIsValvePropertiesLoading] =
     useState(false);
   const [isValveSettingSaving, setIsValveSettingSaving] = useState(false);
+  const [activeSchemeDetail, setActiveSchemeDetail] =
+    useState<ActiveSchemeDetail | null>(null);
 
   const selectedFeature = highlightFeatures[0];
   const selectedFeatureLayer = selectedFeature
@@ -415,9 +400,49 @@ const Toolbar: React.FC<ToolbarProps> = ({
     showPropertyPanel && isValveLayer(selectedFeatureLayer) && selectedFeatureId
       ? String(selectedFeatureId)
       : null;
+  const isSimulationDataActive =
+    getValvePropertySource(queryType, schemeName) === "simulation";
 
   useEffect(() => {
-    if (!selectedValveId) {
+    if (
+      queryType !== "scheme" ||
+      schemeType !== "flushing_analysis" ||
+      !schemeRunId ||
+      !selectedValveId
+    ) {
+      setActiveSchemeDetail(null);
+      return;
+    }
+
+    setActiveSchemeDetail(null);
+    let cancelled = false;
+
+    const querySchemeDetail = async () => {
+      try {
+        const payload = await getAnalysisScheme(schemeRunId);
+        if (!cancelled) {
+          setActiveSchemeDetail(payload?.scheme_detail ?? null);
+        }
+      } catch (error) {
+        console.error("Error querying scheme valve settings:", error);
+        if (!cancelled) {
+          setActiveSchemeDetail(null);
+          open?.({
+            type: "error",
+            message: "读取方案阀门设置失败。",
+          });
+        }
+      }
+    };
+
+    void querySchemeDetail();
+    return () => {
+      cancelled = true;
+    };
+  }, [open, queryType, schemeRunId, schemeType, selectedValveId]);
+
+  useEffect(() => {
+    if (!selectedValveId || isSimulationDataActive) {
       setValveStatus(null);
       setIsValveStatusLoading(false);
       return;
@@ -466,10 +491,10 @@ const Toolbar: React.FC<ToolbarProps> = ({
     return () => {
       cancelled = true;
     };
-  }, [networkName, open, selectedValveId]);
+  }, [isSimulationDataActive, networkName, open, selectedValveId]);
 
   useEffect(() => {
-    if (!selectedValveId) {
+    if (!selectedValveId || isSimulationDataActive) {
       setValveProperties({ vType: null, setting: null });
       setIsValvePropertiesLoading(false);
       return;
@@ -521,7 +546,7 @@ const Toolbar: React.FC<ToolbarProps> = ({
     return () => {
       cancelled = true;
     };
-  }, [networkName, open, selectedValveId]);
+  }, [isSimulationDataActive, networkName, open, selectedValveId]);
 
   const handleValveStatusSave = useCallback(
     async (nextStatus: string) => {
@@ -642,7 +667,14 @@ const Toolbar: React.FC<ToolbarProps> = ({
 
   // 添加 useEffect 来查询计算属性
   useEffect(() => {
-    if (highlightFeatures.length === 0 || !selectedDate || !showPropertyPanel) {
+    const canQuerySimulation =
+      getValvePropertySource(queryType, schemeName) === "simulation";
+    if (
+      highlightFeatures.length === 0 ||
+      !selectedDate ||
+      !showPropertyPanel ||
+      !canQuerySimulation
+    ) {
       setComputedProperties({});
       return;
     }
@@ -654,11 +686,12 @@ const Toolbar: React.FC<ToolbarProps> = ({
       return;
     }
 
+    let cancelled = false;
+    setComputedProperties({});
+
     const queryComputedProperties = async () => {
       try {
-        const properties = highlightFeature?.getProperties?.() || {};
+        const type = getSimulationElementType(highlightFeature);
-        const type =
-          properties.geometry?.getType?.() === "LineString" ? "link" : "node";
         // selectedDate 格式化为 YYYY-MM-DD
         let dateObj: Date;
         if (selectedDate instanceof Date) {
@@ -670,56 +703,131 @@ const Toolbar: React.FC<ToolbarProps> = ({
         dateObj.setHours(Math.floor(minutes / 60), minutes % 60, 0, 0);
         // 转为 UTC ISO 字符串
         const querytime = dateObj.toISOString(); // 例如 "2025-09-16T16:30:00.000Z"
-        let response;
         if (queryType === "scheme") {
-          response = await apiFetch(
+          if (!schemeRunId) {
-            // `${config.BACKEND_URL}/queryschemesimulationrecordsbyidtime/?scheme_name=${schemeName}&id=${id}&querytime=${querytime}&type=${type}`
+            throw new Error("Analysis run ID is missing");
-            `${config.BACKEND_URL}/api/v1/timeseries/schemes/simulation-results?scheme_type=${schemeType}&scheme_name=${schemeName}&id=${id}&type=${type}&query_time=${querytime}`,
-          );
-        } else {
-          response = await apiFetch(
-            // `${config.BACKEND_URL}/querysimulationrecordsbyidtime/?id=${id}&querytime=${querytime}&type=${type}`
-            `${config.BACKEND_URL}/api/v1/timeseries/realtime/simulation-results?id=${id}&type=${type}&query_time=${querytime}`,
-          );
           }
+          const fields = type === "node"
+            ? ["actual_demand", "total_head", "pressure", "quality"]
+            : [
+                "flow",
+                "friction",
+                "headloss",
+                "quality",
+                "reaction",
+                "setting",
+                "status",
+                "velocity",
+              ];
+          const values = await Promise.all(
+            fields.map(async (field) => {
+              const params = new URLSearchParams({
+                result_time: querytime,
+                element_type: type,
+                field,
+              });
+              const response = await apiFetch(
+                `${config.BACKEND_URL}/api/v1/timeseries/analysis/runs/${encodeURIComponent(schemeRunId)}/values?${params.toString()}`,
+              );
               if (!response.ok) {
-          throw new Error("API request failed");
+                throw new Error(`Analysis value fetch failed: ${response.status}`);
               }
+              const payload = await response.json();
+              return [field, payload?.[String(id)]] as const;
+            }),
+          );
+          if (!cancelled) {
+            setComputedProperties(
+              Object.fromEntries(values.filter(([, value]) => value !== undefined)),
+            );
+          }
+          return;
+        }
+
+        const params = new URLSearchParams({
+          id: String(id),
+          type,
+          query_time: querytime,
+        });
+        const response = await apiFetch(
+          `${config.BACKEND_URL}/api/v1/timeseries/realtime/simulation-results?${params.toString()}`,
+        );
+        if (!response.ok) throw new Error("API request failed");
         const data = await response.json();
-        if (!data.result || data.result.length === 0) {
+        if (cancelled) return;
-          setComputedProperties({});
+        setComputedProperties(data.result?.[0] || {});
-        } else {
-          setComputedProperties(data.result[0] || {});
-          // console.log("查询到的计算属性：", data.result[0]);
-        }
       } catch (error) {
         console.error("Error querying computed properties:", error);
+        if (!cancelled) {
           setComputedProperties({});
+          open?.({
+            type: "error",
+            message: "读取模拟属性失败，请检查方案、时间和数据源。",
+          });
+        }
       }
     };
     // 仅当 currentTime 有效时查询
-    if (currentTime !== -1 && queryType) queryComputedProperties();
+    if (currentTime !== -1 && queryType) void queryComputedProperties();
-  }, [highlightFeatures, currentTime, selectedDate, queryType, schemeName, schemeType, showPropertyPanel]);
+    return () => {
+      cancelled = true;
+    };
+  }, [highlightFeatures, currentTime, open, selectedDate, queryType, schemeName, schemeRunId, showPropertyPanel]);
+
+  const displayedComputedProperties = useMemo(() => {
+    if (!isSimulationDataActive || !selectedValveId) {
+      return computedProperties;
+    }
+
+    const control = activeSchemeDetail?.valve_control?.[selectedValveId];
+    const legacyOpening = activeSchemeDetail?.valve_opening?.[selectedValveId];
+    return {
+      ...computedProperties,
+      ...(control?.status !== undefined
+        ? { scheme_status: control.status }
+        : {}),
+      ...(control
+        ? {
+            scheme_setting:
+              control.status === "OPEN" || control.status === "CLOSED"
+                ? "不适用"
+                : (control.setting ?? "未设置"),
+          }
+        : {}),
+      ...(control?.k !== undefined
+        ? { scheme_opening: control.k }
+        : legacyOpening !== undefined
+          ? { scheme_opening: legacyOpening }
+          : {}),
+    };
+  }, [
+    activeSchemeDetail,
+    computedProperties,
+    isSimulationDataActive,
+    selectedValveId,
+  ]);
 
   const propertyPanelData = useMemo(
     () =>
       buildFeatureProperties(
         selectedFeature,
-        computedProperties,
+        displayedComputedProperties,
-        canEditNetwork && selectedValveId
+        !isSimulationDataActive && selectedValveId
           ? {
               value: valveStatus,
               loading: isValveStatusLoading,
               saving: isValveStatusSaving,
+              disabled: !canEditNetwork,
               onSave: handleValveStatusSave,
             }
           : undefined,
-        canEditNetwork && selectedValveId
+        !isSimulationDataActive && selectedValveId
           ? {
               value: valveProperties.setting,
               vType: selectedValveType,
               loading: isValvePropertiesLoading,
               saving: isValveSettingSaving,
+              disabled: !canEditNetwork,
               status: valveStatus,
               onSave: handleValveSettingSave,
             }
@@ -727,7 +835,8 @@ const Toolbar: React.FC<ToolbarProps> = ({
       ),
     [
       selectedFeature,
-      computedProperties,
+      displayedComputedProperties,
+      isSimulationDataActive,
       canEditNetwork,
       selectedValveId,
       valveStatus,

src/components/olmap/core/Controls/toolbarFeatureHelpers.test.ts

@@ -0,0 +1,221 @@
+jest.mock("ol/Feature", () => ({
+  __esModule: true,
+  default: class Feature {},
+}));
+
+import type Feature from "ol/Feature";
+
+import {
+  buildFeatureProperties,
+  formatValveControlSummary,
+  getSimulationElementType,
+  getValvePropertySource,
+} from "./toolbarFeatureHelpers";
+
+const createValveFeature = () => {
+  const properties = {
+    id: "V1",
+    node1: "J1",
+    node2: "J2",
+    diameter: 200,
+    v_type: "PRV",
+    minor_loss: 0,
+  };
+  return {
+    getId: () => "valves.V1",
+    getProperties: () => properties,
+  } as unknown as Feature;
+};
+
+const createFeature = (
+  layer: string,
+  id: string,
+  properties: Record<string, unknown>,
+) =>
+  ({
+    getId: () => `${layer}.${id}`,
+    getProperties: () => ({ id, ...properties }),
+  }) as unknown as Feature;
+
+describe("buildFeatureProperties valve simulation values", () => {
+  it("shows TimescaleDB status and setting for a simulated valve", () => {
+    const result = buildFeatureProperties(createValveFeature(), {
+      status: 2,
+      setting: 2.5,
+    });
+
+    expect(result.properties).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ label: "模拟开关状态", value: "激活" }),
+        expect.objectContaining({ label: "模拟设置值", value: 2.5 }),
+      ]),
+    );
+  });
+
+  it("keeps the other TimescaleDB link results for a simulated valve", () => {
+    const result = buildFeatureProperties(createValveFeature(), {
+      flow: 10,
+      pressure: 999,
+      status: 1,
+      setting: 2.5,
+      velocity: 0.75,
+    });
+
+    expect(result.properties).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ label: "流量", value: "36.000" }),
+        expect.objectContaining({ label: "流速", value: "0.750" }),
+      ]),
+    );
+    expect(result.properties).not.toEqual(
+      expect.arrayContaining([expect.objectContaining({ label: "压力" })]),
+    );
+  });
+
+  it("shows the selected scheme control next to TimescaleDB values", () => {
+    const result = buildFeatureProperties(createValveFeature(), {
+      status: 1,
+      setting: 0,
+      scheme_status: "CLOSED",
+      scheme_setting: "不适用",
+    });
+
+    expect(result.properties).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ label: "模拟开关状态", value: "开启" }),
+        expect.objectContaining({ label: "方案设置状态", value: "关闭" }),
+        expect.objectContaining({ label: "方案设置值", value: "不适用" }),
+      ]),
+    );
+  });
+
+  it("keeps PostgreSQL valve controls when simulation values are absent", () => {
+    const onStatusSave = jest.fn(async () => undefined);
+    const onSettingSave = jest.fn(async () => undefined);
+    const result = buildFeatureProperties(
+      createValveFeature(),
+      {},
+      { value: "ACTIVE", onSave: onStatusSave },
+      {
+        value: "2.5",
+        vType: "PRV",
+        status: "ACTIVE",
+        onSave: onSettingSave,
+      },
+    );
+
+    expect(result.properties).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: "select",
+          label: "开关状态",
+          value: "ACTIVE",
+        }),
+        expect.objectContaining({
+          type: "text",
+          label: "阀门设置值",
+          value: "2.5",
+        }),
+      ]),
+    );
+    expect(result.properties).not.toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ label: "模拟开关状态" }),
+      ]),
+    );
+  });
+});
+
+describe("getValvePropertySource", () => {
+  it("uses business PostgreSQL until simulation data is opened", () => {
+    expect(getValvePropertySource(undefined, undefined)).toBe("business");
+    expect(getValvePropertySource("scheme", "")).toBe("business");
+    expect(getValvePropertySource("scheme", "flush_260817_153045123")).toBe(
+      "simulation",
+    );
+    expect(getValvePropertySource("realtime", undefined)).toBe("simulation");
+  });
+});
+
+describe("formatValveControlSummary", () => {
+  it.each(["OPEN", "CLOSED"])(
+    "marks the setting as not applicable when status is %s",
+    (status) => {
+      expect(
+        formatValveControlSummary("V1", { status, setting: 2.5 }),
+      ).toBe(`V1: ${status === "OPEN" ? "开启" : "关闭"} / 不适用`);
+    },
+  );
+
+  it("keeps the setting for an active valve", () => {
+    expect(
+      formatValveControlSummary("V1", { status: "ACTIVE", setting: 2.5 }),
+    ).toBe("V1: 激活 / 2.5");
+  });
+});
+
+describe("getSimulationElementType", () => {
+  it("treats a point-rendered valve as a hydraulic link", () => {
+    expect(getSimulationElementType(createValveFeature())).toBe("link");
+  });
+
+  it("keeps point-rendered pumps on the same hydraulic-link path", () => {
+    const pump = {
+      getId: () => "pumps.P1",
+      getProperties: () => ({
+        id: "P1",
+        geometry: { getType: () => "Point" },
+      }),
+    } as unknown as Feature;
+
+    expect(getSimulationElementType(pump)).toBe("link");
+  });
+});
+
+describe("buildFeatureProperties simulation values by hydraulic type", () => {
+  it("shows link simulation results for a point-rendered pump", () => {
+    const pump = createFeature("pumps", "P1", {
+      node1: "J1",
+      node2: "J2",
+      geometry: { getType: () => "Point" },
+    });
+
+    const result = buildFeatureProperties(pump, {
+      flow: 10,
+      status: 1,
+      velocity: 0.75,
+    });
+
+    expect(result.properties).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ label: "流量", value: "36.000" }),
+        expect.objectContaining({ label: "状态", value: "1.000" }),
+        expect.objectContaining({ label: "流速", value: "0.750" }),
+      ]),
+    );
+  });
+
+  it.each([
+    ["tanks", "T1", "水池"],
+    ["reservoirs", "R1", "水库"],
+  ])("shows node simulation results for %s", (layer, id, type) => {
+    const feature = createFeature(layer, id, {
+      geometry: { getType: () => "Point" },
+    });
+
+    const result = buildFeatureProperties(feature, {
+      actual_demand: 5,
+      total_head: 42,
+      pressure: 18,
+    });
+
+    expect(result.type).toBe(type);
+    expect(result.properties).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ label: "实际需水量", value: "18.000" }),
+        expect.objectContaining({ label: "水头", value: "42.000" }),
+        expect.objectContaining({ label: "压力", value: "18.000" }),
+      ]),
+    );
+  });
+});

src/components/olmap/core/Controls/toolbarFeatureHelpers.ts

@@ -1,6 +1,10 @@
 import Feature from "ol/Feature";
 
 import { FLOW_DISPLAY_UNIT, toM3h } from "@utils/units";
+import {
+  getValveSettingHelperText,
+  VALVE_STATUS_OPTIONS,
+} from "./valveControl";
 
 type ToolbarBaseProperty = {
   label: string;
@@ -54,6 +58,7 @@ export type ValveStatusPropertyOptions = {
   value: string | null;
   loading?: boolean;
   saving?: boolean;
+  disabled?: boolean;
   onSave: (value: string) => Promise<void>;
 };
 
@@ -62,32 +67,71 @@ export type ValveSettingPropertyOptions = {
   vType: string | null;
   loading?: boolean;
   saving?: boolean;
+  disabled?: boolean;
   status?: string | null;
   onSave: (value: string) => Promise<void>;
 };
 
-const getValveSettingHelperText = (
+export const getValvePropertySource = (
-  vType: string | null,
+  queryType: string | undefined,
-  status?: string | null,
+  schemeName: string | undefined,
-) => {
+): "business" | "simulation" =>
-  if (status === "OPEN" || status === "CLOSED") {
+  queryType === "realtime" || (queryType === "scheme" && Boolean(schemeName))
-    return "开启/关闭状态下 EPANET 会忽略阀门设置值";
+    ? "simulation"
+    : "business";
+
+export const getSimulationElementType = (
+  feature: Feature,
+): "link" | "node" => {
+  const layerId = feature.getId()?.toString().split(".")[0] ?? "";
+  if (
+    layerId.includes("pipe") ||
+    layerId.includes("pump") ||
+    layerId.includes("valve")
+  ) {
+    return "link";
+  }
+  return feature.getProperties().geometry?.getType?.() === "LineString"
+    ? "link"
+    : "node";
+};
+
+const formatValveStatus = (value: unknown): string => {
+  if (typeof value === "string") {
+    const normalized = value.toUpperCase();
+    const option = VALVE_STATUS_OPTIONS.find(
+      (candidate) => candidate.value === normalized,
+    );
+    if (option) return option.label;
   }
 
-  switch (vType?.toUpperCase()) {
+  const numericStatus = Number(value);
-    case "PRV":
+  if (Number.isFinite(numericStatus)) {
-    case "PSV":
+    if (numericStatus === 0) return "关闭";
-    case "PBV":
+    if (numericStatus === 1) return "开启";
-      return "压力设置值，需为 0 或正数";
+    if (numericStatus === 2) return "激活";
-    case "FCV":
-      return "流量设置值，需为 0 或正数";
-    case "TCV":
-      return "损失系数，需为 0 或正数";
-    case "GPV":
-      return "水头损失曲线 ID";
-    default:
-      return "阀门类型相关设置值";
   }
+
+  return value === null || value === undefined || value === ""
+    ? "未返回"
+    : String(value);
+};
+
+const displayValue = (value: unknown): string | number =>
+  typeof value === "string" || typeof value === "number"
+    ? value
+    : "未设置";
+
+export const formatValveControlSummary = (
+  id: string,
+  control: { status?: string; setting?: unknown },
+): string => {
+  const normalizedStatus = control.status?.toUpperCase();
+  const setting =
+    normalizedStatus === "OPEN" || normalizedStatus === "CLOSED"
+      ? "不适用"
+      : displayValue(control.setting);
+  return `${id}: ${formatValveStatus(control.status)} / ${setting}`;
 };
 
 const getFeatureHistoryType = (feature: Feature): string | null => {
@@ -147,13 +191,58 @@ export const buildFeatureProperties = (
     { key: "quality", label: "水质", unit: "mg/L" },
   ];
 
-  if (layer === "geo_pipes_mat" || layer === "geo_pipes") {
+  const appendLinkComputedProperties = (
+    result: ToolbarPropertyPanelData,
+    excludedKeys: string[] = [],
+  ) => {
+    pipeComputedFields.forEach(({ key, label, unit }) => {
+      if (excludedKeys.includes(key)) return;
+
+      let value = computedProperties[key];
+      if (key === "flow" && value !== undefined) {
+        value = toM3h(value, "lps");
+      }
+      if (
+        key === "unit_headloss" &&
+        value === undefined &&
+        computedProperties.headloss !== undefined &&
+        properties.length
+      ) {
+        value = (computedProperties.headloss / properties.length) * 1000;
+      }
+      if (value !== undefined) {
+        result.properties?.push({
+          label,
+          value: typeof value === "number" ? value.toFixed(3) : value,
+          unit,
+        });
+      }
+    });
+  };
+
+  const appendNodeComputedProperties = (result: ToolbarPropertyPanelData) => {
+    nodeComputedFields.forEach(({ key, label, unit }) => {
+      if (computedProperties[key] === undefined) return;
+
+      let value = computedProperties[key];
+      if (key === "actual_demand") {
+        value = toM3h(value, "lps");
+      }
+      result.properties?.push({
+        label,
+        value: typeof value === "number" ? value.toFixed(3) : value,
+        unit,
+      });
+    });
+  };
+
+  if (layer === "pipes") {
     const result: ToolbarPropertyPanelData = {
       id: properties.id,
       type: "管道",
       properties: [
-        { label: "起始节点ID", value: properties.node1 },
+        { label: "起始节点ID", value: properties.start_node_id },
-        { label: "终点节点ID", value: properties.node2 },
+        { label: "终点节点ID", value: properties.end_node_id },
         { label: "长度", value: properties.length?.toFixed?.(1), unit: "m" },
         {
           label: "管径",
@@ -166,35 +255,12 @@ export const buildFeatureProperties = (
       ],
     };
 
-    pipeComputedFields.forEach(({ key, label, unit }) => {
+    appendLinkComputedProperties(result);
-      let value = computedProperties[key];
-
-      if (key === "flow" && value !== undefined) {
-        value = toM3h(value, "lps");
-      }
-
-      if (
-        key === "unit_headloss" &&
-        value === undefined &&
-        computedProperties.headloss !== undefined &&
-        properties.length
-      ) {
-        value = (computedProperties.headloss / properties.length) * 1000;
-      }
-
-      if (value !== undefined) {
-        result.properties?.push({
-          label,
-          value: typeof value === "number" ? value.toFixed(3) : value,
-          unit,
-        });
-      }
-    });
 
     return result;
   }
 
-  if (layer === "geo_junctions_mat" || layer === "geo_junctions") {
+  if (layer === "junctions") {
     const result: ToolbarPropertyPanelData = {
       id: properties.id,
       type: "节点",
@@ -205,50 +271,26 @@ export const buildFeatureProperties = (
           unit: "m",
         },
         {
-          type: "table",
           label: "基本需水量",
-          columns: ["demand", "pattern"],
+          value: Number.isFinite(Number(properties.base_demand))
-          rows: Array.from({ length: 5 }, (_, i) => i + 1)
+            ? toM3h(Number(properties.base_demand), "lps").toFixed(3)
-            .map((idx) => {
+            : properties.base_demand,
-              let demand = properties?.[`demand${idx}`];
+          unit: "m³/h",
-              const pattern = properties?.[`pattern${idx}`];
+        },
-              if (
+        {
-                demand !== undefined &&
+          label: "需水配置",
-                demand !== null &&
+          value: properties.demands,
-                demand !== ""
-              ) {
-                demand = toM3h(Number(demand), "lps");
-                return [
-                  typeof demand === "number" ? demand.toFixed(3) : demand,
-                  pattern ?? "-",
-                ];
-              }
-              return null;
-            })
-            .filter(Boolean) as (string | number)[][],
         },
       ],
     };
 
-    nodeComputedFields.forEach(({ key, label, unit }) => {
+    appendNodeComputedProperties(result);
-      if (computedProperties[key] !== undefined) {
-        let value = computedProperties[key];
-        if (key === "actual_demand") {
-          value = toM3h(value, "lps");
-        }
-        result.properties?.push({
-          label,
-          value: value?.toFixed?.(3) || value,
-          unit,
-        });
-      }
-    });
 
     return result;
   }
 
-  if (layer === "geo_tanks_mat" || layer === "geo_tanks") {
+  if (layer === "tanks") {
-    return {
+    const result: ToolbarPropertyPanelData = {
       id: properties.id,
       type: "水池",
       properties: [
@@ -259,17 +301,17 @@ export const buildFeatureProperties = (
         },
         {
           label: "初始水位",
-          value: properties.init_level?.toFixed?.(1),
+          value: properties.initial_level?.toFixed?.(1),
           unit: "m",
         },
         {
           label: "最低水位",
-          value: properties.min_level?.toFixed?.(1),
+          value: properties.minimum_level?.toFixed?.(1),
           unit: "m",
         },
         {
           label: "最高水位",
-          value: properties.max_level?.toFixed?.(1),
+          value: properties.maximum_level?.toFixed?.(1),
           unit: "m",
         },
         {
@@ -279,7 +321,7 @@ export const buildFeatureProperties = (
         },
         {
           label: "最小容积",
-          value: properties.min_vol?.toFixed?.(1),
+          value: properties.minimum_volume?.toFixed?.(1),
           unit: "m³",
         },
         {
@@ -288,65 +330,75 @@ export const buildFeatureProperties = (
         },
       ],
     };
+    appendNodeComputedProperties(result);
+    return result;
   }
 
-  if (layer === "geo_reservoirs_mat" || layer === "geo_reservoirs") {
+  if (layer === "reservoirs") {
-    return {
+    const result: ToolbarPropertyPanelData = {
       id: properties.id,
       type: "水库",
       properties: [
         {
-          label: "水头",
+          label: "基础水头",
           value: properties.head?.toFixed?.(1),
           unit: "m",
         },
+        { label: "模式", value: properties.pattern_id },
       ],
     };
+    appendNodeComputedProperties(result);
+    return result;
   }
 
-  if (layer === "geo_pumps_mat" || layer === "geo_pumps") {
+  if (layer === "pumps") {
-    return {
+    const result: ToolbarPropertyPanelData = {
       id: properties.id,
       type: "水泵",
       properties: [
-        { label: "起始节点 ID", value: properties.node1 },
+        { label: "起始节点 ID", value: properties.start_node_id },
-        { label: "终点节点 ID", value: properties.node2 },
+        { label: "终点节点 ID", value: properties.end_node_id },
         {
           label: "功率",
           value: properties.power?.toFixed?.(1),
           unit: "kW",
         },
         {
-          label: "扬程",
+          label: "扬程曲线",
-          value: properties.head?.toFixed?.(1),
+          value: properties.head_curve_id,
-          unit: "m",
         },
         {
           label: "转速",
           value: properties.speed?.toFixed?.(1),
-          unit: "rpm",
+          unit: "倍",
         },
         {
           label: "模式",
-          value: properties.pattern,
+          value: properties.pattern_id,
         },
       ],
     };
+    appendLinkComputedProperties(result);
+    return result;
   }
 
-  if (layer === "geo_valves_mat" || layer === "geo_valves") {
+  if (layer === "valves") {
-    const valveType = valveSetting?.vType ?? properties.v_type;
+    const valveType = valveSetting?.vType ?? properties.valve_type;
+    const hasSimulationValues =
+      Object.hasOwn(computedProperties, "status") ||
+      Object.hasOwn(computedProperties, "setting");
     const isValveSettingDisabled =
       valveSetting?.loading ||
+      valveSetting?.disabled ||
       valveSetting?.status === "OPEN" ||
       valveSetting?.status === "CLOSED";
 
-    return {
+    const result: ToolbarPropertyPanelData = {
       id: properties.id,
       type: "阀门",
       properties: [
-        { label: "起始节点 ID", value: properties.node1 },
+        { label: "起始节点 ID", value: properties.start_node_id },
-        { label: "终点节点 ID", value: properties.node2 },
+        { label: "终点节点 ID", value: properties.end_node_id },
         {
           label: "直径",
           value: properties.diameter?.toFixed?.(1),
@@ -360,25 +412,57 @@ export const buildFeatureProperties = (
           label: "局部损失",
           value: properties.minor_loss?.toFixed?.(2),
         },
-        ...(valveStatus
+        ...(hasSimulationValues
+          ? [
+              {
+                label: "模拟开关状态",
+                value: formatValveStatus(computedProperties.status),
+              },
+              {
+                label: "模拟设置值",
+                value: displayValue(computedProperties.setting),
+              },
+            ]
+          : []),
+        ...(Object.hasOwn(computedProperties, "scheme_status")
+          ? [
+              {
+                label: "方案设置状态",
+                value: formatValveStatus(computedProperties.scheme_status),
+              },
+            ]
+          : []),
+        ...(Object.hasOwn(computedProperties, "scheme_setting")
+          ? [
+              {
+                label: "方案设置值",
+                value: displayValue(computedProperties.scheme_setting),
+              },
+            ]
+          : []),
+        ...(Object.hasOwn(computedProperties, "scheme_opening")
+          ? [
+              {
+                label: "方案开度",
+                value: displayValue(computedProperties.scheme_opening),
+              },
+            ]
+          : []),
+        ...(!hasSimulationValues && valveStatus
           ? [
               {
                 type: "select" as const,
                 label: "开关状态",
                 value: valveStatus.value ?? "",
-                options: [
+                options: VALVE_STATUS_OPTIONS,
-                  { label: "开启", value: "OPEN" },
-                  { label: "关闭", value: "CLOSED" },
-                  { label: "激活", value: "ACTIVE" },
-                ],
                 placeholder: valveStatus.loading ? "加载中" : "未设置",
-                disabled: valveStatus.loading,
+                disabled: valveStatus.loading || valveStatus.disabled,
                 saving: valveStatus.saving,
                 onSave: valveStatus.onSave,
               },
             ]
           : []),
-        ...(valveSetting
+        ...(!hasSimulationValues && valveSetting
           ? [
               {
                 type: "text" as const,
@@ -397,6 +481,8 @@ export const buildFeatureProperties = (
           : []),
       ],
     };
+    appendLinkComputedProperties(result, ["setting", "status"]);
+    return result;
   }
 
   const getTransmissionFrequency = (transmissionFrequency: string) => {
@@ -421,7 +507,7 @@ export const buildFeatureProperties = (
     }
   };
 
-  if (layer === "geo_scada_mat" || layer === "geo_scada") {
+  if (layer === "scada_devices") {
     return {
       id: properties.id,
       type: "SCADA设备",
@@ -429,11 +515,13 @@ export const buildFeatureProperties = (
         {
           label: "类型",
           value:
-            properties.type === "pipe_flow" ? "流量传感器" : "压力传感器",
+            properties.device_type === "pipe_flow"
+              ? "流量传感器"
+              : "压力传感器",
         },
         {
           label: "关联节点 ID",
-          value: properties.associated_element_id,
+          value: properties.node_id ?? properties.link_id,
         },
         {
           label: "传输模式",

src/components/olmap/core/Controls/valveControl.test.ts

@@ -0,0 +1,36 @@
+import {
+  getValveSettingHelperText,
+  isLinkStatus,
+  normalizeValveSetting,
+  VALVE_STATUS_OPTIONS,
+  validateValveSetting,
+} from "./valveControl";
+
+describe("valveControl", () => {
+  it("provides the status translations shared by valve editors", () => {
+    expect(VALVE_STATUS_OPTIONS).toEqual([
+      { label: "开启", value: "OPEN" },
+      { label: "关闭", value: "CLOSED" },
+      { label: "激活", value: "ACTIVE" },
+    ]);
+    expect(isLinkStatus("ACTIVE")).toBe(true);
+    expect(isLinkStatus("UNKNOWN")).toBe(false);
+  });
+
+  it("normalizes setting values without dropping zero", () => {
+    expect(normalizeValveSetting(0)).toBe("0");
+    expect(normalizeValveSetting(null)).toBeNull();
+  });
+
+  it("validates numeric and curve settings by valve type", () => {
+    expect(validateValveSetting("PRV", "2.5")).toBeNull();
+    expect(validateValveSetting("PRV", "-1")).toContain("大于或等于 0");
+    expect(validateValveSetting("GPV", "curve-1")).toBeNull();
+    expect(validateValveSetting("GPV", " ")).toContain("曲线 ID");
+  });
+
+  it("explains that OPEN and CLOSED ignore the setting", () => {
+    expect(getValveSettingHelperText("PRV", "OPEN")).toContain("忽略");
+    expect(getValveSettingHelperText("FCV", "ACTIVE")).toContain("流量");
+  });
+});

src/components/olmap/core/Controls/valveControl.ts

@@ -0,0 +1,70 @@
+export type LinkStatus = "OPEN" | "CLOSED" | "ACTIVE";
+
+export const VALVE_STATUS_OPTIONS: Array<{
+  label: string;
+  value: LinkStatus;
+}> = [
+  { label: "开启", value: "OPEN" },
+  { label: "关闭", value: "CLOSED" },
+  { label: "激活", value: "ACTIVE" },
+];
+
+export const isLinkStatus = (value: unknown): value is LinkStatus =>
+  value === "OPEN" || value === "CLOSED" || value === "ACTIVE";
+
+export const normalizeValveSetting = (value: unknown): string | null => {
+  if (value === undefined || value === null) return null;
+  return String(value);
+};
+
+export const validateValveSetting = (
+  valveType: string | null | undefined,
+  value: string,
+): string | null => {
+  const normalizedType = valveType?.toUpperCase();
+  const trimmedValue = value.trim();
+  const numericTypes = new Set(["PRV", "PSV", "PBV", "FCV", "TCV"]);
+
+  if (normalizedType === "GPV") {
+    return trimmedValue ? null : "GPV 阀门设置值必须是非空曲线 ID。";
+  }
+
+  if (numericTypes.has(normalizedType ?? "")) {
+    if (!trimmedValue) {
+      return "阀门设置值必须是 0 或正数。";
+    }
+
+    const numericValue = Number(trimmedValue);
+    if (!Number.isFinite(numericValue) || numericValue < 0) {
+      return "阀门设置值必须是有限数字，且大于或等于 0。";
+    }
+
+    return null;
+  }
+
+  return trimmedValue ? null : "阀门设置值不能为空。";
+};
+
+export const getValveSettingHelperText = (
+  valveType: string | null | undefined,
+  status?: LinkStatus | string | null,
+) => {
+  if (status === "OPEN" || status === "CLOSED") {
+    return "开启/关闭状态下 EPANET 会忽略阀门设置值";
+  }
+
+  switch (valveType?.toUpperCase()) {
+    case "PRV":
+    case "PSV":
+    case "PBV":
+      return "压力设置值，需为 0 或正数";
+    case "FCV":
+      return "流量设置值，需为 0 或正数";
+    case "TCV":
+      return "损失系数，需为 0 或正数";
+    case "GPV":
+      return "水头损失曲线 ID";
+    default:
+      return "阀门类型相关设置值";
+  }
+};

src/components/olmap/core/MapComponent.tsx

@@ -81,6 +81,8 @@ interface DataContextType {
   selectedDate?: Date; // 选择的日期
   schemeName?: string; // 当前方案名称
   setSchemeName?: React.Dispatch<React.SetStateAction<string>>;
+  schemeRunId?: string; // 当前分析运行 ID
+  setSchemeRunId?: React.Dispatch<React.SetStateAction<string>>;
   setSelectedDate?: React.Dispatch<React.SetStateAction<Date>>;
   currentJunctionCalData?: any[]; // 当前计算结果
   setCurrentJunctionCalData?: React.Dispatch<React.SetStateAction<any[]>>;
@@ -226,6 +228,7 @@ const MapComponent: React.FC<MapComponentProps> = ({ children }) => {
   // const [selectedDate, setSelectedDate] = useState<Date>(new Date("2025-9-17"));
   const [selectedDate, setSelectedDate] = useState<Date>(new Date()); // 默认今天
   const [schemeName, setSchemeName] = useState<string>(""); // 当前方案名称
+  const [schemeRunId, setSchemeRunId] = useState<string>("");
   // 记录 id、对应属性的计算值
   const [currentJunctionCalData, setCurrentJunctionCalData] = useState<any[]>(
     [],
@@ -791,6 +794,7 @@ const MapComponent: React.FC<MapComponentProps> = ({ children }) => {
     );
     setSelectedDate(new Date());
     setSchemeName("");
+    setSchemeRunId("");
     setCurrentJunctionCalData([]);
     setCurrentPipeCalData([]);
     setCompareJunctionCalData([]);
@@ -1118,6 +1122,8 @@ const MapComponent: React.FC<MapComponentProps> = ({ children }) => {
           setSelectedDate,
           schemeName,
           setSchemeName,
+          schemeRunId,
+          setSchemeRunId,
           currentJunctionCalData,
           setCurrentJunctionCalData,
           currentPipeCalData,

src/components/olmap/core/operationalLayers.test.ts

@@ -63,6 +63,35 @@ import {
 } from "./operationalLayers";
 
 describe("operational map resources", () => {
+  it("requests the published tjwater_next layer names", () => {
+    const sources = createOperationalMapSources({
+      mapUrl: "https://maps.example.test/geoserver",
+      workspace: "tjwater_next",
+    });
+
+    expect((sources.junctions as any).options.url).toContain(
+      "tjwater_next:junctions@WebMercatorQuad@pbf",
+    );
+    expect((sources.pipes as any).options.url).toContain(
+      "tjwater_next:pipes@WebMercatorQuad@pbf",
+    );
+    expect((sources.valves as any).options.url).toContain(
+      "tjwater_next:valves@WebMercatorQuad@pbf",
+    );
+    expect((sources.reservoirs as any).options.url).toContain(
+      "typeName=tjwater_next:reservoirs",
+    );
+    expect((sources.pumps as any).options.url).toContain(
+      "typeName=tjwater_next:pumps",
+    );
+    expect((sources.tanks as any).options.url).toContain(
+      "typeName=tjwater_next:tanks",
+    );
+    expect((sources.scada as any).options.url).toContain(
+      "typeName=tjwater_next:scada_devices",
+    );
+  });
+
   it("shares sources while keeping per-map layer instances independent", () => {
     const options = {
       mapUrl: "https://maps.example.test/geoserver",

src/components/olmap/core/operationalLayers.ts

@@ -1,12 +1,9 @@
 import { config } from "@/config/config";
-import { along, lineString, length, toMercator } from "@turf/turf";
 import type { FeatureLike } from "ol/Feature";
 import MVT from "ol/format/MVT";
-import { Point } from "ol/geom";
 import type BaseLayer from "ol/layer/Base";
 import VectorLayer from "ol/layer/Vector";
 import WebGLVectorTileLayer from "ol/layer/WebGLVectorTile";
-import { toLonLat } from "ol/proj";
 import GeoJSON from "ol/format/GeoJSON";
 import VectorSource from "ol/source/Vector";
 import VectorTileSource from "ol/source/VectorTile";
@@ -49,34 +46,12 @@ const createIconStyle = (src: string, scale = 0.1) =>
 
 const scadaStyle = (feature: FeatureLike) =>
   createIconStyle(
-    feature.get("type") === "pipe_flow"
+    feature.get("device_type") === "pipe_flow"
       ? "/icons/scada_flow.svg"
       : "/icons/scada_pressure.svg",
   );
 
-const pumpStyle = (feature: FeatureLike) => {
+const pumpStyle = () => createIconStyle("/icons/pump.svg", 0.12);
-  const geometry = feature.getGeometry();
-  if (!geometry || geometry.getType() !== "LineString") return [];
-
-  const coordinates = (geometry as any)
-    .getCoordinates()
-    .map((coordinate: number[]) => toLonLat(coordinate));
-  if (coordinates.length < 2) return [];
-
-  const featureLine = lineString(coordinates);
-  const midpoint = along(featureLine, length(featureLine) / 2).geometry
-    .coordinates;
-  return [
-    new Style({
-      geometry: new Point(toMercator(midpoint)),
-      image: new Icon({
-        src: "/icons/pump.svg",
-        scale: 0.12,
-        anchor: [0.5, 0.5],
-      }),
-    }),
-  ];
-};
 
 const pointProperties = [
   { name: "高程", value: "elevation" },
@@ -110,34 +85,34 @@ export const createOperationalMapSources = ({
 
   return {
     junctions: new VectorTileSource({
-      url: vectorTileUrl("geo_junctions"),
+      url: vectorTileUrl("junctions"),
       format: new MVT(),
       projection: "EPSG:3857",
     }),
     pipes: new VectorTileSource({
-      url: vectorTileUrl("geo_pipes"),
+      url: vectorTileUrl("pipes"),
       format: new MVT(),
       projection: "EPSG:3857",
     }),
     valves: new VectorTileSource({
-      url: vectorTileUrl("geo_valves"),
+      url: vectorTileUrl("valves"),
       format: new MVT(),
       projection: "EPSG:3857",
     }),
     reservoirs: new VectorSource({
-      url: vectorUrl("geo_reservoirs"),
+      url: vectorUrl("reservoirs"),
       format: new GeoJSON(),
     }),
     pumps: new VectorSource({
-      url: vectorUrl("geo_pumps"),
+      url: vectorUrl("pumps"),
       format: new GeoJSON(),
     }),
     tanks: new VectorSource({
-      url: vectorUrl("geo_tanks"),
+      url: vectorUrl("tanks"),
       format: new GeoJSON(),
     }),
     scada: new VectorSource({
-      url: vectorUrl("geo_scada"),
+      url: vectorUrl("scada_devices"),
       format: new GeoJSON(),
     }),
   };
@@ -187,7 +162,7 @@ export const createOperationalMapResources = ({
       properties: {
         name: "阀门",
         value: "valves",
-        type: "linestring",
+        type: "point",
         properties: [],
       },
     }),
@@ -213,7 +188,7 @@ export const createOperationalMapResources = ({
       properties: {
         name: "水泵",
         value: "pumps",
-        type: "linestring",
+        type: "point",
         properties: [],
       },
     }),

src/config/config.ts

@@ -27,14 +27,14 @@ const parseMapExtent = (value: RuntimeConfig["MAP_EXTENT"]): number[] => {
     return value.split(",").map(Number);
   }
 
-  return [13508849, 3608036, 13555781, 3633813];
+  return [13508801.93, 3608163.35, 13555650.64, 3633685.14];
 };
 
 export const config = {
   BACKEND_URL: runtimeConfig.BACKEND_URL || "http://127.0.0.1:8000",
   AGENT_URL: runtimeConfig.AGENT_URL || "http://127.0.0.1:8788",
   MAP_URL: runtimeConfig.MAP_URL || "http://127.0.0.1:8080/geoserver",
-  MAP_WORKSPACE: runtimeConfig.MAP_WORKSPACE || "tjwater",
+  MAP_WORKSPACE: runtimeConfig.MAP_WORKSPACE || "tjwater_next",
   MAP_EXTENT: parseMapExtent(runtimeConfig.MAP_EXTENT),
   MAP_DEFAULT_STYLE: {
     "stroke-width": 3,
@@ -61,7 +61,7 @@ export const config = {
     "scada",
   ],
 };
-export let NETWORK_NAME = runtimeConfig.NETWORK_NAME || "tjwater";
+export let NETWORK_NAME = runtimeConfig.NETWORK_NAME || "tjwater_next";
 
 export const setNetworkName = (name: string) => {
   NETWORK_NAME = name;

src/lib/analysisRuns.test.ts

@@ -0,0 +1,96 @@
+import { api } from "@/lib/api";
+import {
+  getAnalysisResults,
+  getAnalysisScheme,
+  listAnalysisSchemes,
+} from "./analysisRuns";
+
+jest.mock("@/lib/api", () => ({
+  api: { get: jest.fn() },
+}));
+
+const get = api.get as jest.Mock;
+
+describe("analysis runs API adapter", () => {
+  beforeEach(() => get.mockReset());
+
+  it("filters runs and exposes the new run identity to scheme screens", async () => {
+    get.mockResolvedValue({
+      data: {
+        success: true,
+        count: 2,
+        data: [
+          {
+            run_id: "run-1",
+            name: "burst-a",
+            run_type: "burst_analysis",
+            created_by: "alice",
+            created_at: "2026-08-25T02:00:00Z",
+            started_at: "2026-08-25T01:00:00Z",
+            status: "completed",
+            parameters: { burst_ID: ["P-1"] },
+          },
+          {
+            run_id: "run-2",
+            name: "flush-a",
+            run_type: "flushing_analysis",
+            created_by: "bob",
+            created_at: "2026-08-24T02:00:00Z",
+            started_at: "2026-08-24T01:00:00Z",
+            status: "completed",
+            parameters: {},
+          },
+        ],
+      },
+    });
+
+    const result = await listAnalysisSchemes({
+      runType: "burst_analysis",
+      queryDate: "2026-08-25",
+    });
+
+    expect(get).toHaveBeenCalledWith("/api/v1/analysis/runs");
+    expect(result).toEqual([
+      expect.objectContaining({
+        id: "run-1",
+        scheme_id: "run-1",
+        scheme_name: "burst-a",
+        schemeDetail: { burst_ID: ["P-1"] },
+      }),
+    ]);
+  });
+
+  it("loads a run and its structured results by run id", async () => {
+    get
+      .mockResolvedValueOnce({
+        data: {
+          run_id: "run-1",
+          name: "burst-a",
+          run_type: "burst_analysis",
+          created_by: "alice",
+          created_at: "2026-08-25T02:00:00Z",
+          started_at: "2026-08-25T01:00:00Z",
+          status: "completed",
+          parameters: {},
+        },
+      })
+      .mockResolvedValueOnce({
+        data: [
+          {
+            result_id: "result-1",
+            run_id: "run-1",
+            result_type: "summary",
+            payload: { ok: true },
+            created_at: "2026-08-25T03:00:00Z",
+          },
+        ],
+      });
+
+    expect((await getAnalysisScheme("run-1")).scheme_id).toBe("run-1");
+    expect(await getAnalysisResults("run-1", "summary")).toHaveLength(1);
+    expect(get).toHaveBeenLastCalledWith(
+      "/api/v1/analysis/runs/run-1/results",
+      { params: { result_type: "summary" } },
+    );
+  });
+});

src/lib/analysisRuns.ts

@@ -0,0 +1,105 @@
+import { api } from "@/lib/api";
+
+export type AnalysisRun = {
+  run_id: string;
+  name: string;
+  run_type: string;
+  created_by: string;
+  created_at: string;
+  started_at: string;
+  status: string;
+  parameters: Record<string, unknown>;
+};
+
+export type AnalysisResult = {
+  result_id: string;
+  run_id: string;
+  result_type: string;
+  node_id?: string | null;
+  link_id?: string | null;
+  payload: Record<string, unknown>;
+  created_at: string;
+};
+
+type AnalysisRunListResponse = {
+  success: boolean;
+  data: AnalysisRun[];
+  count: number;
+};
+
+export type AnalysisSchemeRecord = AnalysisRun & {
+  id: string;
+  scheme_id: string;
+  scheme_name: string;
+  scheme_type: string;
+  username: string;
+  create_time: string;
+  scheme_start_time: string;
+  scheme_detail: Record<string, unknown>;
+  schemeName: string;
+  type: string;
+  startTime: string;
+  schemeDetail: Record<string, unknown>;
+};
+
+const normalizeParameters = (value: unknown): Record<string, unknown> =>
+  value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+
+export const toAnalysisSchemeRecord = (run: AnalysisRun): AnalysisSchemeRecord => {
+  const parameters = normalizeParameters(run.parameters);
+  return {
+    ...run,
+    parameters,
+    id: run.run_id,
+    scheme_id: run.run_id,
+    scheme_name: run.name,
+    scheme_type: run.run_type,
+    username: run.created_by,
+    create_time: run.created_at,
+    scheme_start_time: run.started_at,
+    scheme_detail: parameters,
+    schemeName: run.name,
+    type: run.run_type,
+    startTime: run.started_at,
+    schemeDetail: parameters,
+  };
+};
+
+export const listAnalysisSchemes = async ({
+  runType,
+  queryDate,
+}: {
+  runType?: string;
+  queryDate?: string;
+} = {}): Promise<AnalysisSchemeRecord[]> => {
+  const response = await api.get<AnalysisRunListResponse>(
+    "/api/v1/analysis/runs",
+  );
+  const runs = Array.isArray(response.data.data) ? response.data.data : [];
+  return runs
+    .filter((run) => !runType || run.run_type === runType)
+    .filter((run) => !queryDate || run.created_at.slice(0, 10) === queryDate)
+    .map(toAnalysisSchemeRecord);
+};
+
+export const getAnalysisScheme = async (
+  runId: string,
+): Promise<AnalysisSchemeRecord> => {
+  const response = await api.get<AnalysisRun>(
+    `/api/v1/analysis/runs/${encodeURIComponent(runId)}`,
+  );
+  return toAnalysisSchemeRecord(response.data);
+};
+
+export const getAnalysisResults = async (
+  runId: string,
+  resultType?: string,
+): Promise<AnalysisResult[]> => {
+  const response = await api.get<AnalysisResult[]>(
+    `/api/v1/analysis/runs/${encodeURIComponent(runId)}/results`,
+    { params: resultType ? { result_type: resultType } : undefined },
+  );
+  return Array.isArray(response.data) ? response.data : [];
+};

src/lib/apiError.test.ts

@@ -0,0 +1,209 @@
+import { getApiErrorMessage } from "./apiError";
+
+describe("getApiErrorMessage", () => {
+  it("uses a business detail from Problem Details", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 422,
+          data: {
+            detail: "ACTIVE 状态的阀门 V1 必须提供设置值",
+            errors: [],
+          },
+        },
+      }),
+    ).toBe("ACTIVE 状态的阀门 V1 必须提供设置值");
+  });
+
+  it("formats field-level validation errors in Chinese", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 422,
+          data: {
+            detail: "Request validation failed",
+            errors: [
+              {
+                type: "missing",
+                loc: ["query", "drainage_node_id"],
+                msg: "Field required",
+              },
+              {
+                type: "literal_error",
+                loc: ["query", "valve_statuses", 1],
+                msg: "Input should be 'OPEN', 'CLOSED' or 'ACTIVE'",
+                ctx: { expected: "'OPEN', 'CLOSED' or 'ACTIVE'" },
+              },
+            ],
+          },
+        },
+      }),
+    ).toBe(
+      "排水节点：不能为空；阀门开关状态[2]：可选值为 'OPEN', 'CLOSED' 或 'ACTIVE'",
+    );
+  });
+
+  it("supports legacy FastAPI validation details", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 422,
+          data: {
+            detail: [
+              {
+                type: "greater_than_equal",
+                loc: ["body", "sensor_count"],
+                msg: "Input should be greater than or equal to 1",
+                ctx: { ge: 1 },
+              },
+            ],
+          },
+        },
+      }),
+    ).toBe("监测点数量：必须大于或等于 1");
+  });
+
+  it("limits long validation responses while preserving the remaining count", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 422,
+          data: {
+            errors: Array.from({ length: 5 }, (_, index) => ({
+              type: "missing",
+              loc: ["body", `field_${index}`],
+              msg: "Field required",
+            })),
+          },
+        },
+      }),
+    ).toBe(
+      "field_0：不能为空；field_1：不能为空；field_2：不能为空；另有 2 项参数错误",
+    );
+  });
+
+  it("bounds hostile validation payloads before formatting", () => {
+    const message = getApiErrorMessage({
+      response: {
+        status: 422,
+        data: {
+          errors: Array.from({ length: 100_000 }, () => ({
+            type: "custom_error",
+            loc: ["body", "x".repeat(1_000)],
+            msg: "y".repeat(10_000),
+          })),
+        },
+      },
+    });
+
+    expect(message.length).toBeLessThan(600);
+    expect(message).toContain("另有 99997 项参数错误");
+  });
+
+  it("bounds validation constraint values", () => {
+    const message = getApiErrorMessage({
+      response: {
+        status: 422,
+        data: {
+          errors: [
+            {
+              type: "greater_than",
+              loc: ["body", "duration"],
+              ctx: { gt: "9".repeat(10_000) },
+            },
+          ],
+        },
+      },
+    });
+
+    expect(message.length).toBeLessThan(100);
+  });
+
+  it("distinguishes network and timeout failures", () => {
+    expect(getApiErrorMessage({ code: "ERR_NETWORK" })).toContain("无法连接服务");
+    expect(getApiErrorMessage({ code: "ECONNABORTED" })).toContain("请求超时");
+  });
+
+  it("uses a localized message and trace id for server failures", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 503,
+          data: {
+            detail: "仿真服务暂时不可用",
+            trace_id: "trace-123",
+          },
+        },
+      }),
+    ).toBe("服务暂时不可用，请稍后重试（追踪 ID：trace-123）");
+  });
+
+  it("does not expose authentication details from the response", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 401,
+          data: { detail: "Not authenticated" },
+        },
+      }),
+    ).toBe("登录状态已失效，请重新登录");
+  });
+
+  it("preserves a clear Chinese permission detail", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 403,
+          data: { detail: "当前项目角色为只读，不能创建方案" },
+        },
+      }),
+    ).toBe("当前项目角色为只读，不能创建方案");
+  });
+
+  it("localizes plain-text server failures", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 500,
+          data: "Internal Server Error",
+        },
+      }),
+    ).toBe("服务处理失败，请稍后重试");
+  });
+
+  it("does not misreport server error arrays as validation failures", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 500,
+          data: {
+            errors: [{ loc: ["body", "scheme_name"], msg: "failed" }],
+            trace_id: "trace-500",
+          },
+        },
+      }),
+    ).toBe("服务处理失败，请稍后重试（追踪 ID：trace-500）");
+  });
+
+  it("does not display HTML gateway responses", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 502,
+          data: "<!doctype html><html><body>Bad Gateway</body></html>",
+        },
+      }),
+    ).toBe("上游服务暂时不可用，请稍后重试");
+  });
+
+  it("uses a localized fallback for an unknown HTTP status", () => {
+    expect(
+      getApiErrorMessage({
+        response: {
+          status: 418,
+        },
+        message: "Request failed with status code 418",
+      }),
+    ).toBe("请求失败（HTTP 418）");
+  });
+});

src/lib/apiError.ts

@@ -0,0 +1,257 @@
+type UnknownRecord = Record<string, unknown>;
+
+type ErrorResponse = {
+  status?: number;
+  data?: unknown;
+};
+
+const FIELD_LABELS: Record<string, string> = {
+  scheme_name: "方案名称",
+  start_time: "开始时间",
+  modify_pattern_start_time: "开始时间",
+  target_time: "目标时间",
+  sampling_interval_minutes: "采样间隔",
+  duration: "持续时长",
+  modify_total_duration: "持续时长",
+  valves: "参与阀门",
+  valve_statuses: "阀门开关状态",
+  valve_settings: "阀门设置值",
+  valves_k: "阀门开度",
+  drainage_node_id: "排水节点",
+  drainage_node_ID: "排水节点",
+  burst_id: "爆管点",
+  burst_ID: "爆管点",
+  burst_size: "爆管流量",
+  burst_leakage: "爆管流量",
+  min_dpressure: "最小压降",
+  basic_pressure: "基准压力",
+  data_source: "数据来源",
+  scada_burst_start: "爆管开始时间",
+  scada_burst_end: "爆管结束时间",
+  use_scada_flow: "使用流量监测数据",
+  simulation_run_id: "模拟运行 ID",
+  source: "污染源节点",
+  concentration: "污染物浓度",
+  pattern: "污染物注入模式",
+  sensor_count: "监测点数量",
+  sensor_type: "监测点类型",
+  method: "优化方法",
+  min_diameter: "最小管径",
+  dma_count: "DMA 数量",
+  scada_start: "监测开始时间",
+  scada_end: "监测结束时间",
+  q_sum: "总漏损流量",
+  pop_size: "种群规模",
+  max_gen: "最大迭代次数",
+  flush_flow: "冲洗流量",
+};
+
+const STATUS_MESSAGES: Record<number, string> = {
+  400: "请求参数不正确",
+  401: "登录状态已失效，请重新登录",
+  403: "当前账号无权执行此操作",
+  404: "请求的数据不存在",
+  409: "当前数据已发生变化，请刷新后重试",
+  422: "请求参数校验失败",
+  429: "请求过于频繁，请稍后重试",
+  500: "服务处理失败，请稍后重试",
+  502: "上游服务暂时不可用，请稍后重试",
+  503: "服务暂时不可用，请稍后重试",
+  504: "服务响应超时，请稍后重试",
+};
+
+const asRecord = (value: unknown): UnknownRecord | null =>
+  value !== null && typeof value === "object"
+    ? (value as UnknownRecord)
+    : null;
+
+const nonEmptyString = (value: unknown): string | null =>
+  typeof value === "string" && value.trim() ? value.trim() : null;
+
+const safeServerMessage = (value: unknown): string | null => {
+  const message = nonEmptyString(value);
+  if (!message || message.length > 300) return null;
+  if (/<!doctype|<html|<body|<script|<style|<[^>]+>/i.test(message)) {
+    return null;
+  }
+  return message;
+};
+
+const boundedText = (value: unknown, maxLength: number): string | null => {
+  const text = nonEmptyString(value);
+  if (!text) return null;
+  return text.length > maxLength ? `${text.slice(0, maxLength)}…` : text;
+};
+
+const boundedConstraint = (value: unknown, fallback: string) =>
+  value === null || value === undefined
+    ? fallback
+    : (boundedText(String(value), 40) ?? fallback);
+
+const getErrorResponse = (error: unknown): ErrorResponse | null => {
+  const candidate = asRecord(error);
+  const response = asRecord(candidate?.response);
+  if (!response) return null;
+
+  return {
+    status:
+      typeof response.status === "number" ? response.status : undefined,
+    data: response.data,
+  };
+};
+
+const formatValidationLocation = (location: unknown): string => {
+  if (!Array.isArray(location)) return "请求参数";
+
+  const segments = location.slice(0, 5).filter(
+    (segment, index) =>
+      !(
+        index === 0 &&
+        ["body", "query", "path", "header"].includes(String(segment))
+      ),
+  );
+  if (segments.length === 0) return "请求参数";
+
+  return segments.reduce<string>((result, segment, index) => {
+    if (typeof segment === "number") {
+      return `${result}[${segment + 1}]`;
+    }
+    const rawSegment = String(segment);
+    const label = FIELD_LABELS[rawSegment] ?? boundedText(rawSegment, 40) ?? "参数";
+    return index === 0 ? label : `${result}.${label}`;
+  }, "");
+};
+
+const translateValidationMessage = (error: UnknownRecord): string => {
+  const type = nonEmptyString(error.type);
+  const message = nonEmptyString(error.msg);
+  const context = asRecord(error.ctx);
+
+  switch (type) {
+    case "missing":
+      return "不能为空";
+    case "literal_error": {
+      const expected = boundedText(context?.expected, 100);
+      return expected
+        ? `可选值为 ${expected.replace(/\s+or\s+/g, " 或 ")}`
+        : "取值不在允许范围内";
+    }
+    case "greater_than":
+      return `必须大于 ${boundedConstraint(context?.gt, "限定值")}`;
+    case "greater_than_equal":
+      return `必须大于或等于 ${boundedConstraint(context?.ge, "限定值")}`;
+    case "less_than":
+      return `必须小于 ${boundedConstraint(context?.lt, "限定值")}`;
+    case "less_than_equal":
+      return `必须小于或等于 ${boundedConstraint(context?.le, "限定值")}`;
+    case "int_parsing":
+      return "必须是整数";
+    case "float_parsing":
+    case "decimal_parsing":
+      return "必须是数字";
+    case "datetime_from_date_parsing":
+    case "datetime_parsing":
+      return "日期时间格式不正确";
+    case "string_too_short":
+      return `长度不能少于 ${boundedConstraint(context?.min_length, "要求的")} 个字符`;
+    case "string_too_long":
+      return `长度不能超过 ${boundedConstraint(context?.max_length, "允许的")} 个字符`;
+    default:
+      if (message === "Field required") return "不能为空";
+      if (message?.startsWith("Input should be ")) {
+        return boundedText(
+          message.replace("Input should be ", "可选值为 "),
+          120,
+        )!;
+      }
+      return boundedText(message, 120) ?? "参数无效";
+  }
+};
+
+const formatValidationErrors = (value: unknown): string | null => {
+  if (!Array.isArray(value) || value.length === 0) return null;
+
+  const messages = value
+    .slice(0, 3)
+    .map(asRecord)
+    .filter((item): item is UnknownRecord => item !== null)
+    .map(
+      (item) =>
+        `${formatValidationLocation(item.loc)}：${translateValidationMessage(item)}`,
+    );
+
+  if (messages.length === 0) return null;
+  const visibleMessages = messages.join("；");
+  const remainingCount = value.length - messages.length;
+  return remainingCount > 0
+    ? `${visibleMessages}；另有 ${remainingCount} 项参数错误`
+    : visibleMessages;
+};
+
+const appendTraceId = (message: string, traceId: string | null) =>
+  traceId ? `${message}（追踪 ID：${traceId}）` : message;
+
+export const getApiErrorMessage = (
+  error: unknown,
+  fallback = "请求失败，请稍后重试",
+): string => {
+  const candidate = asRecord(error);
+  const response = getErrorResponse(error);
+  const payload = asRecord(response?.data);
+  const status = response?.status;
+  const traceId = safeServerMessage(payload?.trace_id);
+  const isValidationResponse =
+    status === 400 ||
+    status === 422 ||
+    nonEmptyString(payload?.code) === "validation_error";
+  const validationErrors = isValidationResponse
+    ? formatValidationErrors(
+        payload?.errors ??
+          (Array.isArray(payload?.detail) ? payload.detail : null),
+      )
+    : null;
+
+  if (validationErrors) {
+    return validationErrors;
+  }
+
+  const responseText = safeServerMessage(response?.data);
+  const detail = safeServerMessage(payload?.detail);
+  const responseMessage = safeServerMessage(payload?.message);
+  const statusMessage = status ? STATUS_MESSAGES[status] : null;
+  const unknownStatusMessage = status ? `请求失败（HTTP ${status}）` : null;
+
+  if (status === 403) {
+    const permissionDetail = detail ?? responseMessage;
+    return permissionDetail && /[\u3400-\u9fff]/u.test(permissionDetail)
+      ? permissionDetail
+      : STATUS_MESSAGES[403];
+  }
+
+  if (status && (status === 401 || status >= 500)) {
+    return appendTraceId(
+      statusMessage ?? unknownStatusMessage ?? fallback,
+      status >= 500 ? traceId : null,
+    );
+  }
+
+  const message =
+    detail ?? responseMessage ?? responseText ?? statusMessage ?? unknownStatusMessage;
+
+  if (message) {
+    return message;
+  }
+
+  const code = nonEmptyString(candidate?.code);
+  if (code === "ECONNABORTED" || code === "ETIMEDOUT") {
+    return "请求超时，请稍后重试";
+  }
+  if (
+    code === "ERR_NETWORK" ||
+    (candidate?.isAxiosError === true && !response)
+  ) {
+    return "无法连接服务，请检查网络连接或服务状态";
+  }
+
+  return nonEmptyString(candidate?.message) ?? fallback;
+};

src/lib/chatStream.test.ts

@@ -100,6 +100,27 @@ describe("streamAgentChat", () => {
     ]);
   });
 
+  it("parses one complete final answer event", async () => {
+    mockNewSessionStream({
+      ok: true,
+      body: makeStream([
+        'event: final_answer\ndata: {"session_id":"s1","content":"完整分析结果"}\n\n',
+        'event: done\ndata: {"session_id":"s1"}\n\n',
+      ]),
+    });
+    const events: StreamEvent[] = [];
+
+    await streamAgentChat({
+      message: "分析",
+      onEvent: (event) => events.push(event),
+    });
+
+    expect(events).toEqual([
+      { type: "final_answer", sessionId: "s1", content: "完整分析结果" },
+      { type: "done", sessionId: "s1" },
+    ]);
+  });
+
   it("parses state events from a resumed stream", async () => {
     apiFetch.mockResolvedValue({
       ok: true,
@@ -172,6 +193,41 @@ describe("streamAgentChat", () => {
     });
   });
 
+  it("parses grouped activities and inherited permission reasons", async () => {
+    mockNewSessionStream({
+      ok: true,
+      body: makeStream([
+        'event: activity_update\ndata: {"session_id":"s1","activity":{"id":"a1","title":"准备分析数据","reason":"需要先确认输入数据完整。","status":"running","started_at":100,"elapsed_ms":25,"actions":[{"id":"x1","tool":"tjwater_cli","title":"查询后端数据","status":"running","target":"data list","started_at":110,"elapsed_ms":15}]},"todos":[{"id":"t1","content":"准备分析数据","status":"completed","priority":"high"},{"id":"t2","content":"生成分析结果","status":"in_progress","priority":"medium"}],"todos_created_at":125}\n\n',
+        'event: permission_request\ndata: {"session_id":"s1","request_id":"p1","permission":"bash","patterns":["python3 analysis.py"],"target":"python3 analysis.py","always":[],"activity_id":"a1","reason":"需要先确认输入数据完整。","created_at":123}\n\n',
+      ]),
+    });
+    const events: StreamEvent[] = [];
+
+    await streamAgentChat({ message: "分析", onEvent: (event) => events.push(event) });
+
+    expect(events[0]).toMatchObject({
+      type: "activity_update",
+      sessionId: "s1",
+      activity: {
+        id: "a1",
+        title: "准备分析数据",
+        reason: "需要先确认输入数据完整。",
+        status: "running",
+        actions: [expect.objectContaining({ id: "x1", target: "data list" })],
+      },
+      todos: [
+        expect.objectContaining({ id: "t1", status: "completed" }),
+        expect.objectContaining({ id: "t2", status: "in_progress" }),
+      ],
+      todosCreatedAt: 125,
+    });
+    expect(events[1]).toMatchObject({
+      type: "permission_request",
+      activityId: "a1",
+      reason: "需要先确认输入数据完整。",
+    });
+  });
+
   it("parses credential refresh lifecycle events", async () => {
     mockNewSessionStream({
       ok: true,
@@ -246,6 +302,8 @@ describe("streamAgentChat", () => {
         permission: "bash",
         patterns: ["rm *"],
         target: "rm tmp.txt",
+        activityId: undefined,
+        reason: undefined,
         always: ["rm *"],
         tool: undefined,
         createdAt: 123,

src/lib/chatStream.ts

@@ -59,6 +59,35 @@ export type AgentTodoUpdate = {
   createdAt: number;
 };
 
+export type AgentActivityStatus = "running" | "completed" | "error" | "cancelled";
+
+export type AgentActivityAction = {
+  id: string;
+  tool: string;
+  title: string;
+  status: "running" | "completed" | "error";
+  target?: string;
+  error?: string;
+  startedAt: number;
+  endedAt?: number;
+  elapsedMs?: number;
+  elapsedSnapshotAt?: number;
+  durationMs?: number;
+};
+
+export type AgentActivity = {
+  id: string;
+  title: string;
+  reason: string;
+  status: AgentActivityStatus;
+  actions: AgentActivityAction[];
+  startedAt: number;
+  endedAt?: number;
+  elapsedMs?: number;
+  elapsedSnapshotAt?: number;
+  durationMs?: number;
+};
+
 export type StreamEvent =
   | {
       type: "state";
@@ -68,8 +97,16 @@ export type StreamEvent =
       runStatus?: string;
     }
   | { type: "token"; sessionId: string; content: string }
+  | { type: "final_answer"; sessionId: string; content: string }
   | { type: "done"; sessionId: string; totalDurationMs?: number }
   | { type: "session_title"; sessionId: string; title: string }
+  | {
+      type: "activity_update";
+      sessionId: string;
+      activity: AgentActivity;
+      todos?: AgentTodoItem[];
+      todosCreatedAt?: number;
+    }
   | {
       type: "progress";
       sessionId: string;
@@ -127,6 +164,8 @@ export type StreamEvent =
       permission: string;
       patterns: string[];
       target?: string;
+      activityId?: string;
+      reason?: string;
       always: string[];
       tool?: {
         messageID: string;
@@ -295,6 +334,47 @@ const normalizeTodos = (value: unknown): AgentTodoItem[] => {
   }));
 };
 
+const normalizeActivityStatus = (value: unknown): AgentActivityStatus => {
+  if (value === "completed" || value === "error" || value === "cancelled") {
+    return value;
+  }
+  return "running";
+};
+
+const normalizeActivity = (value: unknown): AgentActivity | undefined => {
+  if (!isObjectRecord(value) || typeof value.id !== "string") return undefined;
+  const now = Date.now();
+  const actions: AgentActivityAction[] = Array.isArray(value.actions)
+    ? value.actions.filter(isObjectRecord).map((action, index) => ({
+        id: typeof action.id === "string" ? action.id : `${value.id}-action-${index}`,
+        tool: typeof action.tool === "string" ? action.tool : "tool",
+        title: typeof action.title === "string" ? action.title : "执行操作",
+        status: action.status === "completed" || action.status === "error"
+          ? action.status
+          : "running",
+        target: typeof action.target === "string" ? action.target : undefined,
+        error: typeof action.error === "string" ? action.error : undefined,
+        startedAt: typeof action.started_at === "number" ? action.started_at : now,
+        endedAt: typeof action.ended_at === "number" ? action.ended_at : undefined,
+        elapsedMs: typeof action.elapsed_ms === "number" ? action.elapsed_ms : undefined,
+        elapsedSnapshotAt: typeof action.elapsed_ms === "number" ? now : undefined,
+        durationMs: typeof action.duration_ms === "number" ? action.duration_ms : undefined,
+      }))
+    : [];
+  return {
+    id: value.id,
+    title: typeof value.title === "string" ? value.title : "正在处理",
+    reason: typeof value.reason === "string" ? value.reason : "",
+    status: normalizeActivityStatus(value.status),
+    actions,
+    startedAt: typeof value.started_at === "number" ? value.started_at : now,
+    endedAt: typeof value.ended_at === "number" ? value.ended_at : undefined,
+    elapsedMs: typeof value.elapsed_ms === "number" ? value.elapsed_ms : undefined,
+    elapsedSnapshotAt: typeof value.elapsed_ms === "number" ? now : undefined,
+    durationMs: typeof value.duration_ms === "number" ? value.duration_ms : undefined,
+  };
+};
+
 const emitParsedStreamEvent = (
   event: string,
   data: string,
@@ -327,6 +407,7 @@ const emitParsedStreamEvent = (
       target?: string;
       always?: unknown;
       created_at?: number;
+      todos_created_at?: number;
       reply?: PermissionReply;
       questions?: unknown;
       answers?: unknown;
@@ -335,6 +416,8 @@ const emitParsedStreamEvent = (
       todos?: unknown;
       reason?: string;
       timeout_ms?: number;
+      activity?: unknown;
+      activity_id?: string;
     };
     if (event === "state") {
       onEvent({
@@ -350,6 +433,12 @@ const emitParsedStreamEvent = (
         sessionId: parsed.session_id ?? "",
         content: parsed.content ?? "",
       });
+    } else if (event === "final_answer") {
+      onEvent({
+        type: "final_answer",
+        sessionId: parsed.session_id ?? "",
+        content: parsed.content ?? "",
+      });
     } else if (event === "progress") {
       onEvent({
         type: "progress",
@@ -364,6 +453,19 @@ const emitParsedStreamEvent = (
         elapsedMs: parsed.elapsed_ms,
         durationMs: parsed.duration_ms,
       });
+    } else if (event === "activity_update") {
+      const activity = normalizeActivity(parsed.activity);
+      if (activity) {
+        onEvent({
+          type: "activity_update",
+          sessionId: parsed.session_id ?? "",
+          activity,
+          todos: Array.isArray(parsed.todos)
+            ? normalizeTodos(parsed.todos)
+            : undefined,
+          todosCreatedAt: parsed.todos_created_at,
+        });
+      }
     } else if (event === "done") {
       onEvent({
         type: "done",
@@ -429,6 +531,8 @@ const emitParsedStreamEvent = (
           ? parsed.patterns.filter((item): item is string => typeof item === "string")
           : [],
         target: typeof parsed.target === "string" ? parsed.target : undefined,
+        activityId: typeof parsed.activity_id === "string" ? parsed.activity_id : undefined,
+        reason: typeof parsed.reason === "string" ? parsed.reason : undefined,
         always: Array.isArray(parsed.always)
           ? parsed.always.filter((item): item is string => typeof item === "string")
           : [],

src/utils/mapQueryService.ts

@@ -45,7 +45,7 @@ interface MapClickEvent {
 const getGeoserverConfig = () => ({
   url: config.MAP_URL,
   workspace: config.MAP_WORKSPACE,
-  layers: ["geo_pipes_mat", "geo_junctions_mat", "geo_valves"],
+  layers: ["pipes", "junctions", "valves"],
   wfsVersion: "1.0.0",
   outputFormat: "application/json",
 });
@@ -489,9 +489,6 @@ const handleMapClickSelectFeatures = async (
   // 如果要素来自 VectorTileSource，需要通过 WFS 查询完整信息
   const queryId = firstFeature.getProperties().id;
   const layerName = firstFeature.getProperties().layer;
-  if (layerName === "geo_pipes" || layerName === "geo_junctions") {
-    layerName.concat("_mat");
-  }
   if (!queryId) {
     return null;
   }

src/utils/schemeName.test.ts

@@ -0,0 +1,40 @@
+import {
+  createSchemeName,
+  isSchemeNameValid,
+  normalizeSchemeName,
+  SCHEME_NAME_PREFIXES,
+} from "./schemeName";
+
+describe("createSchemeName", () => {
+  it("combines the scheme type with a readable local timestamp", () => {
+    const date = new Date(2026, 7, 17, 15, 30, 45, 123);
+
+    expect(createSchemeName(SCHEME_NAME_PREFIXES.flushingAnalysis, date)).toBe(
+      "flush_260817_153045123",
+    );
+  });
+
+  it("pads single-digit date and time values", () => {
+    const date = new Date(2026, 0, 2, 3, 4, 5, 6);
+
+    expect(createSchemeName(SCHEME_NAME_PREFIXES.burstAnalysis, date)).toBe(
+      "burst_sim_260102_030405006",
+    );
+  });
+
+  it("keeps names distinct within the same second", () => {
+    const first = new Date(2026, 7, 17, 15, 30, 45, 123);
+    const second = new Date(2026, 7, 17, 15, 30, 45, 124);
+
+    expect(createSchemeName(SCHEME_NAME_PREFIXES.flushingAnalysis, first)).not.toBe(
+      createSchemeName(SCHEME_NAME_PREFIXES.flushingAnalysis, second),
+    );
+  });
+
+  it("normalizes and validates manually entered names", () => {
+    expect(normalizeSchemeName("  cafe\u0301  ")).toBe("café");
+    expect(normalizeSchemeName("方案\u200bA\u2060")).toBe("方案A");
+    expect(isSchemeNameValid("x".repeat(32))).toBe(true);
+    expect(isSchemeNameValid("x".repeat(33))).toBe(false);
+  });
+});

src/utils/schemeName.ts

@@ -0,0 +1,47 @@
+export const SCHEME_NAME_PREFIXES = {
+  dmaLeakIdentification: "dma_leak",
+  flushingAnalysis: "flush",
+  burstDetection: "burst_detect",
+  burstAnalysis: "burst_sim",
+  burstLocation: "burst_locate",
+  contaminantAnalysis: "water_quality",
+  sensorPlacement: "sensor_place",
+} as const;
+
+export type SchemeNamePrefix =
+  (typeof SCHEME_NAME_PREFIXES)[keyof typeof SCHEME_NAME_PREFIXES];
+
+export const SCHEME_NAME_MAX_LENGTH = 32;
+
+export const normalizeSchemeName = (value: string) =>
+  value
+    .normalize("NFC")
+    .replace(/\p{Default_Ignorable_Code_Point}/gu, "")
+    .trim();
+
+export const isSchemeNameValid = (value: string) => {
+  const normalized = normalizeSchemeName(value);
+  return normalized.length > 0 && normalized.length <= SCHEME_NAME_MAX_LENGTH;
+};
+
+const padNumber = (value: number, length = 2) =>
+  String(value).padStart(length, "0");
+
+export const createSchemeName = (
+  prefix: SchemeNamePrefix,
+  date = new Date(),
+) => {
+  const timestamp = [
+    padNumber(date.getFullYear() % 100),
+    padNumber(date.getMonth() + 1),
+    padNumber(date.getDate()),
+  ].join("");
+  const time = [
+    padNumber(date.getHours()),
+    padNumber(date.getMinutes()),
+    padNumber(date.getSeconds()),
+    padNumber(date.getMilliseconds(), 3),
+  ].join("");
+
+  return `${prefix}_${timestamp}_${time}`;
+};