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 }" >
@@ -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 @@
- +
-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}">
- + @@ -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 {