From b44a99f35470fbe0dbcf23e374695351c7c99862 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Thu, 12 Oct 2023 17:05:05 +0800
Subject: [PATCH] =?UTF-8?q?CN-1372=20fix:=20=E6=9B=B2=E7=BA=BF=E5=9B=BE?=
 =?UTF-8?q?=E6=AD=A5=E9=95=BF=E4=BC=98=E5=8C=96=E5=90=8E=EF=BC=8C=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E4=B8=BA1=E5=B0=8F=E6=97=B6=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=9F=AD=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=97=B6=E6=A8=AA?=
 =?UTF-8?q?=E5=9D=90=E6=A0=87=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=8F=8B=E5=A5=BD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts2/Panel.vue                                | 4 ++--
 src/views/charts2/charts/entityDetail/EntityDetailLine.vue | 4 ++--
 src/views/charts2/charts/options/echartOption.js           | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue
index c338d3f7..b287666f 100644
--- a/src/views/charts2/Panel.vue
+++ b/src/views/charts2/Panel.vue
@@ -283,10 +283,10 @@ export default {
     const endTimeParam = query.endTime
     // 若url携带了，使用携带的值，否则使用默认值。
 
-    const dateRangeValue = rangeParam ? parseInt(query.range) : 60 * 24
+    const dateRangeValue = rangeParam ? parseInt(query.range) : 60
     const timeFilter = ref({ dateRangeValue })
     if (!startTimeParam || !endTimeParam) {
-      const { startTime, endTime } = getNowTime(60 * 24)
+      const { startTime, endTime } = getNowTime(60)
       timeFilter.value.startTime = getSecond(startTime)
       timeFilter.value.endTime = getSecond(endTime)
       // 如果没有时间参数，就将参数写入url
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailLine.vue b/src/views/charts2/charts/entityDetail/EntityDetailLine.vue
index a72093a2..9389d834 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailLine.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailLine.vue
@@ -125,10 +125,10 @@ export default {
     const endTimeParam = query.endTime
     // 若url携带了，使用携带的值，否则使用默认值。
 
-    const dateRangeValue = rangeParam ? parseInt(query.range) : 60 * 24
+    const dateRangeValue = rangeParam ? parseInt(query.range) : 60
     const timeFilter = ref({ dateRangeValue })
     if (!startTimeParam || !endTimeParam) {
-      const { startTime, endTime } = getNowTime(60 * 24)
+      const { startTime, endTime } = getNowTime(60)
       timeFilter.value.startTime = startTime
       timeFilter.value.endTime = endTime
     } else {
diff --git a/src/views/charts2/charts/options/echartOption.js b/src/views/charts2/charts/options/echartOption.js
index ff353894..8e01f1c0 100644
--- a/src/views/charts2/charts/options/echartOption.js
+++ b/src/views/charts2/charts/options/echartOption.js
@@ -185,6 +185,7 @@ export const stackedLineChartOption = {
     {
       type: 'time',
       splitNumber: 8,
+      minInterval: 60000,
       axisLabel: {
         formatter: xAxisTimeFormatter,
         rich: xAxisTimeRich