From 278c91338b87b3725ee9c7f993414e180658871b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 22 Sep 2021 17:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=20fix=EF=BC=9B=20=E5=A4=84=E7=90=86=E5=95=8Aal?=
 =?UTF-8?q?ertRule=20=E5=88=A0=E9=99=A4=E6=97=B6alertMessage=E6=9C=89?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E7=A9=BA=E7=99=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/alert/alertMessageTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 4dec92cd4..c2da839a7 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -36,7 +36,7 @@
     >
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'alertRule'">
-          <div v-if="scope.row.alertRule.name" >
+          <div v-if="scope.row.alertRule&&scope.row.alertRule.name" >
             <el-popover
               placement="right"
               popper-class="alert-message-tooltip"
@@ -45,7 +45,7 @@
               @hide="alertMessageHover(scope.row.alertRule, false)"
               trigger="hover">
               <alertRuleInfo v-if="scope.row.alertRule.loading" :id="scope.row.alertRule.id" :severity-data="severityData" :that="scope.row.alertRule" @showText="$emit('showText',scope.row)"></alertRuleInfo>
-              <span slot="reference" class="data-column__span">{{scope.row.alertRule.name}}</span>
+              <span slot="reference" class="data-column__span">{{scope.row.alertRule?scope.row.alertRule.name : '--'}}</span>
             </el-popover>
           </div>
           <template v-else>-</template>
@@ -112,7 +112,7 @@
       fixed="right">
       <div slot="header" class="table-operation-title">{{$t('overall.option')}}</div>
       <div slot-scope="scope" class="table-operation-items">
-        <button v-if="scope.row.alertRule.type !== 3" class="table-operation-item" @click="$emit('messageDetail', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
+        <button v-if="scope.row.alertRule&&scope.row.alertRule.type !== 3" class="table-operation-item" @click="$emit('messageDetail', scope.row)"><i class="nz-icon nz-icon-view1"></i></button>
         <el-dropdown v-has="['alertMessage_expired']" size="medium" trigger="hover" @command="tableOperation">
           <div class="table-operation-item table-operation-item--more">
             <i class="nz-icon nz-icon-more3"></i>