From 5e438b5bbd2c45dcc160e1e00f07c12e25675cf1 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 25 Apr 2023 15:09:33 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2802=20fix=EF=BC=9A=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertMessageInfoTab.vue     | 6 +++---
 .../src/components/common/rightBox/alertRuleBox.vue         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
index ccad019ba..83545db42 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
@@ -118,11 +118,11 @@ export default {
             }
           })
           // && n.alertRule.dashboardId
-          if (n.alertRule) {
-            n.alertRule.dashboardId = 1487
+          if (n.alertRule && n.alertRule.dashboardId) {
+            // n.alertRule.dashboardId = 1487
             this.cardNames.push({
               key: 'dashboard',
-              label: this.$t('dashboard')
+              label: this.$t('overall.dashboard')
             })
           }
           if (n.alertRule && n.alertRule.trbShot && n.alertRule.trbShot != '<div  class="editor-core ql-container ql-snow"><div class="ql-editor"><p><br></p></div></div>') {
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index d67885b4a..d79afeae0 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -327,7 +327,7 @@
           <!--panel-->
           <el-form-item
             class="form-item--half-width"
-            :label="$t('overall.dashboard')"
+            :label="$t('overall.associateDashboard')"
             prop="dashboard"
           >
             <select-panel @setPanelName="setPanelName" ref="selectPanel" :disabled="false" :filter-panel="filterPanel" :chart-box="true" :panel-lock="true" :show-panel="showPanel" :panelData="panelData" :placement="'bottom-start'" @selectPanel="selectPanel">