From d4fd5be65e38f37ffe990781b1b1470f0374fc3d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 9 Apr 2021 15:07:15 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0group=E7=9A=84?=
 =?UTF-8?q?=E6=87=92=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/charts/chart-group.vue      | 2 +-
 nezha-fronted/src/components/charts/chart-list-group.vue | 2 +-
 nezha-fronted/src/components/page/dashboard/panel.vue    | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/charts/chart-group.vue b/nezha-fronted/src/components/charts/chart-group.vue
index b988999fd..f2d743869 100644
--- a/nezha-fronted/src/components/charts/chart-group.vue
+++ b/nezha-fronted/src/components/charts/chart-group.vue
@@ -47,7 +47,7 @@
         </div>
         <el-collapse-transition>
           <div :id="'chartUrl'+chartIndex" class="mt-10 url-container" v-show="showList">
-            <chart-list-group :groupList.sync="chartData.children" :panel-lock="panelLock" :filterParent="filter"  :class="{'show-top':false}" :hasGroup="false" :from="from" ref="listGroup" :panelId="panelId" @on-edit-group-chart="editGroupItem" @on-duplicate-group-chart="duplicateGroupItem" @on-remove-chart="removeChartGroup" @moveGroupItem="moveGroupItem"></chart-list-group>
+            <chart-list-group :groupList.sync="chartData.children" :panel-lock="panelLock" :filterParent="filter"  :hasGroup="false" :from="from" ref="listGroup" :panelId="panelId" @on-edit-group-chart="editGroupItem" @on-duplicate-group-chart="duplicateGroupItem" @on-remove-chart="removeChartGroup" @moveGroupItem="moveGroupItem"></chart-list-group>
           </div>
         </el-collapse-transition>
         <div style="position: absolute;width: 100%; top:calc(50% - 50px);text-align: center;" v-if="showStatic">
diff --git a/nezha-fronted/src/components/charts/chart-list-group.vue b/nezha-fronted/src/components/charts/chart-list-group.vue
index a8fd0db07..0eb3dfb1b 100644
--- a/nezha-fronted/src/components/charts/chart-list-group.vue
+++ b/nezha-fronted/src/components/charts/chart-list-group.vue
@@ -46,7 +46,7 @@
   }
 </style>
 <template>
-  <div class="list-width"  id="listContainer" ref="listContainer"><!--v-drag-->
+  <div class="list-width chart-group"  id="listContainer" ref="listContainer"><!--v-drag-->
 
     <span class="temp-dom"></span>
 
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index ac06f319f..7fb0f8e0c 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -122,6 +122,7 @@ import bus from '../../../libs/bus'
 import pickTime from '../../common/pickTime'
 import exportXLSX from '../../common/exportXLSX'
 import selectPanel from '../../common/popBox/selectPanel'
+import panelBox from '@/components/common/rightBox/panelBox'
 
 export default {
   name: 'panel',
@@ -204,7 +205,8 @@ export default {
     'chart-list': ChartList,
     'pick-time': pickTime,
     'export-excel': exportXLSX,
-    selectPanel
+    selectPanel,
+    'panel-box': panelBox
   },
   methods: {
     // 刷新
@@ -1062,4 +1064,7 @@ export default {
   .box-content .show-top .chartBox:last-child{
     margin-bottom: 50px !important;
   }
+  .box-content .show-top .chart-group .chartBox:last-child{
+    margin-bottom: 0px !important;
+  }
 </style>