From f6741c4680a49a79049c2bc963fa2c653803971a Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 15:20:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=BB=84=E4=BB=B6-?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A-=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=8C=83=E5=9B=B4-=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4-=E8=B0=83=E6=95=B4=E7=9B=B8=E5=AF=B9?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../filter/filterMain/RangeFilterTime.vue     | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue b/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue
index ce5ce4ae6e..ba2d0d1775 100644
--- a/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/RangeFilterTime.vue
@@ -300,6 +300,7 @@ export default {
         relativeToCurrentType,
         around,
         intervalType,
+        relativeToCurrent,
         timeNumRange,
         relativeToCurrentTypeRange,
         aroundRange,
@@ -307,6 +308,7 @@ export default {
       return {
         timeNum,
         relativeToCurrentType,
+        relativeToCurrent,
         around,
         intervalType,
         timeNumRange,
@@ -421,10 +423,36 @@ export default {
       }
     },
     closeFilter() {
-      this.timeRange = cloneDeep(defaultObj);
+      this.timeRange = cloneDeep(this.timeRangeData);
       this.$emit("changeData", null);
     },
     changeFilter() {
+      const {
+        timeNum,
+        relativeToCurrentType,
+        around,
+        intervalType,
+        timeNumRange,
+        regularOrTrends,
+        relativeToCurrentTypeRange,
+        aroundRange,
+      } = this.timeRange;
+      if (intervalType === "timeInterval" && regularOrTrends === 'dynamic') {
+        const startTime = getAround(
+          relativeToCurrentType,
+          around === "f" ? "subtract" : "add",
+          timeNum,
+        );
+        const endTime = getAround(
+          relativeToCurrentTypeRange,
+          aroundRange === "f" ? "subtract" : "add",
+          timeNumRange,
+        );
+        if (+endTime < +startTime) {
+          this.$message.error(this.$t('time.end_time_start_time'));
+          return;
+        }
+      }
       this.$emit("changeData", cloneDeep(this.timeRange));
     },
   },