fix: 将entity-detail默认时间查询范围改为1小时
This commit is contained in:
@@ -247,9 +247,8 @@ import {
|
|||||||
chartActiveIpTableOrderOptions,
|
chartActiveIpTableOrderOptions,
|
||||||
chartPieTableTopOptions,
|
chartPieTableTopOptions,
|
||||||
eventSeverity,
|
eventSeverity,
|
||||||
chartTableColumnMapping, panelTypeAndRouteMapping
|
chartTableColumnMapping
|
||||||
} from '@/utils/constants'
|
} from '@/utils/constants'
|
||||||
import { useRouter } from 'vue-router'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ChartHeader',
|
name: 'ChartHeader',
|
||||||
@@ -370,17 +369,12 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
setup (props) {
|
setup (props) {
|
||||||
const { currentRoute } = useRouter()
|
const dateRangeValue = 60
|
||||||
|
|
||||||
function isEntityDetail (r) {
|
|
||||||
return r.indexOf('entityDetail') > -1
|
|
||||||
}
|
|
||||||
const dateRangeValue = isEntityDetail(currentRoute.value.path) ? 60 * 24 : 60
|
|
||||||
const { startTime, endTime } = getNowTime(dateRangeValue)
|
const { startTime, endTime } = getNowTime(dateRangeValue)
|
||||||
// entity详情内的chart时间工具不是公共的,需要单独定义
|
// entity详情内的chart时间工具不是公共的,需要单独定义
|
||||||
const chartTimeFilter = ref({ startTime, endTime, dateRangeValue })
|
const chartTimeFilter = ref({ startTime, endTime, dateRangeValue })
|
||||||
// 复制一份prop中需要被组件v-model的内容,避免报错
|
// 复制一份prop中需要被组件v-model的内容,避免报错
|
||||||
const copyOrderPieTable = props.orderPieTable
|
const copyOrderPieTable = ref(props.orderPieTable)
|
||||||
return {
|
return {
|
||||||
chartTimeFilter,
|
chartTimeFilter,
|
||||||
chartTableTopOptions,
|
chartTableTopOptions,
|
||||||
|
|||||||
@@ -107,11 +107,8 @@ export default {
|
|||||||
const { params } = useRoute()
|
const { params } = useRoute()
|
||||||
panelType = props.entity ? props.entity.type : panelTypeAndRouteMapping[params.typeName]
|
panelType = props.entity ? props.entity.type : panelTypeAndRouteMapping[params.typeName]
|
||||||
|
|
||||||
function isEntityDetail (t) {
|
|
||||||
return [4, 5, 6].indexOf(t) > -1
|
|
||||||
}
|
|
||||||
// date
|
// date
|
||||||
const dateRangeValue = isEntityDetail(panelType) ? 60 * 24 : 60
|
const dateRangeValue = 60
|
||||||
const { startTime, endTime } = getNowTime(dateRangeValue)
|
const { startTime, endTime } = getNowTime(dateRangeValue)
|
||||||
const timeFilter = ref({ startTime, endTime, dateRangeValue })
|
const timeFilter = ref({ startTime, endTime, dateRangeValue })
|
||||||
|
|
||||||
|
|||||||
@@ -238,20 +238,16 @@ export default {
|
|||||||
} else {
|
} else {
|
||||||
panelType = props.entity ? props.entity.type : panelTypeAndRouteMapping[params.typeName]
|
panelType = props.entity ? props.entity.type : panelTypeAndRouteMapping[params.typeName]
|
||||||
}
|
}
|
||||||
|
|
||||||
function isEntityDetail (t) {
|
|
||||||
return [4, 5, 6].indexOf(t) > -1
|
|
||||||
}
|
|
||||||
// 获取url携带的range、startTime、endTime
|
// 获取url携带的range、startTime、endTime
|
||||||
const rangeParam = query.range
|
const rangeParam = query.range
|
||||||
const startTimeParam = query.startTime
|
const startTimeParam = query.startTime
|
||||||
const endTimeParam = query.endTime
|
const endTimeParam = query.endTime
|
||||||
// 若url携带了,使用携带的值,否则使用默认值。
|
// 若url携带了,使用携带的值,否则使用默认值。
|
||||||
|
|
||||||
const dateRangeValue = rangeParam ? parseInt(query.range) : (isEntityDetail(panelType) ? 60 * 24 : 60)
|
const dateRangeValue = rangeParam ? parseInt(query.range) : 60
|
||||||
const timeFilter = ref({ dateRangeValue })
|
const timeFilter = ref({ dateRangeValue })
|
||||||
if (!startTimeParam || !endTimeParam) {
|
if (!startTimeParam || !endTimeParam) {
|
||||||
const { startTime, endTime } = getNowTime(isEntityDetail(panelType) ? 60 * 24 : 60)
|
const { startTime, endTime } = getNowTime(60)
|
||||||
timeFilter.value.startTime = startTime
|
timeFilter.value.startTime = startTime
|
||||||
timeFilter.value.endTime = endTime
|
timeFilter.value.endTime = endTime
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -129,6 +129,16 @@ export default {
|
|||||||
beforeUnmount () {
|
beforeUnmount () {
|
||||||
window.removeEventListener('resize', this.debounceFunc)
|
window.removeEventListener('resize', this.debounceFunc)
|
||||||
},
|
},
|
||||||
|
watch: {
|
||||||
|
top (n) {
|
||||||
|
const findIndex = this.anchorPoints.findLastIndex(a => a.top < n + 100)
|
||||||
|
if (findIndex > -1) {
|
||||||
|
this.anchorPoints.forEach((a, i) => {
|
||||||
|
a.isActive = i === findIndex
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
computed: {
|
computed: {
|
||||||
iconClass () {
|
iconClass () {
|
||||||
let className
|
let className
|
||||||
|
|||||||
Reference in New Issue
Block a user