From 12f521dd7022c34fd3102e409a10799a3fae5746 Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Tue, 19 Jul 2022 13:58:24 +0800
Subject: [PATCH] fix mark area

---
 src/components/Graph.vue                      |  6 ++++++
 src/views/dashboard/related/event/Content.vue | 13 ++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/components/Graph.vue b/src/components/Graph.vue
index 24b76650..6b87334a 100644
--- a/src/components/Graph.vue
+++ b/src/components/Graph.vue
@@ -115,6 +115,12 @@ watch(
     }
     if (props.filters) {
       if (props.filters.isRange) {
+        const list = props.option.series[0].data.map(
+          (d: (number | string)[]) => d[0]
+        );
+        if (!list.includes(props.filters.duration.endTime)) {
+          return;
+        }
         const markArea = {
           silent: true,
           itemStyle: {
diff --git a/src/views/dashboard/related/event/Content.vue b/src/views/dashboard/related/event/Content.vue
index cc8656ac..14d2c3b4 100644
--- a/src/views/dashboard/related/event/Content.vue
+++ b/src/views/dashboard/related/event/Content.vue
@@ -117,7 +117,7 @@ function visTimeline() {
     for (const widget of widgets) {
       let end = i.end;
       if (!isNaN(index)) {
-        let diff = 0;
+        let diff = 60000;
         switch (appStore.duration.step) {
           case "MINUTE":
             diff = 60000;
@@ -126,16 +126,7 @@ function visTimeline() {
             diff = 3600000;
             break;
           case "DAY":
-            diff = 86400000;
-            break;
-          case "MONTH":
-            diff =
-              (appStore.duration.end.getTime() -
-                appStore.duration.start.getTime()) /
-              (appStore.duration.end.getFullYear() * 12 +
-                appStore.duration.end.getMonth() -
-                appStore.duration.start.getFullYear() * 12 -
-                appStore.duration.start.getMonth());
+            diff = 3600000 * 24;
             break;
         }
         if (!i.end || i.end.getTime() - i.start.getTime() < diff) {