From c32683b1739ba9a22c82f7bb812a4e712b8cb2c8 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Sat, 7 May 2022 11:16:17 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1849=20feat=20=EF=BC=9Aalert=20message?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=20=E5=A2=9E=E5=8A=A0=20ack?=
 =?UTF-8?q?nowledge=20=E7=8A=B6=E6=80=81=E5=8F=8A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bottomBox/tabs/alertMessageTabNew.vue     | 28 +++++++++++++++++++
 .../src/components/common/searchInput.vue     |  4 +--
 .../components/common/searchSelectInfo.vue    |  6 ++--
 .../components/page/alert/alertMessage.vue    |  9 +++---
 4 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 4de64861c..bb1ac0e8d 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -33,6 +33,7 @@
           :table-data="tableData"
           :alertMessageTabNew="true"
           @del="del"
+          @acknowledge="acknowledge"
           class="bottom-box__top"
           @showText="showText"
           @edit="edit"
@@ -230,6 +231,12 @@ export default {
             type: 'input',
             label: 'labels',
             disabled: false
+          }, {
+            name: this.$t('overall.acknowledge'),
+            type: 'selectString',
+            label: 'ack',
+            readonly: true,
+            disabled: false
           }
         ]
       },
@@ -311,6 +318,27 @@ export default {
         })
       })
     },
+    acknowledge (row) {
+      this.$confirm(this.$t('tip.confirmAck'), {
+        confirmButtonText: this.$t('tip.yes'),
+        cancelButtonText: this.$t('tip.no'),
+        type: 'warning'
+      }).then(() => {
+        const params = []
+        const obj = {}
+        obj.id = row.id
+        obj.ack = 1
+        params.push(obj)
+        this.$put('alert/message/ack', params).then(response => {
+          if (response.code == 200) {
+            this.$message({ duration: 1000, type: 'success', message: this.$t('tip.ackSuccess') })
+            this.getTableData()
+          } else {
+            this.$message.error(response.msg)
+          }
+        })
+      })
+    },
     getTableData (state) {
       if (state) {
         this.state = state
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index e3df0ecb1..9fd082a71 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -921,8 +921,8 @@ export default {
               objectInfo.operation = val.val
             } else if (val.label === 'state') {
               objectInfo.state = val.val
-            } else if (val.label === 'acknowledge') {
-              objectInfo.acknowledge = val.val
+            } else if (val.label === 'ack') {
+              objectInfo.ack = val.val
             }
           } else {
             objectInfo[val.label] = val.val
diff --git a/nezha-fronted/src/components/common/searchSelectInfo.vue b/nezha-fronted/src/components/common/searchSelectInfo.vue
index b0a809367..d8794b5de 100644
--- a/nezha-fronted/src/components/common/searchSelectInfo.vue
+++ b/nezha-fronted/src/components/common/searchSelectInfo.vue
@@ -173,13 +173,13 @@ const searchSelectInfo = { // value: 传给后台的值；label：显示给用
       label: i18n.t('overall.disabled')
     }
   ],
-  acknowledge: [
+  ack: [
     {
-      value: 'success',
+      value: '1',
       label: i18n.t('config.system.reset.yes')
     },
     {
-      value: 'fail',
+      value: '0',
       label: i18n.t('config.system.reset.no')
     }
   ],
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 661b2ac47..7b460b9fd 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -277,7 +277,7 @@ export default {
           }, {
             name: this.$t('overall.acknowledge'),
             type: 'selectString',
-            label: 'acknowledge',
+            label: 'ack',
             readonly: true,
             disabled: false
           }
@@ -539,10 +539,11 @@ export default {
       }).then(() => {
         this.delFlag = true
         const params = []
-        const obj = {}
         this.batchDeleteObjs.forEach(item => {
-          obj.id = item.id
-          obj.ack = 1
+          const obj = {
+            id: item.id,
+            ack: 1
+          }
           params.push(obj)
         })
         this.$put('alert/message/ack', params).then(response => {