From 72b16c9b5ee7a988b477420607a97450348d869d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 10 Mar 2022 10:20:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20=E5=BA=95?=
 =?UTF-8?q?=E9=83=A8=E5=BC=B9=E7=AA=97=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=8F=82=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue       | 10 +++++++++-
 nezha-fronted/src/components/common/mixin/dataList.js  |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index fcdddf73c..912ffa325 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -25,7 +25,7 @@
         <alertMessageTable
           ref="dataTable"
           :api="url"
-          :orderByFa="'id'"
+          :orderByFa="orderBy"
           :loading="tools.loading"
           :custom-table-title="tools.customTableTitle"
           :height="subTableHeight"
@@ -156,6 +156,14 @@ export default {
           this.getTableData()
         }
       }
+    },
+    orderBy: {
+      immediate: true,
+      handler (n) {
+        if (n) {
+         console.log(n)
+        }
+      }
     }
   },
   data () {
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index 87d709da8..446161370 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -337,7 +337,7 @@ export default {
   },
   created () {
     const path = this.$route.fullPath.match(/\/(\S*)\?/)[1]
-    if (this.$route.query.orderBy) {
+    if (this.$route.query.orderBy && !this.isSubList) {
       this.orderBy = this.$route.query.orderBy
     }
     let searchKeys = {}