From b50e87234a1c6a3cb086314789522ac698234ea2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 11 Apr 2023 11:53:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=20integration=20=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E9=A1=B5=E9=9D=A2=E9=9A=90=E8=97=8F=20alert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integration/integration-tabs/integration-tabs.vue    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue b/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue
index 250683b09..91c8af676 100644
--- a/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue
+++ b/nezha-fronted/src/components/page/integration/integration-tabs/integration-tabs.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="integration-tabs">
     <ul class="integration-tabs-nav">
-      <li class="integration-tabs-nav-item" :class="{active:tabId===item.id}"  v-for="item in tabs" :key="item.id" @click="tabChange(item.id)">{{item.name}}</li>
+      <li class="integration-tabs-nav-item" :class="{active:tabId===item.id}"  v-for="item in filterTabs" :key="item.id" @click="tabChange(item.id)">{{item.name}}</li>
     </ul>
     <div class="integration-tabs-content">
       <!-- internal -->
@@ -10,7 +10,7 @@
       <!-- module -->
       <configuration v-if="tabId==='configuration'" :configuration="detailsObj.configuration"></configuration>
       <dashboard v-if="tabId==='dashboard'" :tempId="detailsObj.tempId"></dashboard>
-      <alert v-if="tabId==='alert'" :moduleId="detailsObj.id"></alert>
+<!--      <alert v-if="tabId==='alert'" :moduleId="detailsObj.id"></alert>-->
       <metric v-if="tabId==='metric'" :moduleId="detailsObj.id"></metric>
     </div>
   </div>
@@ -37,6 +37,11 @@ export default {
     alert,
     metric
   },
+  computed: {
+    filterTabs () {
+      return this.tabs.filter(item=> item.id !== 'alert')
+    }
+  },
   data () {
     return {
       tabs: [],

From 407c889dcce411e7ede586ac5a3a811dcc9912ac Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 11 Apr 2023 14:33:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E5=88=A0=E9=99=A4internal=20?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/project/meta2d/js/topoUtil.js       | 4 ++++
 nezha-fronted/src/components/page/integration/integration.vue | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
index 918762edb..cf7c06035 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
@@ -151,6 +151,10 @@ export default {
           if (!pen.moduleId) {
             pen.moduleId = ''
           }
+          if (pen.data && pen.data.moduleId) {
+            pen.moduleId = pen.data.moduleId
+            delete pen.data.moduleId
+          }
           if (pen.icon) {
             pen.iconFamily = 'nz-icon'
           }
diff --git a/nezha-fronted/src/components/page/integration/integration.vue b/nezha-fronted/src/components/page/integration/integration.vue
index 3f4058844..2651cc4fb 100644
--- a/nezha-fronted/src/components/page/integration/integration.vue
+++ b/nezha-fronted/src/components/page/integration/integration.vue
@@ -7,7 +7,7 @@
         <img class="integration-icon" :src="talon.icon" alt="">
         <h2 class="integration-name">{{talon.name}}</h2>
         <p class="integration-remark">{{talon.remark}}</p>
-        <div class="integration-internal">{{$t('integration.internal')}}</div>
+<!--        <div class="integration-internal">{{$t('integration.internal')}}</div>-->
       </li>
     </ul>
     <!-- Available Integration -->