From 6225903465d6c303a40e90bb9ce9bcea7a08a329 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 19 Apr 2023 10:28:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=A4=84=E7=90=86=E5=B7=B2?=
 =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=E7=9A=84=E5=9B=BE=E7=89=87=20?=
 =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/project/meta2d/js/meta2dMain.js  |  2 ++
 .../components/common/project/meta2d/js/topoUtil.js    | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
index 1641673fe..d52d11a91 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js
@@ -156,6 +156,8 @@ export default {
         pen.imageId = pen.data.imageId
         if (imageInfo) {
           pen.image = `/topology/icon/0/${imageInfo.unit}/${imageInfo.name}`
+        } else {
+          pen.image = ''
         }
       }
       pen.data = {
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 904ac8b35..84384b32b 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js
@@ -30,7 +30,6 @@ export default {
       getTopology(this.meta2dId)._setValue(node)
     },
     getQueryValues (elements, startTime, endTime) {
-      console.log(elements)
       this.meta2dLoading = true
       return new Promise(resolve => {
         const step = bus.getStep(startTime, endTime)
@@ -156,6 +155,15 @@ export default {
             pen.moduleId = pen.data.moduleId
             delete pen.data.moduleId
           }
+
+          if (!isNaN(pen.imageId) && pen.imageId) {
+            const imageInfo = this.iconArray.find(item => item.id === pen.imageId)
+            if (imageInfo) {
+              pen.image = `/topology/icon/0/${imageInfo.unit}/${imageInfo.name}`
+            } else {
+              pen.image = ''
+            }
+          }
           if (pen.icon) {
             pen.iconFamily = 'nz-icon'
           }