From eafeebbc5e7d684662346b10758a564a12d53384 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 18 Jan 2024 14:06:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20NEZ-3383=20Topo=20=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E6=82=AC=E6=B5=AE=E5=9B=BE=E8=A1=A8=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=8A=A0=E8=BD=BD=E5=8A=A8=E7=94=BB?=
 =?UTF-8?q?=E4=B8=80=E7=9B=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/ChartScreenHeader.vue  | 1 -
 nezha-fronted/src/components/chart/chart/chartMap.vue     | 2 +-
 .../src/components/chart/chart/chartTimeSeries.vue        | 1 -
 .../src/components/chart/chart/uplot/chartTimeSeries.vue  | 2 +-
 .../components/chart/chart/uplot/chartTimeSeriesMixin.js  | 2 --
 nezha-fronted/src/components/chart/chartMixin.js          | 1 -
 nezha-fronted/src/components/chart/panelChart.vue         | 1 -
 nezha-fronted/src/components/cli/consoleNew.vue           | 4 +---
 .../src/components/common/bottomBox/tabs/discoveryTab.vue | 1 -
 nezha-fronted/src/components/common/js/common.js          | 1 -
 .../components/common/project/meta2d/js/meta2dMainCalc.js | 8 +++++++-
 .../components/common/project/meta2d/meta2dTooltip.vue    | 5 +++++
 .../components/common/table/alert/alertMessageTable.vue   | 1 -
 nezha-fronted/src/components/layout/header.vue            | 2 --
 nezha-fronted/src/components/page/dashboard/dashboard.vue | 1 -
 .../src/components/page/dashboard/explore/exploreItem.vue | 5 +----
 .../src/components/page/dashboard/explore/logTab.vue      | 1 -
 .../src/components/page/dashboard/explore/promqlInput.vue | 1 -
 18 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
index 7d2f98c93..7e8d6842e 100644
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -191,7 +191,6 @@ export default {
     fatherNowTimeType: {
       immediate: true,
       handler (n) {
-        console.log(n)
         this.nowType = lodash.cloneDeep(n)
       }
     }
diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue
index ad57318d4..4a3079953 100644
--- a/nezha-fronted/src/components/chart/chart/chartMap.vue
+++ b/nezha-fronted/src/components/chart/chart/chartMap.vue
@@ -123,7 +123,7 @@ export default {
             const mapConfig = JSON.parse(response.data.paramValue)
             mapStyle.center = [Number(mapConfig.longitude), Number(mapConfig.latitude)]
             mapStyle.zoom = Number(mapConfig.zoom)
-            const mapId = this.mapId = this.isFullscreen ? document.getElementById('map-screen-' + this.chartInfo.id) : document.getElementById('map' + this.chartInfo.id)
+            const mapId = this.mapId = this.isFullscreen ? ('map-screen-' + this.chartInfo.id) : ('map' + this.chartInfo.id)
             let map = getChart(mapId) || null
             if (map) {
               map.remove()
diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index 68ab547c2..bcc90fa17 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -166,7 +166,6 @@ export default {
   methods: {
     initChart (chartOptions = this.chartOption) {
       this.setDataLink()
-      console.log(JSON.stringify(this.chartData))
       try {
         this.isStack = this.chartInfo.param.stack
       } catch (e) {}
diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue
index 5cc56e161..18d3183f6 100644
--- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeries.vue
@@ -243,7 +243,6 @@ export default {
         plugins: [
           this.tooltipPlugin({
             onclick (u, seriesIdx, dataIdx) {
-              console.log(u, seriesIdx, dataIdx, 'nz-tooltipClick')
             }
           })
         ],
@@ -405,6 +404,7 @@ export default {
         chartUplot = new UPlot(opts, data, document.getElementById(`chart-canvas-${this.chartId}`))
         setChart(this.chartId, chartUplot)
         this.isInit = false
+        this.chartLoading = false
       }, 100)
     },
     renderMinMax (opts) {
diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
index bd7de84eb..4d17ea0e8 100644
--- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
+++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
@@ -693,8 +693,6 @@ export default {
     },
     renderThresholds () { // 画阈值线
       const u = getChart(this.chartId)
-      console.log(u)
-
       const thresholdsEnable = this.$lodash.get(this.chartInfo, 'param.enable.thresholds', false)
       if (!thresholdsEnable || !u) {
         return
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index c7c71de47..375f2aee5 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -103,7 +103,6 @@ export default {
           if (chartInfo.param.enable.rightYAxis) {
             if (chartInfo.param.rightYAxis) {
               const findItem = chartInfo.param.rightYAxis.elementNames.find(item => data.elements.name == item)
-              console.log(findItem)
               if (findItem) {
                 s.yAxisIndex = 1
                 data.yAxisIndex = 1
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 05fec3304..84df9cd2b 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -935,7 +935,6 @@ export default {
       immediate: true,
       deep: true,
       handler (n) {
-        // console.log(n)
         if (window.dataJson && this.loading) {
           this.loading = false
         }
diff --git a/nezha-fronted/src/components/cli/consoleNew.vue b/nezha-fronted/src/components/cli/consoleNew.vue
index b0477f8a9..c8439037d 100644
--- a/nezha-fronted/src/components/cli/consoleNew.vue
+++ b/nezha-fronted/src/components/cli/consoleNew.vue
@@ -380,9 +380,7 @@ export default {
       if (this.terminalSetting.copyTrimEnd) {
         str = str.replace(/(\s*$)/g, '')
       }
-      this.$copyText(str).then((res) => {
-        console.log(res)
-      })
+      this.$copyText(str).then((res) => {})
     },
     async contextmenu (event) {
       event.preventDefault()
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/discoveryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/discoveryTab.vue
index 49803fcae..529a81c88 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/discoveryTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/discoveryTab.vue
@@ -154,7 +154,6 @@ export default {
       })
     },
     uploadAsset (row) {
-      console.log(row)
     }
   }
 }
diff --git a/nezha-fronted/src/components/common/js/common.js b/nezha-fronted/src/components/common/js/common.js
index 4404318db..730c53372 100644
--- a/nezha-fronted/src/components/common/js/common.js
+++ b/nezha-fronted/src/components/common/js/common.js
@@ -38,7 +38,6 @@ export function getHexagon (key) {
 export let topologyCache = {}
 
 export function getTopology (key) {
-  // console.log(topologyCache, 'topologyCache')
   return topologyCache[`topology${key}`]
 }
 
diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
index 9b09585b5..1c910a890 100644
--- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
+++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js
@@ -394,7 +394,13 @@ export default {
             boxHeight = null
           })
           this.position.show = true
-          // this.$refs.meta2dTooltip.$refs.panelChart && (this.$refs.meta2dTooltip.$refs.panelChart.loading = false)
+          setTimeout(()=>{
+            if (this.$refs.meta2dTooltip && this.$refs.meta2dTooltip.$refs.panelChart) {
+              this.$refs.meta2dTooltip.$refs.panelChart.loading = false
+              // console.log(this.chartParams)
+              // this.$refs.meta2dTooltip.$refs.panelChart.$refs.chart.$refs['chart' + this.meta2dId + 'meta2DTooltip'].chartLoading = false
+            }
+          }, 100)
           clearTimeout(this.timer3)
         }, 100)
       }
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue
index 5bc84408d..988b3dbcb 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue
@@ -57,6 +57,7 @@ export default {
         }
         this.chartInfo.type = this.params.chartType || 'line'
         this.chartInfo.id = this.meta2dId + 'meta2DTooltip'
+        // this.chartInfo.loaded = true
         const chartData = []
         const elements = []
         const source = this.queryValues.find(query => query.name === this.params.legend && query.parent === this.params.parent)
@@ -100,8 +101,12 @@ export default {
           this.chartInfo.elements = elements
           this.$refs.panelChart.chartData = chartData
           this.$refs.panelChart.loading = false
+          if (this.$refs.panelChart.$refs.chart && this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id]) {
+            this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id].isInit = true
+          }
           this.$nextTick(() => {
             this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id].chartLoading = true
+
             this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id].initChart()
             this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id].resize()
           })
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 05b7d9add..6c064d6b5 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -259,7 +259,6 @@ export default {
       return function (record) {
         // 当 state = active | silence 时，duration = 当前服务器时间（result.time）- startAt
         if (record.state == 1 || record.state == 2) {
-          console.log(record.startAt, this.nowTime, record.endAt)
           return calcDurationByStringTimeB(record.startAt, this.nowTime)
         }
         if (record.endAt) {
diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue
index 636d5a5ee..eaba9a4a4 100644
--- a/nezha-fronted/src/components/layout/header.vue
+++ b/nezha-fronted/src/components/layout/header.vue
@@ -193,7 +193,6 @@ export default {
   },
   methods: {
     fn () {
-      console.log(666)
     },
     ...mapActions(['logoutSuccess']),
     // 测试是否能自动播放 若不能 点击开关时弹窗
@@ -201,7 +200,6 @@ export default {
       const audio = new Audio(audioUrl)
       audio.muted = true
       audio.play().then(() => {
-        console.log('autoplay')
         this.operationTutorial = false
       }).catch((err) => {
         console.log(err)
diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue
index 498284897..afd925230 100644
--- a/nezha-fronted/src/components/page/dashboard/dashboard.vue
+++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue
@@ -1225,7 +1225,6 @@ export default {
           chartCache[key].setOption(option)
         }
         this.$store.commit('setCurrentMousemove', 0)
-        console.log(value)
         if (value && value !== 'none') {
           this.$store.commit('setConnect', value)
           // echarts.connect('timeSeriesGroup')
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 3a5b91bf2..d81a2487b 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -4178,7 +4178,6 @@ export default {
                 }
               }
             })
-            console.log(this.uplotChartInfo.elements, this.uplotChartData)
             // this.series = series
             // this.$refs.exploreChart?.setLegend(legend)
             // this.$refs.exploreChart?.setRandomColors(series.length)
@@ -4420,9 +4419,7 @@ export default {
               promiseArr.push('')
             }
           })
-          Promise.all(promiseArr).then(res => {
-            console.log(res)
-          })
+          Promise.all(promiseArr).then(res => {})
           this.queryLogData()
         }
       }
diff --git a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue b/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
index 4fd3b6a40..50877d9f1 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/logTab.vue
@@ -663,7 +663,6 @@ export default {
             return mergedArray
           }
           n.forEach((data) => {
-            console.log(data)
             data.forEach((result, i) => {
               seriesItem.name = 'logs'
               const values = result.values.map((item) => {
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index 990d43eb2..b12f495e5 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -588,7 +588,6 @@ export default {
             if (res !== null) {
               historyItems.options = historyItems.options.concat(res.options)
             }
-            // console.log(historyItems)
             return historyItems
           })
         }