From 8792be67cf5791a4a3afc2f72fd8d7cfc3cff353 Mon Sep 17 00:00:00 2001
From: wangjuncheng <1>
Date: 星期二, 15 四月 2025 15:20:28 +0800
Subject: [PATCH] change
---
src/store/simulation.js | 2 --
src/views/left/KGSimOption/PredictiveSimulation.vue | 2 +-
src/components/menu/TimeLine.vue | 5 +++++
src/views/left/KGSimOption/HistorySimulation.vue | 2 +-
src/views/mnfz.vue | 1 +
src/components/monifangzhen/schemeCard.vue | 3 ++-
src/views/left/KGSimOption/RealTimeSimulation.vue | 2 +-
7 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/components/menu/TimeLine.vue b/src/components/menu/TimeLine.vue
index e4dabf1..c18c8b1 100644
--- a/src/components/menu/TimeLine.vue
+++ b/src/components/menu/TimeLine.vue
@@ -1,6 +1,7 @@
<template>
<div class="timeline-container">
<div class="controls">
+ <!-- <div @click="endSimulate">缁撴潫妯℃嫙</div> -->
<div class="control-btn" @click="skipBackward">
<img
src="@/assets/img/timeline/left.png"
@@ -52,6 +53,7 @@
:style="{ left: progressPercentage + '%' }"
></div>
<div class="time-markers">
+
<div
v-for="(time, index) in timeMarkers"
:key="index"
@@ -74,6 +76,7 @@
watch,
defineProps,
onBeforeUnmount,
+ inject
} from "vue";
import dayjs from "dayjs";
import { createWaterPrimitive, destoryWaterPrimitive } from "@/utils/water";
@@ -295,6 +298,8 @@
destoryWaterPrimitive();
}, delay);
});
+const { startSimulate, endSimulate } = inject("simulateActions");
+
</script>
<style scoped>
diff --git a/src/components/monifangzhen/schemeCard.vue b/src/components/monifangzhen/schemeCard.vue
index 11112fe..9e1adde 100644
--- a/src/components/monifangzhen/schemeCard.vue
+++ b/src/components/monifangzhen/schemeCard.vue
@@ -13,7 +13,8 @@
<div class="cardMenu">
<div style="float: right; margin-top: 3px">
<el-button size="small" @click="setSchemClick(item)">鏂规璇︽儏</el-button>
- <el-button size="small" @click="startPlay(item)" :disabled="item.taskStatus !== 2">杩涘叆妯℃嫙</el-button>
+ <el-button size="small" @click="startPlay(item)">杩涘叆妯℃嫙</el-button>
+ <!-- :disabled="item.taskStatus !== 2" -->
</div>
</div>
</el-card>
diff --git a/src/store/simulation.js b/src/store/simulation.js
index 009cfcc..44797b3 100644
--- a/src/store/simulation.js
+++ b/src/store/simulation.js
@@ -47,8 +47,6 @@
// 鏂规鐩稿叧
const setSchemCard = (data) => {
schemCard.value = data
- console.log(schemCard,'aaaaaaaaaaaaaa');
-
}
// 娣诲姞鍗曚釜鏂规鏁版嵁
diff --git a/src/views/left/KGSimOption/HistorySimulation.vue b/src/views/left/KGSimOption/HistorySimulation.vue
index 539d1ac..54e5cac 100644
--- a/src/views/left/KGSimOption/HistorySimulation.vue
+++ b/src/views/left/KGSimOption/HistorySimulation.vue
@@ -167,7 +167,7 @@
area: props.selectedArea, // 鍖哄煙
name: selectedRainfallName.value, // 鏂规鍚嶇О
createTime: new Date().toISOString(), // 鍒涘缓鏃堕棿
- taskStatus: 0, // 鍒濆鐘舵�佷负鏈紑濮�
+ taskStatus: 1, // 鍒濆鐘舵�佷负鏈紑濮�
totalRainfall: totalRainfall.value, // 闄嶉洦鎬婚噺
rainfallIntensity: rainfallIntensity.value, // 闄嶉洦寮哄害
rainfallDuration: rainfallDuration.value, // 闄嶉洦鏃堕暱
diff --git a/src/views/left/KGSimOption/PredictiveSimulation.vue b/src/views/left/KGSimOption/PredictiveSimulation.vue
index 43ba4a7..03088a1 100644
--- a/src/views/left/KGSimOption/PredictiveSimulation.vue
+++ b/src/views/left/KGSimOption/PredictiveSimulation.vue
@@ -171,7 +171,7 @@
area: props.selectedArea, // 鍖哄煙
name: selectedForecastDataName.value, // 鏂规鍚嶇О锛堥娴嬫暟鎹被鍨嬶級
createTime: new Date().toISOString(), // 鍒涘缓鏃堕棿
- taskStatus: 0, // 鍒濆鐘舵�佷负鏈紑濮�
+ taskStatus: 1, // 鍒濆鐘舵�佷负鏈紑濮�
simulationType: '棰勬祴妯℃嫙', // 妯℃嫙绫诲瀷
forecastData: selectedForecastDataName.value, // 棰勬祴鏁版嵁
totalRainfall: `${totalRainfall.value} mm`, // 闄嶉洦闆ㄩ噺
diff --git a/src/views/left/KGSimOption/RealTimeSimulation.vue b/src/views/left/KGSimOption/RealTimeSimulation.vue
index 436c48b..574018b 100644
--- a/src/views/left/KGSimOption/RealTimeSimulation.vue
+++ b/src/views/left/KGSimOption/RealTimeSimulation.vue
@@ -221,7 +221,7 @@
area: props.selectedArea, // 鍖哄煙
name: selectedRainfallName.value, // 鏂规鍚嶇О锛堥洦閲忔暟鎹被鍨嬶級
createTime: new Date().toISOString(), // 鍒涘缓鏃堕棿
- taskStatus: 0, // 鍒濆鐘舵�佷负鏈紑濮�
+ taskStatus:1, // 鍒濆鐘舵�佷负鏈紑濮�
rainfallType: selectedRainfallName.value, // 闆ㄩ噺鏁版嵁绫诲瀷
devices: selectedDevices.value.map((item) => item.name), // 璁惧淇℃伅
};
diff --git a/src/views/mnfz.vue b/src/views/mnfz.vue
index d09fec0..55e1e4a 100644
--- a/src/views/mnfz.vue
+++ b/src/views/mnfz.vue
@@ -7,6 +7,7 @@
@is-playing="isPlaying"
:waterSimulateParams="waterSimulateParams"
@playbackFinished="playbackFinished"
+ @end="endSimulate"
/>
<DebuffDetail
v-if="showDebuffDetail"
--
Gitblit v1.9.3