From 028b5cdb13d72f52fbdbf37c671ed3b5a5e17211 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 8 Apr 2022 11:29:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E4=BD=93=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=94=B9=E4=B8=BA1?=
 =?UTF-8?q?=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/TimeRange/DateTimeRange.vue |  6 ++++--
 src/views/charts/ChartHeader.vue                  | 13 ++++++++++---
 src/views/charts/Panel.vue                        | 14 +++++++++-----
 src/views/entityExplorer/EntityExplorer.vue       |  4 ++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue
index 1b4483bd..da1f6acd 100644
--- a/src/components/common/TimeRange/DateTimeRange.vue
+++ b/src/components/common/TimeRange/DateTimeRange.vue
@@ -91,6 +91,9 @@ export default {
     endTime: {
       type: Number,
       default: window.$dayJs.tz().valueOf()
+    },
+    dateRange: {
+      type: Number
     }
     /* useRefresh: {
       type: Boolean,
@@ -113,8 +116,7 @@ export default {
     const address = localStorage.getItem('cn-sys-timezone')
     const utc = localStorage.getItem('cn-timezone-offset')
     const rangeHistory = ref(localStorage.getItem('date-range-history') ? JSON.parse(localStorage.getItem('date-range-history')) : [])
-    const dateRangeValue = ref(60)
-    dateRangeValue.value = 60
+    const dateRangeValue = props.dateRange ? ref(props.dateRange) : ref(60)
     const isCustom = ref(false)
     const dateRangeArr = [
       {
diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue
index 331aac9f..e8700a27 100644
--- a/src/views/charts/ChartHeader.vue
+++ b/src/views/charts/ChartHeader.vue
@@ -4,7 +4,7 @@
     :class="{
       'chart-header--title-chart': isTitle,
       'is-group-collapse': isGroup,
-      'panel-chart-block': isBlock,
+      'panel-chart-block': isBlock
     }"
   >
     <div class="chart-header__title" v-if="isGroup">
@@ -193,6 +193,7 @@
           class="date-time-range"
           :start-time="chartTimeFilter.startTime"
           :end-time="chartTimeFilter.endTime"
+          :date-range="chartTimeFilter.dateRangeValue"
           ref="dateTimeRange"
           @change="reload"
         />
@@ -246,8 +247,9 @@ import {
   chartActiveIpTableOrderOptions,
   chartPieTableTopOptions,
   eventSeverity,
-  chartTableColumnMapping
+  chartTableColumnMapping, panelTypeAndRouteMapping
 } from '@/utils/constants'
+import { useRouter } from 'vue-router'
 
 export default {
   name: 'ChartHeader',
@@ -364,7 +366,12 @@ export default {
     }
   },
   setup (props) {
-    const dateRangeValue = 60
+    const { currentRoute } = useRouter()
+
+    function isEntityDetail (r) {
+      return r.indexOf('entityDetail') > -1
+    }
+    const dateRangeValue = isEntityDetail(currentRoute.value.path) ? 60 * 24 : 60
     const { startTime, endTime } = getNowTime(dateRangeValue)
     // entity详情内的chart时间工具不是公共的，需要单独定义
     const chartTimeFilter = ref({ startTime, endTime, dateRangeValue })
diff --git a/src/views/charts/Panel.vue b/src/views/charts/Panel.vue
index cc53392b..0f2ab89e 100644
--- a/src/views/charts/Panel.vue
+++ b/src/views/charts/Panel.vue
@@ -2,7 +2,7 @@
   <div style="padding: 10px 10px 20px 10px; overflow: auto" v-if="!isEntityDetail">
     <div id="cn-panel" class="cn-panel2">
       <div class="panel__time">
-        <date-time-range class="date-time-range" :start-time="timeFilter.startTime" :end-time="timeFilter.endTime" ref="dateTimeRange" @change="reload"/>
+        <date-time-range class="date-time-range" :start-time="timeFilter.startTime" :end-time="timeFilter.endTime" :date-range="timeFilter.dateRangeValue" ref="dateTimeRange" @change="reload"/>
         <time-refresh class="date-time-range" @change="timeRefreshChange" :end-time="timeFilter.endTime"/>
       </div>
       <panel-chart-list
@@ -78,14 +78,18 @@ export default {
     }
   },
   setup (props, ctx) {
-    // data
-    const dateRangeValue = 60
-    const { startTime, endTime } = getNowTime(dateRangeValue)
-    const timeFilter = ref({ startTime, endTime, dateRangeValue })
     const panel = ref({})
     let panelType = 1 // 取得panel的type
     const { params } = useRoute()
     panelType = props.entity ? props.entity.type : panelTypeAndRouteMapping[params.typeName]
+
+    function isEntityDetail (t) {
+      return [4, 5, 6].indexOf(t) > -1
+    }
+    // date
+    const dateRangeValue = isEntityDetail(panelType) ? 60 * 24 : 60
+    const { startTime, endTime } = getNowTime(dateRangeValue)
+    const timeFilter = ref({ startTime, endTime, dateRangeValue })
     return {
       panelType,
       panel,
diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue
index 9529525e..e39e7df4 100644
--- a/src/views/entityExplorer/EntityExplorer.vue
+++ b/src/views/entityExplorer/EntityExplorer.vue
@@ -4,7 +4,7 @@
       :class="{'entity-explorer--show-list': showList}">
     <!-- 顶部工具栏，在列表页显示 -->
     <div class="explorer-top-tools" v-show="showList">
-      <DateTimeRange class="date-time-range" :start-time="timeFilter.startTime" :end-time="timeFilter.endTime" ref="dateTimeRange" @change="reload"/>
+      <DateTimeRange class="date-time-range" :start-time="timeFilter.startTime" :end-time="timeFilter.endTime" :date-range="timeFilter.dateRangeValue" ref="dateTimeRange" @change="reload"/>
       <TimeRefresh class="date-time-range" @change="timeRefreshChange" :end-time="timeFilter.endTime"/>
       <el-button-group size="mini">
         <el-button size="mini" @click="listMode = 'list'" :class="{'active': listMode === 'list'}"><i class="cn-icon cn-icon-list"></i></el-button>
@@ -563,7 +563,7 @@ export default {
     }
   },
   setup () {
-    const dateRangeValue = 60
+    const dateRangeValue = 60 * 24
     const { startTime, endTime } = getNowTime(dateRangeValue)
     const timeFilter = ref({ startTime, endTime, dateRangeValue })
     return {