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

This commit is contained in:
zyh
2023-11-01 17:24:51 +08:00
4 changed files with 8 additions and 8 deletions

View File

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

View File

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

View File

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

View File

@@ -98,7 +98,7 @@ export default {
const params = {
...this.pageObj,
queryValue: this.searchStr,
orderBy: 'uts'
orderBy: '-uts'
}
if (this.type === 'metric') {
params.queryKey = 'explore-metric'
@@ -151,7 +151,7 @@ export default {
const params = {
pageNo: 1,
queryValue: this.searchStr,
orderBy: 'uts',
orderBy: '-uts',
pageSize
}
if (this.type === 'metric') {