From 1beab79d7fef78ee40544a82c96212abe64d59c5 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Thu, 20 May 2021 18:45:27 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-649=20fix:=20alert=20silence=20=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=BD=93=20state=20=3D=203?=
 =?UTF-8?q?=20(expired)=20=E7=A6=81=E7=94=A8=20edit=20=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-detail.vue          | 2 +-
 .../src/components/common/table/alert/alertSilenceTable.vue   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-detail.vue b/nezha-fronted/src/components/charts/chart-detail.vue
index aab93e483..cf746b9f4 100644
--- a/nezha-fronted/src/components/charts/chart-detail.vue
+++ b/nezha-fronted/src/components/charts/chart-detail.vue
@@ -410,7 +410,7 @@ export default {
       this.panelIdInner = panelId
       this.data = chartItem
       this.detail = detail
-      console.info(this.data, this.detail)
+      // console.info(this.data, this.detail)
       /* if (this.detail[0] && this.detail[0].type && this.detail[0].type == 'endpointInfo') { // endpointInfo的小图表
         this.$nextTick(() => {
           this.initChart(this.detail[0].data.stateSeries)
diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
index 5e64115ed..5677959d5 100644
--- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue
@@ -89,7 +89,7 @@
       fixed="right">
       <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
       <div slot-scope="scope" class="table-operation-items">
-        <button class="table-operation-item" v-has="'alertSilence_edit'"  @click="$emit('edit', scope.row)"><i class="nz-icon nz-icon-edit"></i></button>
+        <button class="table-operation-item" v-has="'alertSilence_edit'" @click="$emit('edit', scope.row)" :disabled="scope.row.state == 3"><i class="nz-icon nz-icon-edit"></i></button>
         <el-dropdown size="medium" v-has="['alertSilence_expire']" trigger="hover" @command="tableOperation">
           <div class="table-operation-item table-operation-item--more">
             <span>…</span><i class="nz-icon nz-icon-arrow-down"></i>
@@ -205,7 +205,7 @@ export default {
           result2.push(item)
         }
       })
-      console.log([...result, ...result2])
+      // console.log([...result, ...result2])
       return [...result, ...result2]
     }
   }