diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue index e50febbe5..16ed248b0 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue @@ -110,7 +110,9 @@ export default { editShow: false, show: false }, - fromBottom: true + fromBottom: true, + needAlertDaysData: true, + trendKey: 'endpointId' } }, methods: { @@ -136,6 +138,25 @@ export default { item.config = JSON.parse(item.config) }) } + if (this.needAlertDaysData) { + response.data.list.forEach(item => { + item.trendLoading = true + item.alertDaysData = [ + { + metric: { priority: 'P1' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P2' }, + values: [[0, 0]] + }, + { + metric: { priority: 'P3' }, + values: [[0, 0]] + } + ] + }) + } this.tableData = response.data.list this.nowTime = this.utcTimeToTimezoneStr(response.time) this.pageObj.total = response.data.total diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js index abba627b9..5be856c43 100644 --- a/nezha-fronted/src/components/common/mixin/table.js +++ b/nezha-fronted/src/components/common/mixin/table.js @@ -1,4 +1,9 @@ +import alertDaysInfo from '@/components/common/alert/alertDaysInfo' + export default { + components: { + alertDaysInfo + }, props: { tableData: { type: Array diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index 13225af91..338f5ba95 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -41,9 +41,19 @@ {{scope.row[item.prop].name}} - - - {{scope.row.alertNum}} + + + + Alert message (active) + + {{$t('overall.result.total')}} + {{scope.row.alertNum}} + + + @@ -156,6 +166,8 @@ export default { }, data () { return { + needAlertDaysData: true, + trendKey: 'ruleId', tableTitle: [ { label: 'ID', diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue index e81271e1d..9437c3910 100644 --- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue @@ -89,9 +89,19 @@ > - - - {{scope.row.alertNum}} + + + + Alert message (active) + + {{$t('overall.result.total')}} + {{scope.row.alertNum}} + + + @@ -215,6 +225,8 @@ export default { }, data () { return { + needAlertDaysData: true, + trendKey: 'endpointId', tableTitle: [ // 原始table列 { label: 'ID', diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue index fff7e500e..61d83bde5 100644 --- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue @@ -51,9 +51,19 @@ - - - {{scope.row[item.prop]}} + + + + Alert message (active) + + {{$t('overall.result.total')}} + {{scope.row.alertNum}} + + + {{scope.row[item.prop]}} @@ -104,6 +114,8 @@ export default { }, data () { return { + needAlertDaysData: true, + trendKey: 'moduleId', tableTitle: [ // 原始table列 { label: 'ID', diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue index 2d20d3ebf..0e2cf66b1 100644 --- a/nezha-fronted/src/components/common/table/settings/projectTable.vue +++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue @@ -54,9 +54,21 @@ - - - {{scope.row[item.prop]}} + + + + + Alert message (active) + + {{$t('overall.result.total')}} + {{scope.row.alertNum}} + + + + {{scope.row[item.prop]}} @@ -96,6 +108,7 @@