CN-1064 fix: dashboard组件时间参数逻辑调整
This commit is contained in:
@@ -253,8 +253,11 @@ export default {
|
|||||||
const timeFilter = ref({ dateRangeValue })
|
const timeFilter = ref({ dateRangeValue })
|
||||||
if (!startTimeParam || !endTimeParam) {
|
if (!startTimeParam || !endTimeParam) {
|
||||||
const { startTime, endTime } = getNowTime(60)
|
const { startTime, endTime } = getNowTime(60)
|
||||||
timeFilter.value.startTime = startTime
|
timeFilter.value.startTime = getSecond(startTime)
|
||||||
timeFilter.value.endTime = endTime
|
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 {
|
} else {
|
||||||
timeFilter.value.startTime = parseInt(startTimeParam)
|
timeFilter.value.startTime = parseInt(startTimeParam)
|
||||||
timeFilter.value.endTime = parseInt(endTimeParam)
|
timeFilter.value.endTime = parseInt(endTimeParam)
|
||||||
|
|||||||
@@ -220,6 +220,7 @@ import chartMixin from '@/views/charts2/chart-mixin'
|
|||||||
import _ from 'lodash'
|
import _ from 'lodash'
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import indexedDBUtils from '@/indexedDB'
|
import indexedDBUtils from '@/indexedDB'
|
||||||
|
import {useRoute} from 'vue-router'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'NetworkOverviewTabs',
|
name: 'NetworkOverviewTabs',
|
||||||
@@ -1131,6 +1132,13 @@ export default {
|
|||||||
5.设置panel名称,表格维度类型:如ip,domain等(即查询参数中的type)
|
5.设置panel名称,表格维度类型:如ip,domain等(即查询参数中的type)
|
||||||
* */
|
* */
|
||||||
async handleTabValue (columnName, columnValue) {
|
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()
|
this.beforeRouterPush()
|
||||||
const clickTab = this.getTabByName(columnName)// 下钻后,显示的下钻tab对应的drilldownTabs
|
const clickTab = this.getTabByName(columnName)// 下钻后,显示的下钻tab对应的drilldownTabs
|
||||||
|
|||||||
Reference in New Issue
Block a user