From ce4817ea420f0e05e772190ade47ba5fe8be68c8 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Tue, 22 Mar 2022 10:04:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dipam=20=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=20=E6=90=9C=E7=B4=A2=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=A0=E5=8F=82=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/IpDetails.vue | 10 ++++------
 .../common/bottomBox/tabs/alertMessageTabNew.vue       |  2 +-
 .../common/table/settings/ipDetailsTable.vue           |  2 --
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
index 27b3f0dbf..195b003da 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
@@ -118,14 +118,12 @@ export default {
         }, {
           name: 'IP',
           type: 'input',
-          label: 'manageIp',
+          label: 'addr',
           disabled: false
         }, {
           name: this.$t('asset.state'),
-          type: 'assetState',
-          label: 'stateIds',
-          id: 'stateIds',
-          readonly: true,
+          type: 'input',
+          label: 'state',
           disabled: false
         }]
       }
@@ -144,7 +142,7 @@ export default {
         delete this.searchLabel.orderBy
       }
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
-      this.$set(this.searchLabel, 'ids', this.obj.id)
+      this.$set(this.searchLabel, 'subnetId', this.obj.id)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
       this.tools.loading = true
       this.$get(this.url, { ...this.searchLabel }).then(response => {
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 61abbd155..4ddd1c09a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -164,7 +164,7 @@ export default {
       immediate: true,
       handler (n) {
         if (n) {
-         // console.log(n)
+          // console.log(n)
         }
       }
     }
diff --git a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
index e3034abee..2a556268a 100644
--- a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue
@@ -116,13 +116,11 @@ export default {
           prop: 'mac',
           show: true,
           minWidth: 200,
-          sortable: 'custom'
         }, {
           label: this.$t('config.ipamip.asset'),
           prop: 'asset',
           show: true,
           width: 200,
-          sortable: 'custom'
         }, {
           label: this.$t('overall.state'),
           prop: 'state',