From 80f8f19840557736e5168f9f3f5a06c6cc2b6463 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 26 Apr 2023 13:41:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E9=9A=90=E8=97=8FalertMessahgeI?=
 =?UTF-8?q?nfo=20dashboard=20chart=E7=9A=84=E5=85=A8=E5=B1=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chartHeader.vue            | 2 +-
 .../src/components/common/alert/alertMessageInfoTab.vue       | 3 ++-
 .../page/integration/integration-tabs/dashboard.vue           | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue
index a6406b970..13b9ec485 100644
--- a/nezha-fronted/src/components/chart/chartHeader.vue
+++ b/nezha-fronted/src/components/chart/chartHeader.vue
@@ -66,7 +66,7 @@
            <i class="nz-icon nz-icon-replay tool__icon"></i>
         </div>
       </span>
-      <span v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.type!=='group'" class="chart-header__tool" @click="showFullscreen">
+      <span v-if="from !== this.$CONSTANTS.fromRoute.chartTemp && chartInfo.type!=='group' && showTool" class="chart-header__tool" @click="showFullscreen">
         <div :title="$t('dashboard.screen')" effect="light" placement="top">
            <i class="nz-icon nz-icon-maxview tool__icon"></i>
         </div>
diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
index 83545db42..22ef02b51 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue
@@ -118,8 +118,9 @@ export default {
             }
           })
           // && n.alertRule.dashboardId
+          n.alertRule && (n.alertRule.dashboardId = 102224)
           if (n.alertRule && n.alertRule.dashboardId) {
-            // n.alertRule.dashboardId = 1487
+            //
             this.cardNames.push({
               key: 'dashboard',
               label: this.$t('overall.dashboard')
diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue b/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue
index 2621b2814..268e4edf5 100644
--- a/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue
+++ b/nezha-fronted/src/components/page/integration/integration-tabs/dashboard.vue
@@ -174,7 +174,9 @@ export default {
             this.getData(this.filter)
           }
         }
-        this.chartListLoading = false
+        if (this.urlType === 'template') {
+          this.chartListLoading = false
+        }
       }).catch((error) => {
         this.chartListLoading = false
         if (error) {