gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.8' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.9

Browse Source
This commit is contained in:
zhangyu
2023-11-01 16:14:10 +08:00
parent 134217eae3 6371ef5b02
commit bc8a73326c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/chart/chart/chartLog.vue
View File

@@ -240,8 +240,8 @@ export default {
const descending = this.operations.descending const descending = this.operations.descending
const params = { const params = {
logql: this.chartInfo.elements.map(item => item.expression), logql: this.chartInfo.elements.map(item => item.expression),
start: this.$stringTimeParseToUnix(this.filterTime[0]), start: this.momentStrToTimestamp(this.filterTime[0]),
end: this.$stringTimeParseToUnix(this.filterTime[1]), end: this.momentStrToTimestamp(this.filterTime[1]),
direction: descending ? 'backward' : 'forward', direction: descending ? 'backward' : 'forward',
limit limit
} }

4
nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
View File

@@ -103,8 +103,8 @@ export default {
exportLog ({ limit, descending }) { exportLog ({ limit, descending }) {
const params = { const params = {
logql: this.expressions, logql: this.expressions,
start: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[0])), start: this.momentStrToTimestamp(this.filterTime[0]),
end: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[1])), end: this.momentStrToTimestamp(this.filterTime[1]),
direction: descending ? 'backward' : 'forward', direction: descending ? 'backward' : 'forward',
limit limit
} }

4
nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
View File

@@ -3842,8 +3842,8 @@ export default {
exportLog ({ limit, descending }) { exportLog ({ limit, descending }) {
const params = { const params = {
logql: this.expressions, logql: this.expressions,
start: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[0])), start: this.momentStrToTimestamp(this.filterTime[0]),
end: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[1])), end: this.momentStrToTimestamp(this.filterTime[1]),
direction: descending ? 'backward' : 'forward', direction: descending ? 'backward' : 'forward',
limit limit
} }