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

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

Browse Source
This commit is contained in:
zyh
2023-11-29 18:01:34 +08:00
parent adf00be75b bbce008554
commit 4e26e2de9c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
View File

@@ -259,12 +259,12 @@ export default {
return function (record) { return function (record) {
// 当 state = active | silence 时，duration = 当前服务器时间（result.time）- startAt // 当 state = active | silence 时，duration = 当前服务器时间（result.time）- startAt
if (record.state == 1 || record.state == 2) { if (record.state == 1 || record.state == 2) {
return calcDurationByStringTimeB(record.startAt, this.nowTime) return calcDurationByStringTimeB(record.startAt, this.timezoneToUtcTimeStr(this.nowTime))
} }
if (record.endAt) { if (record.endAt) {
return calcDurationByStringTimeB(record.startAt, record.endAt) return calcDurationByStringTimeB(record.startAt, record.endAt)
} }
return calcDurationByStringTimeB(record.startAt, this.nowTime) return calcDurationByStringTimeB(record.startAt, this.timezoneToUtcTimeStr(this.nowTime))
} }
} }
}, },