From deac3a6e213c82069da9921d532974d587a5ba32 Mon Sep 17 00:00:00 2001
From: guonan <guonan201020@163.com>
Date: 星期三, 25 六月 2025 09:42:26 +0800
Subject: [PATCH] 上一个坏了
---
src/components/menu/TimeLine.vue | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/src/components/menu/TimeLine.vue b/src/components/menu/TimeLine.vue
index 9f3df8d..91d7acb 100644
--- a/src/components/menu/TimeLine.vue
+++ b/src/components/menu/TimeLine.vue
@@ -190,12 +190,8 @@
const isColorRenderEnabled = ref(false); // 鍋囪杩欐槸浣犵殑棰滆壊娓叉煋寮�鍏崇姸鎬�
const isWaterPrimitiveCreated = ref(false);
let playInterval = null;
-<<<<<<< HEAD
-let rainTotalInfo = [];
-=======
let timeStepInfo = null;
let rainTotalInfo = ([]);
->>>>>>> 68e0faf021b54ab38bba0b07c76c3d5f43dfc311
const isRainEnabled = ref(false);
const rainParams = reactive({
rainSize: 0.5,
@@ -352,14 +348,10 @@
const rainfallList = data.rainfalls;
console.log("鏈�缁堢殑 rainfallList:", rainfallList);
-<<<<<<< HEAD
- rainTotalInfo.value = rainfallList;
-=======
rainTotalInfo.value = rainfallList
calculateTimeStep(rainTotalInfo.value)
// 浣跨敤绀轰緥
timeStepInfo = calculateTimeStep(rainTotalInfo.value);
->>>>>>> 68e0faf021b54ab38bba0b07c76c3d5f43dfc311
// 鎻愬彇 intensity 鍊�
rainFallValues.value = rainfallList.map((r) => r.intensity);
@@ -487,19 +479,6 @@
let color = "#D4F2E7"; // 榛樿钃濊壊
if (total >= 150) {
-<<<<<<< HEAD
- color = "#663300"; // 榛� - 澶ч洦
- } else if (total >= 125) {
- color = "#B26633"; // 榛勭豢 - 涓洦
- } else if (total >= 100) {
- color = "#CC9966"; // 缁� - 涓洦
- } else if (total >= 75) {
- color = "#CCE5FF"; // 闈掔豢 - 灏忛洦
- } else if (total >= 50) {
- color = "#99CCFF"; // 澶╄摑 - 灏忛洦
- } else if (total >= 25) {
- color = "#66B3FF"; // 娴呰摑 - 寰噺
-=======
color = '#663300';
} else if (total >= 125) {
color = '#B26633';
@@ -511,7 +490,6 @@
color = '#99CCFF';
} else if (total >= 25) {
color = '#66B3FF';
->>>>>>> 68e0faf021b54ab38bba0b07c76c3d5f43dfc311
}
// console.log(`褰撳墠 total: ${total.toFixed(2)}, 棰滆壊: ${color}`);
// updateWaterColor(color)
--
Gitblit v1.9.3