From 92b45dbefd1a4db695e1860f6520fd5fa6162d0b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 21 Dec 2021 19:48:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=20=E4=BB=A5=E5=8F=8A=20panel=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/css/common/tableCommon.scss  | 3 +++
 nezha-fronted/src/components/chart/chartList.vue      | 2 +-
 nezha-fronted/src/components/chart/panelChart.vue     | 5 ++++-
 nezha-fronted/src/components/page/dashboard/panel.vue | 4 ++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/assets/css/common/tableCommon.scss b/nezha-fronted/src/assets/css/common/tableCommon.scss
index 936f8bedf..9f3c10b64 100644
--- a/nezha-fronted/src/assets/css/common/tableCommon.scss
+++ b/nezha-fronted/src/assets/css/common/tableCommon.scss
@@ -48,6 +48,9 @@
       display: flex;
     }
   }
+  .panel-top-tools{
+    border-bottom: 1px solid $--border-color-light;
+  }
   .top-tool-btn-group {
     display: flex;
     .top-tool-btn:not(:last-of-type):not(:first-of-type) {
diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index aeca0308e..14e0c2594 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -372,7 +372,7 @@ export default {
           })
           setTimeout(() => {
             this.firstInit = false
-          }, 700)
+          }, 2000)
           this.gridLayoutLoading = false
         })
       }
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 5b0a2f7b9..890948876 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- chart外层箱子 -->
-  <div :class="{'panel-chart--fullscreen': isFullscreen}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)">
+  <div :class="{'panel-chart--fullscreen': isFullscreen}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)"  v-loading="loading">
     <!-- title和工具栏，支持浮动 -->
     <chart-header
       v-if="!isFullscreen"
@@ -155,12 +155,14 @@ export default {
             if (this.chartInfo.type === 'assetInfo') {
               this.$get('asset/asset/' + this.chartDetailInfo.id).then(res => {
                 this.chartData = res.data
+                this.loading = false
               })
               break
             }
             if (this.chartInfo.type === 'endpointInfo') {
               this.$get('monitor/endpoint/' + this.chartDetailInfo.id).then(res => {
                 this.chartData = res.data
+                this.loading = false
               })
               break
             }
@@ -190,6 +192,7 @@ export default {
             break
           }
           case 'misc': {
+            this.loading = false
             if (this.chartInfo.type === 'hexagon') {
               this.getHexagonFigureData().then(res => {
                 this.chartData = res
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 150dfbea9..cb0385c0b 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -7,7 +7,7 @@
         </transition>
       </div>
       <div class="main-container">
-        <div class="top-tools">
+        <div class="top-tools panel-top-tools">
           <div v-if="panelData.length === 0" class="top-tool-left" style="margin-left: 10px;">
             <button id="panel-add-panel" class="nz-btn nz-btn-style-light nz-btn-size-small" @click="toAdd"><i class="nz-icon nz-icon-create-square"></i>&nbsp;&nbsp;{{$t("dashboard.panel.createPanelTitleSec")}}</button>
           </div>
@@ -313,7 +313,7 @@ export default {
       this.showPanel.type = 'dashboard'
       this.filter.panelId = this.showPanel.id
       // this.dateChange()
-      this.getTableData()
+      // this.getTableData()
       this.getData(this.filter)
       this.$refs.chartList.cleanData()
     },