From 1a7f68a1740f921bc73f8c48a1a7e080b289c78a Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 6 May 2022 17:31:02 +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

---
 .../src/components/common/mixin/table.js      |  4 ++++
 .../common/table/alert/alertMessageTable.vue  |  4 ++--
 .../components/page/alert/alertMessage.vue    | 24 ++++++++++++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/mixin/table.js b/nezha-fronted/src/components/common/mixin/table.js
index 584e82c9b..69244d5cd 100644
--- a/nezha-fronted/src/components/common/mixin/table.js
+++ b/nezha-fronted/src/components/common/mixin/table.js
@@ -37,6 +37,10 @@ export default {
           this.$emit('del', row)
           break
         }
+        case 'ack': {
+          this.$emit('acknowledge', row)
+          break
+        }
         case 'recordTab': {
           this.$emit('showBottomBox', 'recordTab', row)
           break
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index c6f3459bd..0cb165399 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -111,7 +111,7 @@
               <!--            <el-dropdown-item :command="['showText', scope.row]"><i class="nz-icon nz-icon-guzhangshuju"></i><span class="operation-dropdown-text">{{$t('alert.config.trbShot')}}</span></el-dropdown-item>-->
               <el-dropdown-item v-has="'alertMessage_view'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
               <el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'alertMessage']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
-              <el-dropdown-item v-has="'alertMessage_expired'" :disabled="scope.row.ack === 1"><i class="nz-icon nz-icon-queren"></i><span class="operation-dropdown-text">{{$t('overall.acknowledge')}}</span></el-dropdown-item>
+              <el-dropdown-item v-has="'alertMessage_expired'" :disabled="scope.row.ack === 1" :command="['ack', scope.row]"><i class="nz-icon nz-icon-queren"></i><span class="operation-dropdown-text">{{$t('overall.acknowledge')}}</span></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -186,7 +186,7 @@ export default {
           label: 'ID',
           prop: 'id',
           show: true,
-          width: 160,
+          width: 180,
           sortable: 'custom'
         }, {
           label: this.$t('alert.rule'),
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 7deac5193..661b2ac47 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -60,6 +60,7 @@
           :table-data="tableData"
           :loading="tools.loading"
           @del="del"
+          @acknowledge="acknowledge"
           @edit="edit"
           @showText="showText"
           @orderBy="tableDataSort"
@@ -541,7 +542,7 @@ export default {
         const obj = {}
         this.batchDeleteObjs.forEach(item => {
           obj.id = item.id
-          obj.ack = item.ack
+          obj.ack = 1
           params.push(obj)
         })
         this.$put('alert/message/ack', params).then(response => {
@@ -632,6 +633,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)
+          }
+        })
+      })
+    },
     messageDetail (row) {
       // this.sign = Number(row.alertRule.id)
       this.$get('/alert/rule/' + row.alertRule.id).then(res => {