From 0ec76cd5c51c2321142b06d5a6704f1447ed37cd Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Apr 2022 15:33:19 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20topology?=
 =?UTF-8?q?=20=E5=9B=BE=E7=89=87=20=E4=BB=A5=E5=8F=8A=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E9=87=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/js/common.js        | 13 ++++
 .../components/common/project/topologyL5.vue  | 65 +++++++++++++------
 2 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/nezha-fronted/src/components/common/js/common.js b/nezha-fronted/src/components/common/js/common.js
index c254fabe2..a7654d8b9 100644
--- a/nezha-fronted/src/components/common/js/common.js
+++ b/nezha-fronted/src/components/common/js/common.js
@@ -34,6 +34,7 @@ export function getHexagon (key) {
 const topologyCache = {}
 
 export function getTopology (key) {
+  // console.log(topologyCache, 'topologyCache')
   return topologyCache[`topology${key}`]
 }
 
@@ -41,6 +42,18 @@ export function setTopology (key, value) {
   topologyCache[`topology${key}`] = value
 }
 
+// const topologyImgList = localStorage.getItem('nz-imgList') ? JSON.parse(localStorage.getItem('nz-imgList')) : {}
+
+export function getTopologyImg (key) {
+  // console.log(topologyCache, 'topologyCache')
+  // console.log(localStorage.getItem('nz-img-' + key), !localStorage.getItem('nz-img-' + key))
+  return localStorage.getItem('nz-img-' + key)
+}
+
+export function setTopologyImg (key, img) {
+  localStorage.setItem('nz-img-' + key, img)
+}
+
 export function setHexagon (key, value) {
   hexagonCache[`hexagon${key}`] = value
 }
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index da74ed855..8c4498f21 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -1,9 +1,9 @@
-<style>
-  @import "./L5/css/iconfont.css";
-  @import "./L5/css/props.css";
-</style>
+<!--<style>-->
+<!--  @import "./L5/css/iconfont.css";-->
+<!--  @import "./L5/css/props.css";-->
+<!--</style>-->
 <template>
-  <div class="project-box list-page" v-loading="topologyLoading">
+  <div class="project-box list-page" v-my-loading="topologyLoading">
     <div class="main-list" :style="{height: fromOverView ?'100%' : 'calc(100% - 30px)'}">
       <div class="main-container" :class="fromOverView?'from-overview':'from-project'">
         <div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 40px);display: inline-block">
@@ -13,7 +13,7 @@
             <span class="el-dropdown-title"><i class="iconfont icon-cube"></i> <i
               class="nz-icon nz-icon-arrow-down"></i></span>
             <el-dropdown-menu slot="dropdown" @click="dropdownClick" class="right-box-select-top right-public-box-dropdown-top">
-              <div style="height: 450px"  v-loading="imgageLoading">
+              <div style="height: 450px"  v-my-loading="imgageLoading">
                 <el-card shadow="hover" style="height:420px;width:284px;overflow-y: auto"
                          class="project-topology-add-node">
                 <!--<div class="drag-header">——</div>-->
@@ -351,7 +351,7 @@ import {
   myCubec,
   myCubeAnchors
 } from './L5/services/canvas.js'
-import { getTopology, setTopology } from '../js/common'
+import { getTopology, setTopology, getTopologyImg, setTopologyImg } from '../js/common'
 import CanvasProps from './L5/CanvasProps'
 import topologyTopTool from './L5//topologyTopTool'
 import CanvasContextMenu from './L5/CanvasContextMenu'
@@ -774,9 +774,10 @@ export default {
           return
         }
         if (!getTopology(this.topologyIndex)) {
-          const canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions)
+          let canvas = new Topology('topology-canvas' + this.topologyIndexF, canvasOptions)
           canvas.open(data)
           setTopology(this.topologyIndex, canvas)
+          canvas = null
         } else {
           getTopology(this.topologyIndex).open(data)
         }
@@ -824,6 +825,7 @@ export default {
             this.saveData = { ...data }
             this.topologyInfo.name = this.obj.name
             resolve(data)
+            data = null
           } else {
             if (data.data) {
               this.topologyInfo = {
@@ -850,7 +852,7 @@ export default {
               if (!this.imgInit) {
                 return
               }
-              const promiseArr = []
+              const promiseArr = [this.$get('stat/module/abnormal', { projectId: this.obj.id })]
               const self = this
               for (let i = 0; i < data.pens.length; i++) {
                 const line = data.pens[i]
@@ -867,13 +869,13 @@ export default {
                   item.image = img ? img.image : imgDefault
                 }
                 if (item.type === 0) {
-                  promiseArr.push(this.$get('stat/module/abnormal', { moduleId: item.data.moduleId }))
+                  // promiseArr.push(this.$get('stat/module/abnormal', { moduleId: item.data.moduleId }))
                   item.data.state = {}
                   item.data.state.asset = false
                   item.data.state.endpoint = false
                   item.data.state.alert = false
                 } else {
-                  promiseArr.push({ type: 1 })
+                  // promiseArr.push({ type: 1 })
                   item.data.state = {}
                   item.data.state.asset = false
                   item.data.state.endpoint = false
@@ -898,13 +900,13 @@ export default {
                 data.bkColor = '#FFFFFF00'
               }
               Promise.all(promiseArr).then(res => {
-                res.forEach((response, index) => {
-                  const item = data.pens[index]
+                res[0].data.list.forEach((module, index) => {
+                  const item = data.pens.find(pens => module.id === pens.data.moduleId)
                   if (item.type === 0 && item.data.state && res[index].data.list.length) {
-                    item.data.state.error = item.data.error = !res[index].data.list[0].state
-                    item.data.state.asset = !!res[index].data.list[0].asset
-                    item.data.state.alert = !!res[index].data.list[0].alert
-                    item.data.state.endpoint = !!res[index].data.list[0].endpoint
+                    item.data.state.error = item.data.error = !module.state
+                    item.data.state.asset = !!module.asset
+                    item.data.state.alert = !!module.alert
+                    item.data.state.endpoint = !!module.endpoint
                   } else {
                     item.data.state = {
                       error: false,
@@ -916,10 +918,12 @@ export default {
                 })
                 self.saveData = { ...data }
                 resolve(data)
+                data = null
                 clearInterval(timer)
               }).catch(res => {
                 self.saveData = { ...data }
                 resolve(data)
+                data = null
                 clearInterval(timer)
               })
             }, 100)
@@ -1723,13 +1727,21 @@ export default {
           res.data.list.forEach((item, index) => {
             item.imageName = item.name
             delete item.name
-            promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.id}/1`))
+            if (getTopologyImg(item.id)) {
+              promiseArr.push(getTopologyImg(item.id))
+            } else {
+              promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.id}/1`))
+            }
             imgArr.push({ ...item })
           })
           Promise.all(promiseArr).then((res2, header) => {
             this.iconArray = [...res.data.list]
             this.iconArray.forEach((item, index) => {
-              item.image = res2[index].data
+              console.log(res2[index])
+              item.image = res2[index].data || res2[index]
+              if (!getTopologyImg(item.id)) {
+                setTopologyImg(item.id, item.image)
+              }
               const group = this.tools.find(tool => tool.group === item.unit)
               if (group) {
                 group.children.push({
@@ -1780,7 +1792,11 @@ export default {
           }
           imgidList.forEach((item, index) => {
             if (item.data.imageId && imageAllId.data.list.find(image => item.data.imageId === image.id)) {
-              promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`))
+              if (getTopologyImg(item.data.imageId)) {
+                promiseArr.push(getTopologyImg(item.data.imageId))
+              } else {
+                promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`))
+              }
             } else if (item.data.imageId) {
               promiseArr.push(imgDefault)
             } else {
@@ -1795,7 +1811,10 @@ export default {
             })
             this.iconArray.forEach((item, index) => {
               if (item.id) {
-                item.image = res2[index].data
+                item.image = res2[index].data || res2[index]
+                if (!getTopologyImg(item.id)) {
+                  setTopologyImg(item.id, item.image)
+                }
               }
             })
             this.imgInit = true
@@ -2254,6 +2273,10 @@ export default {
     if (getTopology(this.topologyIndex)) {
       getTopology(this.topologyIndex).destroy()
       setTopology(this.topologyIndex, null)
+      window.topology = null
+      window.Le5leTopologyPoint = null
+      window.topologyPoint = null
+      window.topologyRect = null
     }
     if (document.getElementById('topology-canvas' + this.topologyIndexF)) {
       document.getElementById('topology-canvas' + this.topologyIndexF).removeEventListener('mousemove', this.canvasMove)

From 852049c19a689aef74951fdcb0951d3ae1cbf4c6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Apr 2022 15:55:50 +0800
Subject: [PATCH 02/11] =?UTF-8?q?fix=EF=BC=9A=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=A2=E5=A4=B1=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart.vue | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue
index 59a184d91..862f804e4 100644
--- a/nezha-fronted/src/components/chart/chart.vue
+++ b/nezha-fronted/src/components/chart/chart.vue
@@ -172,15 +172,6 @@
         :is-fullscreen="isFullscreen"
         @chartIsNoData="chartIsNoData"
       ></chart-clock>
-      <chart-topology
-        :ref="'chart' + chartInfo.id"
-        v-if="isTopology(chartInfo.type)"
-        :chart-data="chartData"
-        :chart-info="chartInfo"
-        :chart-option="chartOption"
-        :is-fullscreen="isFullscreen"
-        @chartIsNoData="chartIsNoData"
-      ></chart-topology>
     </template>
   </div>
 </template>
@@ -233,8 +224,7 @@ export default {
     chartUrl,
     chartValue,
     chartHexagonD3,
-    chartMap,
-    chartTopology
+    chartMap
   },
   props: {
     chartInfo: Object,
@@ -303,7 +293,6 @@ export default {
     isTable,
     isGauge,
     isClock,
-    isTopology,
     chartIsNoData (flag) {
       this.chartChildrenData = flag
     },

From f444f8e9219408829d9a05f59732f9ddf1c90dc2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Apr 2022 16:18:43 +0800
Subject: [PATCH 03/11] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=20topology?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/chart/chartAutotopology.vue         |  2 +-
 .../components/common/project/topologyL5.vue  | 65 +++++++++++--------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
index f6e2bdd53..04f09289f 100644
--- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
+++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-my-loading="topologyLoading" class="overview">
+  <div v-loading="topologyLoading" class="overview">
     <transition name = "el-zoom-in-center">
       <div v-if="allProject&&allProject.length>0" style="width: 100%;height: 100%;position: relative">
         <el-carousel :interval="5000" :trigger="'click'" arrow="hover">
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index be2fc60df..488f7210e 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -3,7 +3,7 @@
 <!--  @import "./L5/css/props.css";-->
 <!--</style>-->
 <template>
-  <div class="project-box list-page" v-my-loading="topologyLoading">
+  <div class="project-box list-page" v-loading="topologyLoading">
     <div class="main-list" :style="{height: fromOverView ?'100%' : 'calc(100% - 30px)'}">
       <div class="main-container" :class="fromOverView?'from-overview':'from-project'">
         <div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 40px);display: inline-block">
@@ -13,7 +13,7 @@
             <span class="el-dropdown-title"><i class="iconfont icon-cube"></i> <i
               class="nz-icon nz-icon-arrow-down"></i></span>
             <el-dropdown-menu slot="dropdown" @click="dropdownClick" class="right-box-select-top right-public-box-dropdown-top">
-              <div style="height: 450px"  v-my-loading="imgageLoading">
+              <div style="height: 450px"  v-loading="imgageLoading">
                 <el-card shadow="hover" style="height:420px;width:284px;overflow-y: auto"
                          class="project-topology-add-node">
                 <!--<div class="drag-header">——</div>-->
@@ -1067,9 +1067,10 @@ export default {
 
     getNodesArr () {
       if (!getTopology(this.topologyIndex)) return
+      let arr = []
       this.offsetX = getTopology(this.topologyIndex).data.x
       this.offsetY = getTopology(this.topologyIndex).data.y
-      this.nodesArr = getTopology(this.topologyIndex).data.pens.filter(item => {
+      arr = getTopology(this.topologyIndex).data.pens.filter(item => {
         if (!item.data) {
           item.data = {
             moduleId: '',
@@ -1084,7 +1085,14 @@ export default {
         return item.type === 0
       })
       // 打开动画 是否更新顶部图标
+      this.nodesArr = arr.map(item => {
+        return {
+          rect: item.rect,
+          data: item.data
+        }
+      })
       this.nodesArr = JSON.parse(JSON.stringify(this.nodesArr))
+      arr = null
     },
 
     modelTopClick (item, index) {
@@ -1291,9 +1299,9 @@ export default {
           this.tooltipPosition.show = false
           setTimeout(() => {
             this.tooltipPosition.show = true
-            const ePosition = window.ePosition
-            const boxWidth = document.getElementsByClassName('page')[0].offsetWidth
-            const boxHeight = document.getElementsByClassName('page')[0].offsetHeight
+            let ePosition = window.ePosition
+            let boxWidth = document.getElementsByClassName('page')[0].offsetWidth
+            let boxHeight = document.getElementsByClassName('page')[0].offsetHeight
             this.tooltipPosition.left = ePosition.layerX + 20
             this.tooltipPosition.top = ePosition.layerY
             this.$nextTick(() => {
@@ -1309,6 +1317,9 @@ export default {
                   this.tooltipPosition.top = ePosition.layerY - this.$refs.topoTooltip.offsetHeight
                 }
               }
+              ePosition = null
+              boxWidth = null
+              boxHeight = null
             })
           }, 100)
           break
@@ -1435,22 +1446,26 @@ export default {
             }
             break
           case 'resize': {
-            const dom = document.getElementById('topology-canvas' + this.topologyIndexF)
-            const domRect = dom ? dom.getBoundingClientRect() : {}
+            let dom = document.getElementById('topology-canvas' + this.topologyIndexF)
+            let domRect = dom ? dom.getBoundingClientRect() : {}
             if (getTopology(this.topologyIndex)) {
               getTopology(this.topologyIndex).canvasPos = domRect
             }
+            dom = null
+            domRect = null
             break
           }
           case 'scale': {
             if (this.$refs.topTool) {
               this.$refs.topTool.scaleNum = parseInt(data * 100)
             }
-            const dom = document.getElementById('topology-canvas' + this.topologyIndexF)
-            const domRect = dom ? dom.getBoundingClientRect() : {}
+            let dom = document.getElementById('topology-canvas' + this.topologyIndexF)
+            let domRect = dom ? dom.getBoundingClientRect() : {}
             if (getTopology(this.topologyIndex)) {
               getTopology(this.topologyIndex).canvasPos = domRect
             }
+            dom = null
+            domRect = null
             break
           }
           case 'locked': {
@@ -1721,8 +1736,8 @@ export default {
         this.$get('monitor/project/topo/icon').then(res => {
           this.imgageLoading = true
           this.tools = [...Tools]
-          const imgArr = []
-          const promiseArr = []
+          let imgArr = []
+          let promiseArr = []
           res.data.list.forEach((item, index) => {
             item.imageName = item.name
             delete item.name
@@ -1780,12 +1795,14 @@ export default {
 
             this.imgInit = true
             this.imgageLoading = false
+            imgArr = null
+            promiseArr = null
           })
         })
       } else {
         this.imgageLoading = true
         this.$get('monitor/project/topo/icon').then((imageAllId) => {
-          const promiseArr = []
+          let promiseArr = []
           if (!imageAllId || !imageAllId.data) {
             return
           }
@@ -1818,6 +1835,7 @@ export default {
             })
             this.imgInit = true
             this.imgageLoading = false
+            promiseArr = null
           })
         })
       }
@@ -2055,10 +2073,12 @@ export default {
       this.editTopologyFlag = false
       this.$nextTick(() => {
         getTopology(this.topologyIndex).lock(1)
-        const dom = document.getElementById('topology-canvas' + this.topologyIndexF)
-        const domRect = dom ? dom.getBoundingClientRect() : {}
+        let dom = document.getElementById('topology-canvas' + this.topologyIndexF)
+        let domRect = dom ? dom.getBoundingClientRect() : {}
         getTopology(this.topologyIndex).canvasPos = domRect
         this.$store.commit('setShowTopoScreen', this.topoScreenState)
+        dom = null
+        domRect = null
       })
       this.reload()
     },
@@ -2130,7 +2150,7 @@ export default {
 
     winResize () {
       setTimeout(() => {
-        const domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect()
+        let domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect()
         getTopology(this.topologyIndex).canvasPos = domRect
         if (this.fromOverView) {
           getTopology(this.topologyIndex).open(this.oldTopologyData)
@@ -2153,6 +2173,7 @@ export default {
         getTopology(this.topologyIndex).resize()
         getTopology(this.topologyIndex).centerView()
         this.getNodesArr()
+        domRect = null
       }, 500)
     },
     contextmenuNone () {
@@ -2201,18 +2222,6 @@ export default {
       }
       return flag
     },
-    modelPopError (pen, state) {
-      if (item.id === 'asset' && this.activeModelItem.assetError) {
-        return true
-      }
-      if (item.id === 'alert' && this.activeModelItem.alertError) {
-        return true
-      }
-      if (item.id === 'endpoint' && this.activeModelItem.endpointError) {
-        return true
-      }
-      return false
-    },
     redoIndexChange (index) {
       this.redoIndex = index
     },

From 847c5257b2ab2a7fd8970a2ccb69ba406eadbe7d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Apr 2022 16:24:26 +0800
Subject: [PATCH 04/11] =?UTF-8?q?sytyle=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=20to?=
 =?UTF-8?q?pology=20=E5=8F=B3=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E4=B9=B1=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/project/topologyL5.vue          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 488f7210e..0960ddd20 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -1,7 +1,7 @@
-<!--<style>-->
-<!--  @import "./L5/css/iconfont.css";-->
-<!--  @import "./L5/css/props.css";-->
-<!--</style>-->
+<style>
+  @import "./L5/css/iconfont.css";
+  @import "./L5/css/props.css";
+</style>
 <template>
   <div class="project-box list-page" v-loading="topologyLoading">
     <div class="main-list" :style="{height: fromOverView ?'100%' : 'calc(100% - 30px)'}">

From 8689f2b6dabbd9aa9e93053cf7c5a16130c7d1cc Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Apr 2022 17:36:54 +0800
Subject: [PATCH 05/11] =?UTF-8?q?fix=EF=BC=9Astat=20=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/panelChart.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index ce9ef73fb..6f4e0bf6f 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -304,6 +304,7 @@ export default {
             }
             const chartData = []
             const params = {
+              t: this.chartInfo.id,
               q: encodeURIComponent(JSON.stringify(q)),
               stat: startTime,
               end: endTime,

From 8b422de2d0c45cea08ca44d2f2d003c7466b975c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 19 Apr 2022 18:17:49 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9stat?=
 =?UTF-8?q?=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/panelChart.vue       | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 6f4e0bf6f..771142426 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -310,7 +310,17 @@ export default {
               end: endTime,
               resultType: 'matrix'
             }
-            this.$get('/stat', params).then(res => {
+            // this.$get('/stat', params).then(res => {
+            //   if (res.code === 200) {
+            //     chartData.push(res.data.result)
+            //   } else {
+            //     chartData.push({ error: res.msg || res.error || res })
+            //     this.isError = true
+            //   }
+            //   this.chartData = chartData
+            //   this.loading = false
+            // })
+            this.sendAjax('/stat', params).then(res => {
               if (res.code === 200) {
                 chartData.push(res.data.result)
               } else {
@@ -463,6 +473,42 @@ export default {
           this.$message.error(res.msg)
         }
       })
+    },
+    sendAjax (url, params) {
+      // 构造表单数据
+      return new Promise(resolve => {
+        let nowUrl = url
+        Object.keys(params).forEach((key, index) => {
+          if (index == 0) {
+            nowUrl += '?' + key + '=' + params[key]
+          } else {
+            nowUrl += '&' + key + '=' + params[key]
+          }
+        })
+        const formData = new FormData()
+        formData.append('username', 'johndoe')
+        formData.append('id', 123456)
+        // 创建xhr对象
+        const xhr = new XMLHttpRequest()
+        // 设置xhr请求的超时时间
+        xhr.timeout = 3000
+        // 设置响应返回的数据格式
+        xhr.responseType = ''
+        // 创建一个 post 请求，采用异步
+        xhr.open('get', 'http://192.168.44.100/' + nowUrl, true)
+        xhr.setRequestHeader('Authorization', localStorage.getItem('nz-token'));
+        // 注册相关事件回调处理函数
+        xhr.onload = function (e) {
+          if (this.status == 200 || this.status == 304) {
+            // alert(this.responseText)
+            console.log(this, this.responseText)
+            resolve(JSON.parse(this.responseText))
+          }
+        }
+        xhr.onerror = function(e) { console.log(e) };
+        // 发送数据
+        xhr.send()
+      })
     }
   },
   watch: {

From 12f996555f7b4df116e274e9676e06d778a54228 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 20 Apr 2022 09:35:27 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix=EF=BC=9A=20=E5=88=A0=E9=99=A4console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/chart/chartAutotopology.vue         | 1 +
 nezha-fronted/src/components/chart/panelChart.vue            | 1 -
 .../src/components/common/bottomBox/tabs/panelTabNew.vue     | 1 -
 nezha-fronted/src/components/common/js/htmlToPdf.js          | 1 -
 nezha-fronted/src/components/common/project/topologyL5.vue   | 5 ++---
 nezha-fronted/src/components/page/dashboard/panel.vue        | 2 --
 6 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
index 04f09289f..915a49151 100644
--- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
+++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
@@ -8,6 +8,7 @@
 <!--            <span class="project-name">{{item.name}}</span>-->
             <topology
               :fromOverView="true"
+              :from-chart="true"
               :obj="item"
               :ref="'topology' + index"
               :topologyIndexF="isFullscreen?('screen'+chartInfo.id+'-'+index):(chartInfo.id+'-'+index)"
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 771142426..73f1b1da7 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -501,7 +501,6 @@ export default {
         xhr.onload = function (e) {
           if (this.status == 200 || this.status == 304) {
             // alert(this.responseText)
-            console.log(this, this.responseText)
             resolve(JSON.parse(this.responseText))
           }
         }
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 7106104be..13bccf885 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -761,7 +761,6 @@ export default {
               document.body.style.height = 'auto'
               // document.getElementsByTagName('html')[0].style.overflow = 'visible'
               const position = dom.getBoundingClientRect()
-              console.log(position)
               this.getPdf(dom, -1 * position.left, -1 * position.top,this.searchTime)
               // this.getPdf(dom, 0, 0)
             }, 2000)
diff --git a/nezha-fronted/src/components/common/js/htmlToPdf.js b/nezha-fronted/src/components/common/js/htmlToPdf.js
index 49d2af70a..237a30e01 100644
--- a/nezha-fronted/src/components/common/js/htmlToPdf.js
+++ b/nezha-fronted/src/components/common/js/htmlToPdf.js
@@ -31,7 +31,6 @@ export default {
         // a4纸的尺寸[595.28,841.89]，html页面生成的canvas在pdf中图片的宽高
         const imgWidth = 595.28
         const imgHeight = 592.28 / contentWidth * contentHeight
-        console.log(canvas)
         // canvas.paddingTop = '30px'
         const pageDataImg = canvas.toDataURL('image/jpeg', 1.0)
         const img = new Image()
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 0960ddd20..0e5a0676c 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -157,7 +157,7 @@
             <!--画布部分-->
             <div :id="'topology-canvas' + topologyIndexF" :ref="'topology-canvas'+ topologyIndexF" class="full" @contextmenu="onContextMenu($event)"></div>
             <!--设置属性-->
-            <div v-if="editTopologyFlag&&toolShow.attr" class="props">
+            <div v-if="editTopologyFlag&&toolShow.attr && !fromOverView" class="props">
               <canvas-props ref="CanvasProps"
                             :index="topologyIndex"
                             :imgArr = 'tools'
@@ -170,7 +170,7 @@
                             @notModuleIDArrChange="notModuleIDArrChange">
               </canvas-props>
             </div>
-            <div class="context-menu" v-if="contextmenu.left && editTopologyFlag && 0" :style="this.contextmenu">
+            <div class="context-menu" v-if="contextmenu.left && editTopologyFlag && 0 && !fromOverView" :style="this.contextmenu">
               <CanvasContextMenu :index="topologyIndexF" :props.sync="props"></CanvasContextMenu>
             </div>
             <!--所有节点上的小图标-->
@@ -1751,7 +1751,6 @@ export default {
           Promise.all(promiseArr).then((res2, header) => {
             this.iconArray = [...res.data.list]
             this.iconArray.forEach((item, index) => {
-              console.log(res2[index])
               item.image = res2[index].data || res2[index]
               if (!getTopologyImg(item.id)) {
                 setTopologyImg(item.id, item.image)
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 65f6cef78..e1e5f913d 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -822,7 +822,6 @@ export default {
         this.htmlTitle = this.showPanel.name
         this.scrollbarWrap.scrollTop = this.scrollbarWrap.scrollHeight
         this.$refs.chartList.onScroll(this.scrollbarWrap.scrollTop)
-        console.log(dom.children)
         // const div = document.createElement('div')
         // div.setAttribute('class', 'el-loading-spinner')
         // div.innerText = '12321312312312321'
@@ -848,7 +847,6 @@ export default {
               document.getElementsByClassName('left-menu')[0].style.height = '100vh'
               // document.getElementsByTagName('html')[0].style.overflow = 'visible'
               const position = dom.getBoundingClientRect()
-              console.log(position)
               this.getPdf(dom, -1 * position.left, -1 * position.top, this.searchTime)
               // this.getPdf(dom, 0, 0)
             }, 2000)

From 1d6f29b0de439620ae767c8cb59d4495fd66b604 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 20 Apr 2022 13:33:33 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20stat?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=BA=20axios.get?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/chart/panelChart.vue       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 73f1b1da7..aaaaef59b 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -310,17 +310,7 @@ export default {
               end: endTime,
               resultType: 'matrix'
             }
-            // this.$get('/stat', params).then(res => {
-            //   if (res.code === 200) {
-            //     chartData.push(res.data.result)
-            //   } else {
-            //     chartData.push({ error: res.msg || res.error || res })
-            //     this.isError = true
-            //   }
-            //   this.chartData = chartData
-            //   this.loading = false
-            // })
-            this.sendAjax('/stat', params).then(res => {
+            this.$get('/stat', params).then(res => {
               if (res.code === 200) {
                 chartData.push(res.data.result)
               } else {
@@ -330,6 +320,16 @@ export default {
               this.chartData = chartData
               this.loading = false
             })
+            // this.sendAjax('/stat', params).then(res => {
+            //   if (res.code === 200) {
+            //     chartData.push(res.data.result)
+            //   } else {
+            //     chartData.push({ error: res.msg || res.error || res })
+            //     this.isError = true
+            //   }
+            //   this.chartData = chartData
+            //   this.loading = false
+            // })
             break
           }
           case 'misc': {

From 133d76d80e557ba3b40450d3dbefe8706a4a7a69 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 26 Apr 2022 14:58:25 +0800
Subject: [PATCH 09/11] =?UTF-8?q?NEZ-1838=20fix=EF=BC=9A=E6=9F=B1=E7=8A=B6?=
 =?UTF-8?q?=E5=9B=BE=20Y=E8=BD=B4=20=E6=9C=AA=E8=BF=9B=E8=A1=8C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E8=BD=AC=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartBar.vue     | 8 ++++++++
 .../src/components/chart/chart/options/chartBar.js        | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartBar.vue b/nezha-fronted/src/components/chart/chart/chartBar.vue
index 3f94ef31d..faba90b60 100644
--- a/nezha-fronted/src/components/chart/chart/chartBar.vue
+++ b/nezha-fronted/src/components/chart/chart/chartBar.vue
@@ -28,6 +28,7 @@ import { formatScientificNotation, getMetricTypeValue } from '@/components/commo
 import chartDataFormat from '@/components/chart/chartDataFormat'
 import { initColor } from '@/components/chart/chart/tools'
 import lodash from 'lodash'
+import bus from "@/libs/bus";
 
 export default {
   name: 'chart-bar',
@@ -107,6 +108,13 @@ export default {
           }
         }
       }
+      chartOption.yAxis.axisLabel.formatter = function (val, index) {
+        const value = formatScientificNotation(val, 6)
+        let chartUnit = self.chartInfo.unit
+        chartUnit = chartUnit || 2
+        const unit = chartDataFormat.getUnit(chartUnit)
+        return unit.compute(value, index, -1, 2)
+      }
       chartOption.tooltip.formatter = this.formatterFunc
       chartOption.tooltip.position = this.tooltipPosition
       /* 使用setTimeout延迟渲染图表，避免样式错乱 */
diff --git a/nezha-fronted/src/components/chart/chart/options/chartBar.js b/nezha-fronted/src/components/chart/chart/options/chartBar.js
index 849596953..7936bca8a 100644
--- a/nezha-fronted/src/components/chart/chart/options/chartBar.js
+++ b/nezha-fronted/src/components/chart/chart/options/chartBar.js
@@ -43,7 +43,12 @@ const chartBarOption = {
     }
   },
   yAxis: {
-    type: 'value'
+    type: 'value',
+    axisLabel: {
+      show: true,
+      fontSize: 10
+      // formatter: 动态生成
+    }
   },
   series: [
     {

From a4c45626a11efe8d379300163589fde6ad6f5e77 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 19 May 2022 11:07:00 +0800
Subject: [PATCH 10/11] =?UTF-8?q?NEZ-1862=20fix=EF=BC=9AAPM=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8B=93=E6=89=91=E5=9B=BE=E5=9B=BE=E5=BD=A2=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=9B=BE=E5=BD=A2=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/ChartDiagram/diagram.vue           | 33 +++++++-
 .../components/common/project/topologyL5.vue  | 82 ++++++++++++-------
 2 files changed, 82 insertions(+), 33 deletions(-)

diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
index d2e55ac4e..ba9a23670 100644
--- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
+++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue
@@ -327,7 +327,7 @@ import {
   myCubec,
   myCubeAnchors
 } from '../project/L5/services/canvas.js'
-import { getTopology, setTopology } from '../js/common'
+import {getTopology, getTopologyImg, setTopology, setTopologyImg} from '../js/common'
 import CanvasProps from '../project/L5/CanvasProps'
 import topologyTopTool from '../project/L5/topologyTopTool'
 import popDataMain from '../project/popData/Main'
@@ -1744,13 +1744,27 @@ export default {
           res.data.list.forEach((item, index) => {
             item.imageName = item.name
             delete item.name
-            promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.id}/1`))
+            const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : ''
+            if (nowImage && nowImage.data) {
+              console.log(nowImage)
+              promiseArr.push(nowImage)
+            } else {
+              promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.id}/1`))
+            }
             imgArr.push({ ...item })
           })
           Promise.all(promiseArr).then((res2, header) => {
             this.iconArray = [...res.data.list]
             this.iconArray.forEach((item, index) => {
               item.image = res2[index].data
+              const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : ''
+              if (!nowImage || (nowImage && !nowImage.data)) {
+                setTopologyImg(item.id, JSON.stringify({
+                  data: res2[index].data,
+                  width: res2[index].width,
+                  height: res2[index].height
+                }))
+              }
               const group = this.tools.find(tool => tool.group === item.unit)
               if (group) {
                 group.children.push({
@@ -1801,7 +1815,12 @@ export default {
           }
           imgidList.forEach((item, index) => {
             if (item.data.imageId && imageAllId.data.list.find(image => item.data.imageId === image.id)) {
-              promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`))
+              const nowImage = getTopologyImg(item.data.imageId) ? JSON.parse(getTopologyImg(item.data.imageId)) : ''
+              if (nowImage && nowImage.data) {
+                promiseArr.push(nowImage)
+              } else {
+                promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`))
+              }
             } else if (item.data.imageId) {
               promiseArr.push(imgDefault)
             } else {
@@ -1817,6 +1836,14 @@ export default {
             this.iconArray.forEach((item, index) => {
               if (item.id) {
                 item.image = res2[index].data
+                const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : ''
+                if (!nowImage || (nowImage && !nowImage.image)) {
+                  setTopologyImg(item.id, JSON.stringify({
+                    data: res2[index].data,
+                    width: res2[index].width,
+                    height: res2[index].height
+                  }))
+                }
               }
             })
             this.imgInit = true
diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue
index 0e5a0676c..c57e7cd5e 100644
--- a/nezha-fronted/src/components/common/project/topologyL5.vue
+++ b/nezha-fronted/src/components/common/project/topologyL5.vue
@@ -3,7 +3,7 @@
   @import "./L5/css/props.css";
 </style>
 <template>
-  <div class="project-box list-page" v-loading="topologyLoading">
+  <div class="project-box list-page" v-my-loading="topologyLoading">
     <div class="main-list" :style="{height: fromOverView ?'100%' : 'calc(100% - 30px)'}">
       <div class="main-container" :class="fromOverView?'from-overview':'from-project'">
         <div v-if="(editTopologyFlag || isPreview)&&!fromChart" class="edit-topologyLine top-tools" style="padding-left: 20px;width: calc(100% - 40px);display: inline-block">
@@ -13,7 +13,7 @@
             <span class="el-dropdown-title"><i class="iconfont icon-cube"></i> <i
               class="nz-icon nz-icon-arrow-down"></i></span>
             <el-dropdown-menu slot="dropdown" @click="dropdownClick" class="right-box-select-top right-public-box-dropdown-top">
-              <div style="height: 450px"  v-loading="imgageLoading">
+              <div style="height: 450px"  v-my-loading="imgageLoading">
                 <el-card shadow="hover" style="height:420px;width:284px;overflow-y: auto"
                          class="project-topology-add-node">
                 <!--<div class="drag-header">——</div>-->
@@ -439,6 +439,7 @@ export default {
       timer: null, // 处理project短时间呢频繁变更的定时器
       timer2: null, // 处理平移画布显示iconState的定时器
       timer3: null, // 处理tooltip的显示定时器
+      timer4: null,
       nodesArr: [],
       notModuleIDArr: [],
       popData: [
@@ -660,10 +661,10 @@ export default {
       this.chartGetData = []
       const axiosArr = []
       const promiseArr = []
-      const pensPromise = (pen, arr, index) => {
+      let pensPromise = (pen, arr, index) => {
         return new Promise((resolve, reject) => {
           Promise.all(arr).then((res) => {
-            this.chartGetData[index].res = this.computeData(res, pen.data.aggregation, pen)
+            this.chartGetData[index].res = JSON.parse(JSON.stringify(this.computeData(res, pen.data.aggregation, pen)))
             this.setAnimation(pen, this.chartGetData[index].res)
             resolve()
           })
@@ -734,6 +735,7 @@ export default {
         // getTopology(this.topologyIndex).fitView();
         this.oldTopologyData = JSON.stringify(getTopology(this.topologyIndex).data)
         this.getNodesArr()
+        pensPromise = null
       })
     },
     dateChange () {
@@ -821,7 +823,7 @@ export default {
             }
             this.projectInfoShow = true
             this.projectAlertShow = true
-            this.saveData = { ...data }
+            this.saveData = JSON.parse(JSON.stringify(data))
             this.topologyInfo.name = this.obj.name
             resolve(data)
             data = null
@@ -847,11 +849,11 @@ export default {
               const arr = data.pens.filter(item => !item.type)
               this.addNodeInit(arr)
             }
-            let timer = setInterval(() => {
+            this.timer4 = setInterval(() => {
               if (!this.imgInit) {
                 return
               }
-              const promiseArr = [this.$get('stat/module/abnormal', { projectId: this.obj.id })]
+              const promiseArr = []
               for (let i = 0; i < data.pens.length; i++) {
                 const line = data.pens[i]
                 if (line.type === 1) {
@@ -914,19 +916,17 @@ export default {
                     }
                   }
                 })
-                this.saveData = { ...data }
+                this.saveData = JSON.parse(JSON.stringify(data))
                 resolve(data)
-                data = null
-                clearInterval(timer)
-                timer = null
+                clearInterval(this.timer4)
+                this.timer4 = null
               }).catch(res => {
-                this.saveData = { ...data }
+                this.saveData = JSON.parse(JSON.stringify(data))
                 resolve(data)
-                data = null
-                clearInterval(timer)
-                timer = null
+                clearInterval(this.timer4)
+                this.timer4 = null
               })
-            }, 100)
+            }, 2000)
           }
         })
       })
@@ -1059,7 +1059,7 @@ export default {
       this.$get('/monitor/module?pageSize=-1&projectIds=' + this.obj.id).then(response => {
         if (response.code === 200) {
           this.projectInfo.loading = false
-          this.allModules = response.data.list
+          this.allModules = JSON.parse(JSON.stringify(response.data.list))
           this.modulesDiff()
         }
       })
@@ -1741,19 +1741,27 @@ export default {
           res.data.list.forEach((item, index) => {
             item.imageName = item.name
             delete item.name
-            if (getTopologyImg(item.id)) {
-              promiseArr.push(getTopologyImg(item.id))
+            const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : ''
+            if (nowImage && nowImage.data) {
+              console.log(nowImage)
+              promiseArr.push(nowImage)
             } else {
               promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.id}/1`))
             }
             imgArr.push({ ...item })
           })
           Promise.all(promiseArr).then((res2, header) => {
+            console.log(res2, 'Promise')
             this.iconArray = [...res.data.list]
             this.iconArray.forEach((item, index) => {
-              item.image = res2[index].data || res2[index]
-              if (!getTopologyImg(item.id)) {
-                setTopologyImg(item.id, item.image)
+              item.image = res2[index].data
+              const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : ''
+              if (!nowImage || (nowImage && !nowImage.data)) {
+                setTopologyImg(item.id, JSON.stringify({
+                  data: res2[index].data,
+                  width: res2[index].width,
+                  height: res2[index].height
+                }))
               }
               const group = this.tools.find(tool => tool.group === item.unit)
               if (group) {
@@ -1807,8 +1815,9 @@ export default {
           }
           imgidList.forEach((item, index) => {
             if (item.data.imageId && imageAllId.data.list.find(image => item.data.imageId === image.id)) {
-              if (getTopologyImg(item.data.imageId)) {
-                promiseArr.push(getTopologyImg(item.data.imageId))
+              const nowImage = getTopologyImg(item.data.imageId) ? JSON.parse(getTopologyImg(item.data.imageId)) : ''
+              if (nowImage && nowImage.data) {
+                promiseArr.push(nowImage)
               } else {
                 promiseArr.push(this.dealImg(`monitor/project/topo/icon/${item.data.imageId}/1`))
               }
@@ -1826,14 +1835,20 @@ export default {
             })
             this.iconArray.forEach((item, index) => {
               if (item.id) {
-                item.image = res2[index].data || res2[index]
-                if (!getTopologyImg(item.id)) {
-                  setTopologyImg(item.id, item.image)
+                item.image = res2[index].data
+                const nowImage = getTopologyImg(item.id) ? JSON.parse(getTopologyImg(item.id)) : ''
+                if (!nowImage || (nowImage && !nowImage.image)) {
+                  setTopologyImg(item.id, JSON.stringify({
+                    data: res2[index].data,
+                    width: res2[index].width,
+                    height: res2[index].height
+                  }))
                 }
               }
             })
             this.imgInit = true
             this.imgageLoading = false
+            imgidList = null
             promiseArr = null
           })
         })
@@ -2280,14 +2295,21 @@ export default {
       clearInterval(this.timer)
       this.timer = null
     }
+    if (this.timer4) {
+      clearInterval(this.timer4)
+      this.timer4 = null
+    }
     if (getTopology(this.topologyIndex)) {
-      getTopology(this.topologyIndex).off('contextmenu', this.onContextMenu)
-      getTopology(this.topologyIndex).destroy()
-      setTopology(this.topologyIndex, null)
       window.topology = null
       window.Le5leTopologyPoint = null
       window.topologyPoint = null
       window.topologyRect = null
+      getTopology(this.topologyIndex).off('contextmenu', this.onContextMenu)
+      getTopology(this.topologyIndex).destroy()
+      Object.keys(getTopology(this.topologyIndex)).forEach(key => {
+        getTopology(this.topologyIndex)[key] = null
+      })
+      setTopology(this.topologyIndex, null)
     }
     if (document.getElementById('topology-canvas' + this.topologyIndexF)) {
       document.getElementById('topology-canvas' + this.topologyIndexF).removeEventListener('mousemove', this.canvasMove)

From fe6be3050965192d5fe761602f911d650e4bfb5e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 19 May 2022 15:42:06 +0800
Subject: [PATCH 11/11] =?UTF-8?q?NEZ-1864=20fix=EF=BC=9AExplore=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=A5=E5=BF=97=E5=86=85=E5=AE=B9=E5=90=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=9B=B4=E6=8E=A5=E4=BF=9D=E5=AD=98=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=88=B0dashboard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/dashboard/explore/exploreItem.vue    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 7ebe5d651..219e17222 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -42,6 +42,16 @@
                     @click="saveChart">
               {{$t('dashboard.metric.saveChart')}}
             </button>
+            <button v-else
+                    id="explore-save-chart-logs"
+                    v-has="'main_add'"
+                    :class="{'nz-btn-disabled btn-disabled-cursor-not-allowed' : saveDisabled}"
+                    :disabled="saveDisabled"
+                    class="top-tool-btn top-tool-btn--text"
+                    type="button"
+                    @click="saveChartLogs">
+              {{$t('dashboard.metric.saveChart')}}
+            </button>
           </div>
         </div>
         <div id="explore-promql-box" class="top-tools" style="padding-top: 0; flex-wrap: wrap">
@@ -981,6 +991,43 @@ export default {
       this.chartData = chart
       this.rightBox.show = true
     },
+    saveChartLogs () {
+      const chart = {
+        id: '',
+        name: '',
+        panelName: '',
+        span: 4,
+        height: 4,
+        unit: 2,
+        groupId: -1,
+        updateBy: 1,
+        updateAt: '2022-05-18 07:51:45',
+        type: 'log',
+        weight: 6,
+        param: { limit: 100 },
+        pid: null,
+        buildIn: 0,
+        seq: null,
+        x: 0,
+        y: 1.93,
+        elements: [],
+        children: null,
+        chartNums: null,
+        asset: null,
+        varType: null,
+        varId: null,
+        varName: null,
+        datasource: 'logs',
+        enable: { thresholds: false, legend: true, valueMapping: false },
+        sync: 0,
+        remark: ''
+      }
+      this.expressions.forEach((exp, index) => {
+        chart.elements.push({ expression: exp, legend: '', type: 'expert', id: '', name: 'A' })
+      })
+      this.chartData = chart
+      this.rightBox.show = true
+    },
     createSuccess (panel) { // 添加chart成功
       this.$confirm(this.$t('dashboard.metric.goPanelTip'), this.$t('tip.saveSuccess'), {
         confirmButtonText: this.$t('tip.yes'),