From a925bf6dc1a26bc1a1744bec583a2601dbb9c752 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 3 Jun 2021 14:30:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9topologo=20?=
 =?UTF-8?q?=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/L5/CanvasProps.vue         |  8 +++---
 .../common/project/L5/topoTooltip.vue         | 25 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
index 5501eb208..1003e2f8c 100644
--- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
+++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue
@@ -979,10 +979,10 @@ export default {
           id: 'stackArea',
           name: this.$t('dashboard.panel.chartForm.typeVal.stackArea.label')
         },
-        {
-          id: 'bar',
-          name: this.$t('dashboard.panel.chartForm.typeVal.bar.label')
-        },
+        // {
+        //   id: 'bar',
+        //   name: this.$t('dashboard.panel.chartForm.typeVal.bar.label')
+        // },
         {
           id: 'table',
           name: this.$t('dashboard.panel.chartForm.typeVal.table.label')
diff --git a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue
index b88826bf9..24663dcb9 100644
--- a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue
+++ b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue
@@ -1,17 +1,18 @@
 <template>
   <div class="tooltip-box" style="display: flex;" v-if="(isChart||chartData.tooltipShow)&&chartData.expressArr.length">
     <div class="tooltip-box-chart" style="" v-if="isChart||(chartData.displayChart&&chartData.tooltipShow&&chartData.expressArr.length)">
-      <line-chart-block v-show="isChart || chartData.type !== 'table'"
-                        :key="'inner' + chartData.id"
-                        :from="'project'"
-                        :ref="chartData.type !== 'table'?'editChart' + chartData.type:'editChart'"
-                        :temp-dom="tempDom"
-                        :panel-id="-1"
-                        :is-lock="true"
-                        :chart-index="0"
-                        :chartTitleShow="false"
-                        :chart-data="chartData">
-      </line-chart-block>
+        <line-chart-block v-show="isChart || chartData.type !== 'table'"
+                          :key="'inner' + chartData.id"
+                          id="listContainer"
+                          :from="'project'"
+                          :ref="chartData.type !== 'table'?'editChart' + chartData.type:'editChart'"
+                          :temp-dom="tempDom"
+                          :panel-id="-1"
+                          :is-lock="true"
+                          :chart-index="0"
+                          :chartTitleShow="false"
+                          :chart-data="chartData">
+        </line-chart-block>
       <chart-table  v-show="isChart || chartData.type === 'table'"
                     :key="'inner' + 1"
                     :from="'project'"
@@ -61,7 +62,7 @@ export default {
   data () {
     return {
       tempDom: { height: 400, width: '' },
-      chartDataTemp: { id: 8832, prev: null, next: null, panelId: 0, title: '123', span: 12, height: 400, createAt: '2021-01-27 07:36:19', unit: 2, weight: 0, pid: null, buildIn: null, seq: null, param: { last: 0, legendValue: { total: 'off', min: 'off', avg: 'off', last: 'off', max: 'off' }, threshold: '', url: '', nullType: 'connected' }, sync: null, asset: null, isLoaded: true, from: '__vue_devtool_undefined__', draggable: true, resizable: true, editable: true },
+      chartDataTemp: { id: 8832, prev: null, next: null, panelId: 0, title: '123', span: 12, height: 12, createAt: '2021-01-27 07:36:19', unit: 2, weight: 0, pid: null, buildIn: null, seq: null, param: { last: 0, legendValue: { total: 'off', min: 'off', avg: 'off', last: 'off', max: 'off' }, threshold: '', url: '', nullType: 'connected' }, sync: null, asset: null, isLoaded: true, from: '__vue_devtool_undefined__', draggable: true, resizable: true, editable: true },
       chartData: {},
       filter: {
         end_time: bus.timeFormate(bus.getOffsetTimezoneData(), 'yyyy-MM-dd hh:mm:ss'),