From fa541dda36e58de1d491b3ff4073c51b16606515 Mon Sep 17 00:00:00 2001
From: wangjuncheng <1>
Date: 星期三, 25 六月 2025 17:29:42 +0800
Subject: [PATCH] 2
---
src/api/trApi.js | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/api/trApi.js b/src/api/trApi.js
index 53d8f50..1f5eb9a 100644
--- a/src/api/trApi.js
+++ b/src/api/trApi.js
@@ -38,7 +38,7 @@
export async function getSimDataById(id) {
try {
const res = await instance.get(`/simu/selectPage?id=${id}`);
- return res.data;
+ return res.data;
} catch (error) {
console.error("Error fetching data:", error);
throw error; // 鎶涘嚭閿欒锛岃璋冪敤鏂瑰彲浠ユ崟鑾�
@@ -117,22 +117,44 @@
}
}
-// 閫氳繃鎺ュ彛鍘昏姹俲son锛屽皢璇锋眰鐨刯son瑙ｆ瀽鑾峰彇娉ョ煶娴佸弬鏁�
-export async function fetchWaterSimulationData(serviceInfo) {
+// // 閫氳繃鎺ュ彛鍘昏姹俲son锛屽皢璇锋眰鐨刯son瑙ｆ瀽鑾峰彇娉ョ煶娴佸弬鏁�
+// export async function fetchWaterSimulationData(serviceInfo) {
+// try {
+// const response = await fetch(`/simu/${serviceInfo}/layer.json`); // 鍙戣捣璇锋眰
+// // const response = await fetch(`/simu/c2h1dc/layer.json`); // 鍙戣捣璇锋眰
+// if (!response.ok) {
+// throw new Error(`HTTP error! status: ${response.status}`);
+// }
+// const jsonData = await response.json(); // 瑙ｆ瀽 JSON 鏁版嵁
+// // console.log(jsonData, "jsonjsonjsonjson");
+// return parseWaterSimulationData(jsonData); // 璋冪敤瑙ｆ瀽鍑芥暟
+// } catch (error) {
+// console.error("璇锋眰鎴栬В鏋愭暟鎹椂鍑洪敊:", error);
+// return null;
+// }
+// }
+
+export async function fetchWaterSimulationData(serviceInfo, timestamp = null) {
try {
- const response = await fetch(`/simu/${serviceInfo}/layer.json`); // 鍙戣捣璇锋眰
- // const response = await fetch(`/simu/c2h1dc/layer.json`); // 鍙戣捣璇锋眰
+ // 鏍规嵁鏄惁鎻愪緵鏃堕棿鎴虫潵鍐冲畾鏂囦欢鍚�
+ let fileName = timestamp ? timestamp : 'layer.json';
+ const url = `/simu/${serviceInfo}/${fileName}`;
+
+ const response = await fetch(url); // 鍙戣捣璇锋眰
+
+ console.log(url,'aaaaaaaaa')
+
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
const jsonData = await response.json(); // 瑙ｆ瀽 JSON 鏁版嵁
- // console.log(jsonData, "jsonjsonjsonjson");
- return parseWaterSimulationData(jsonData); // 璋冪敤瑙ｆ瀽鍑芥暟
+ return parseWaterSimulationData(jsonData); // 璋冪敤瑙ｆ瀽鍑芥暟澶勭悊鏁版嵁
} catch (error) {
console.error("璇锋眰鎴栬В鏋愭暟鎹椂鍑洪敊:", error);
return null;
}
}
+
// 鑾峰彇姘翠綅姘存繁
export async function getFlowRate(data) {
// console.log(data,'鍙戦�佺殑鏁版嵁锛�');
--
Gitblit v1.9.3