fix: 实体默认时间范围改为1天
This commit is contained in:
@@ -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 = [
|
||||
{
|
||||
|
||||
@@ -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 })
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user