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

2023-10-12 17:05:21 +08:00
parent 272b22d073 b6db314700
commit b182aa06fb
3 changed files with 3 additions and 0 deletions
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -123,6 +123,7 @@ export default {
  data () {
    return {
      // 详情相关
+      orderBy: 'id',
      fromRoute: fromRoute,
      graphShow: false,
      chartDatas: [],
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -188,6 +188,7 @@ export default {
  },
  data () {
    return {
+      orderBy: 'id',
      stateOptions: alertMessageConstant.states,
      url: 'alert/message',
      urlNew: 'alert/message/query',
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -212,6 +212,7 @@ export default {
  mixins: [dataListMixin, routerPathParams],
  data () {
    return {
+      orderBy: 'id',
      chartLoading: false,
      chartInfo: {},
      alertMessageNzTableHeightOffset: 242,