diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue index 406ed1055..f854cbe1a 100644 --- a/nezha-fronted/src/components/common/pagination.vue +++ b/nezha-fronted/src/components/common/pagination.vue @@ -15,7 +15,6 @@ - @@ -102,6 +101,7 @@ export default { wraps.forEach(wrap => { if (wrap) { wrap.scrollTop = 0 + wrap.scrollLeft = 0 } }) }) diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index 06a46ae03..4026cca33 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -113,8 +113,8 @@ fixed="right">
{{$t('overall.option')}}
- - + +
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 3e546c15d..d24572f7f 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -453,7 +453,11 @@ export default { } this.$get('/alert/rule/' + row.alertRule.id).then(res => { this.currentMsg = { ...row, alertRule: { ...res.data } } - this.graphShow = true + if (row.alertRule.type !== 1) { + this.graphShow = false + } else { + this.graphShow = true + } this.$nextTick(() => { this.searchTimeDialog = [bus.computeTimezoneTime(new Date().getTime() - 1 * 60 * 60 * 1000), bus.computeTimezoneTime(new Date().getTime())] this.queryDate()