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

2023-11-29 17:09:50 +08:00
parent 9d8eb86593 34fbaa6558
commit adf00be75b
1 changed files with 4 additions and 0 deletions
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -257,6 +257,10 @@ export default {
  computed: {
    getDuration () {
      return function (record) {
+        // 当 state = active | silence 时，duration = 当前服务器时间（result.time）- startAt
+        if (record.state == 1 || record.state == 2) {
+          return calcDurationByStringTimeB(record.startAt, this.nowTime)
+        }
        if (record.endAt) {
          return calcDurationByStringTimeB(record.startAt, record.endAt)
        }