From c1a97b6fd8109f841aefa049deaadd93f5821589 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Tue, 18 Jul 2023 12:04:33 +0800
Subject: [PATCH] =?UTF-8?q?CN-1064=20fix:=20dashboard=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=82=E6=95=B0=E9=80=BB=E8=BE=91=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts2/Panel.vue                               | 7 +++++--
 .../charts/networkOverview/NetworkOverviewTabs.vue        | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/charts2/Panel.vue b/src/views/charts2/Panel.vue
index a6dd4b23..49bf286c 100644
--- a/src/views/charts2/Panel.vue
+++ b/src/views/charts2/Panel.vue
@@ -253,8 +253,11 @@ export default {
     const timeFilter = ref({ dateRangeValue })
     if (!startTimeParam || !endTimeParam) {
       const { startTime, endTime } = getNowTime(60)
-      timeFilter.value.startTime = startTime
-      timeFilter.value.endTime = endTime
+      timeFilter.value.startTime = getSecond(startTime)
+      timeFilter.value.endTime = getSecond(endTime)
+      // 如果没有时间参数，就将参数写入url
+      const newUrl = urlParamsHandler(window.location.href, useRoute().query, { startTime: timeFilter.value.startTime, endTime: timeFilter.value.endTime, range: dateRangeValue })
+      overwriteUrl(newUrl)
     } else {
       timeFilter.value.startTime = parseInt(startTimeParam)
       timeFilter.value.endTime = parseInt(endTimeParam)
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index fae1ad2a..a2d5e0a7 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -220,6 +220,7 @@ import chartMixin from '@/views/charts2/chart-mixin'
 import _ from 'lodash'
 import axios from 'axios'
 import indexedDBUtils from '@/indexedDB'
+import {useRoute} from 'vue-router'
 
 export default {
   name: 'NetworkOverviewTabs',
@@ -1131,6 +1132,13 @@ export default {
           5.设置panel名称，表格维度类型：如ip，domain等(即查询参数中的type)
       * */
     async handleTabValue (columnName, columnValue) {
+      // 如果是非自定义的时间范围，就更新startTime和endTime
+      if (this.timeFilter.dateRangeValue !== -1) {
+        const endTime = window.$dayJs.tz().valueOf()
+        const startTime = endTime - this.timeFilter.dateRangeValue * 60 * 1000
+        const newUrl = urlParamsHandler(window.location.href, this.$route.query, { startTime: getSecond(startTime), endTime: getSecond(endTime), range: this.timeFilter.dateRangeValue })
+        overwriteUrl(newUrl)
+      }
       // 下钻前保存当前路由状态
       this.beforeRouterPush()
       const clickTab = this.getTabByName(columnName)// 下钻后，显示的下钻tab对应的drilldownTabs