diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue index f35058614..60a94070d 100644 --- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue +++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue @@ -87,7 +87,7 @@ export default { methods: { dateChange () { const nowTimeType = this.$refs.pickTime.$refs.timePicker.nowTimeType - this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType) + this.setSearchTime('searchTime', nowTimeType) this.filter.start_time = bus.timeFormate(this.searchTime[0]) this.filter.end_time = bus.timeFormate(this.searchTime[1]) this.filter.value = this.searchTime[2] @@ -103,28 +103,28 @@ export default { closeDialog () { this.$emit('close') }, - setSearchTime (type, val, nowTimeType) { // 设置searchTime - if (type === 'minute') { - const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setMinutes(new Date(bus.computeTimezone(new Date().getTime())).getMinutes() - val)) - const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))) - this.$set(this.searchTime, 0, startTime) - this.$set(this.searchTime, 1, endTime) - this.$set(this.searchTime, 2, val + 'm') - } else if (type === 'hour') { - const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - val)) - const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))) - this.$set(this.searchTime, 0, startTime) - this.$set(this.searchTime, 1, endTime) - this.$set(this.searchTime, 2, val + 'h') - } else if (type === 'date') { - const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setDate(new Date(bus.computeTimezone(new Date().getTime())).getDate() - val)) - const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))) - this.$set(this.searchTime, 0, startTime) - this.$set(this.searchTime, 1, endTime) - this.$set(this.searchTime, 2, val + 'd') - } - this.$refs.pickTime.$refs.timePicker.searchTime = this.searchTime - }, + // setSearchTime (type, val, nowTimeType) { // 设置searchTime + // if (type === 'minute') { + // const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setMinutes(new Date(bus.computeTimezone(new Date().getTime())).getMinutes() - val)) + // const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))) + // this.$set(this.searchTime, 0, startTime) + // this.$set(this.searchTime, 1, endTime) + // this.$set(this.searchTime, 2, val + 'm') + // } else if (type === 'hour') { + // const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - val)) + // const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))) + // this.$set(this.searchTime, 0, startTime) + // this.$set(this.searchTime, 1, endTime) + // this.$set(this.searchTime, 2, val + 'h') + // } else if (type === 'date') { + // const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setDate(new Date(bus.computeTimezone(new Date().getTime())).getDate() - val)) + // const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))) + // this.$set(this.searchTime, 0, startTime) + // this.$set(this.searchTime, 1, endTime) + // this.$set(this.searchTime, 2, val + 'd') + // } + // this.$refs.pickTime.$refs.timePicker.searchTime = this.searchTime + // }, showTime (type) { switch (type) { case 'line' : @@ -205,10 +205,10 @@ export default { this.nowType.end_time = this.searchTime[1] if (!this.nowTimeType) { this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType) - this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType) + this.setSearchTime('searchTime', this.nowType) } else { this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType) - this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType) + this.setSearchTime('searchTime', this.nowType) } } } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index e44a6c8f5..42a231d9c 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -323,49 +323,10 @@ export default { this.searchTimeHeader[0] = q.startAt ? this.momentTz(q.startAt) : '' this.searchTimeHeader[1] = q.endAt ? this.momentTz(q.endAt) : '' this.searchTimeHeader[2] = q.timeType - switch (this.searchTimeHeader[2]) { - case '5m' : - this.defaultPick = 1 - break - case '15m' : - this.defaultPick = 2 - break - case '30m' : - this.defaultPick = 3 - break - case '1h' : - this.defaultPick = 4 - break - case '3h' : - this.defaultPick = 5 - break - case '6h' : - this.defaultPick = 6 - break - case '12h' : - this.defaultPick = 7 - break - case '1d' : - this.defaultPick = 8 - break - case '24h' : - this.defaultPick = 8 - break - case '2d' : - this.defaultPick = 9 - break - case '7d' : - this.defaultPick = 10 - break - case '30d' : - this.defaultPick = 11 - break - case 'all' : - this.defaultPick = 12 - break - default: - this.defaultPick = 0 + if (!q.startAt) { + this.searchTimeHeader[2] = 'all' } + this.initTimeType(this.searchTimeHeader[2]) // this.defaultPick = 11 }, labelsSort (obj) { diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js index 28c26e9f2..955bb7d22 100644 --- a/nezha-fronted/src/components/common/mixin/routerPathParams.js +++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js @@ -237,6 +237,75 @@ export default { delete obj[key] } }) + }, + initTimeType (value) { + switch (value) { + case '5m' : + this.defaultPick = 1 + break + case '15m' : + this.defaultPick = 2 + break + case '30m' : + this.defaultPick = 3 + break + case '1h' : + this.defaultPick = 4 + break + case '3h' : + this.defaultPick = 5 + break + case '6h' : + this.defaultPick = 6 + break + case '12h' : + this.defaultPick = 7 + break + case '1d' : + this.defaultPick = 8 + break + case '24h' : + this.defaultPick = 8 + break + case '2d' : + this.defaultPick = 9 + break + case '7d' : + this.defaultPick = 10 + break + case '30d' : + this.defaultPick = 11 + break + case 'all' : + this.defaultPick = 12 + break + case '0t' : + this.defaultPick = 13 + break + case '1t' : + this.defaultPick = 14 + break + case '2t' : + this.defaultPick = 15 + break + case '7t' : + this.defaultPick = 16 + break + case '0w' : + this.defaultPick = 17 + break + case '1w' : + this.defaultPick = 18 + break + case '0m' : + this.defaultPick = 19 + break + case '1m' : + this.defaultPick = 20 + break + default: + this.defaultPick = 0 + } } } } diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index 9b25d5ee6..5f6b126dd 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -201,14 +201,14 @@ export default { { id: 9, text: this.$t('dashboard.dashboard.lastTwoDay'), type: 'date', value: 2 }, { id: 10, text: this.$t('dashboard.dashboard.lastSevenDay'), type: 'date', value: 7 }, { id: 11, text: this.$t('dashboard.dashboard.lastThirtyDay'), type: 'date', value: 30 }, - { id: 13, text: 'today', type: 'relative', value: 0 }, - { id: 14, text: 'Yesterday ', type: 'relative', value: 1 }, - { id: 15, text: 'The day before yesterday', type: 'relative', value: 2 }, - { id: 16, text: 'This day last week', type: 'relative', value: 7 }, - { id: 17, text: 'This week', type: 'relative', value: 0 }, - { id: 18, text: 'Previous week', type: 'relative', value: 1 }, - { id: 19, text: 'This month', type: 'relative', value: 0 }, - { id: 20, text: 'Previous month', type: 'relative', value: 1 } + { id: 13, text: this.$t('el.datepicker.today'), type: 'relative', value: 0 }, + { id: 14, text: this.$t('time.yesterday'), type: 'relative', value: 1 }, + { id: 15, text: this.$t('time.beforeYesterday'), type: 'relative', value: 2 }, + { id: 16, text: this.$t('time.lastWeekDay'), type: 'relative', value: 7 }, + { id: 17, text: this.$t('time.thisWeek'), type: 'relative', value: 0 }, + { id: 18, text: this.$t('time.previousWeek'), type: 'relative', value: 1 }, + { id: 19, text: this.$t('time.thisMonth'), type: 'relative', value: 0 }, + { id: 20, text: this.$t('time.previousMonth'), type: 'relative', value: 1 } ], relativeData: [ ], diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index dbeb15734..0e669bafb 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -452,49 +452,7 @@ export default { if (!q.startAt) { this.searchTime[2] = 'all' } - switch (this.searchTime[2]) { - case '5m' : - this.defaultPick = 1 - break - case '15m' : - this.defaultPick = 2 - break - case '30m' : - this.defaultPick = 3 - break - case '1h' : - this.defaultPick = 4 - break - case '3h' : - this.defaultPick = 5 - break - case '6h' : - this.defaultPick = 6 - break - case '12h' : - this.defaultPick = 7 - break - case '1d' : - this.defaultPick = 8 - break - case '24h' : - this.defaultPick = 8 - break - case '2d' : - this.defaultPick = 9 - break - case '7d' : - this.defaultPick = 10 - break - case '30d' : - this.defaultPick = 11 - break - case 'all' : - this.defaultPick = 12 - break - default: - this.defaultPick = 0 - } + this.initTimeType(this.searchTime[2]) // this.defaultPick = 11 }, batchAck () {