From e8677c02b3dcb886ec7ba203369a2651e49dd8b9 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Fri, 11 Mar 2022 21:04:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8F=AF=E6=8A=98?=
 =?UTF-8?q?=E5=8F=A0=E5=9B=BE=E8=A1=A8=E7=BB=84=E9=AB=98=E5=BA=A6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/components/views/charts/panel.scss   |  3 +--
 .../css/components/views/detections/detections.scss |  2 +-
 src/views/charts/PanelChartList.vue                 | 13 ++++---------
 src/views/charts/charts/tools.js                    | 13 +++++++++++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss
index 7448512e..66bcd181 100644
--- a/src/assets/css/components/views/charts/panel.scss
+++ b/src/assets/css/components/views/charts/panel.scss
@@ -30,7 +30,7 @@
           justify-content:space-between;
           align-items:center;
           padding: 10px 20px 10px 18px;
-          height: 47px;
+          flex: 0 0 40px;
 
           font-size: 16px;
           color: $--color-text-primary;
@@ -214,7 +214,6 @@
           position: relative;
           border-radius: 2px;
           flex-grow: 1;
-          overflow: auto;
           width: 100%;
           .chart-drawing {
             height: 100%;
diff --git a/src/assets/css/components/views/detections/detections.scss b/src/assets/css/components/views/detections/detections.scss
index 0507ea03..ad0cb22b 100644
--- a/src/assets/css/components/views/detections/detections.scss
+++ b/src/assets/css/components/views/detections/detections.scss
@@ -21,7 +21,7 @@
       justify-content:space-between;
       align-items:center;
       padding: 10px 20px 10px 0px;
-      height: 40px;
+      flex: 0 0 40px;
 
       font-size: 14px;
       color: $--color-text-primary;
diff --git a/src/views/charts/PanelChartList.vue b/src/views/charts/PanelChartList.vue
index fcf88881..7f3a0423 100644
--- a/src/views/charts/PanelChartList.vue
+++ b/src/views/charts/PanelChartList.vue
@@ -66,7 +66,7 @@
 <script>
 import PanelChart from '@/views/charts/PanelChart'
 import VueGridLayout from 'vue-grid-layout'
-import { getGroupHeight, getTypeCategory } from './charts/tools'
+import { getGroupHeight, getTypeCategory, isGroup } from './charts/tools'
 import _ from 'lodash'
 
 export default {
@@ -126,7 +126,7 @@ export default {
           if (item.params.collapse) {
             item.h = 1
           } else {
-            item.h = getGroupHeight(item.children) + 1.5
+            item.h = getGroupHeight(item.children) + 0.4 + 1
           }
         }
       })
@@ -139,13 +139,8 @@ export default {
         const children = parent.children.find(item => item.id === chart.id)
         children.h = chart.h
         children.params = chart.params
-        let sumGroup = 0
-        childrenList.forEach(item => {
-          if (item.type === 94) {
-            sumGroup++
-          }
-        })
-        parent.h = getGroupHeight(childrenList) + sumGroup * 0.5
+        // 第二个是空隙，第三个是标题的高度
+        parent.h = getGroupHeight(childrenList) + 0.4 + 1
         this.copyDataList = [...this.copyDataList]
       }, 100)
     }
diff --git a/src/views/charts/charts/tools.js b/src/views/charts/charts/tools.js
index 7654b4ef..00650d26 100644
--- a/src/views/charts/charts/tools.js
+++ b/src/views/charts/charts/tools.js
@@ -219,7 +219,16 @@ export function getLayout (type) {
 
 export function getGroupHeight (arr) {
   if (arr.length) {
-    let lastItem = []
+    let minYArr = [...arr]
+    minYArr.sort((a, b) => {
+      return a.y - b.y
+    })
+    let maxYArr = [...arr]
+    maxYArr.sort((a, b) => {
+      return (b.y + b.h) - (a.y + a.h)
+    })
+    return maxYArr[0].y + maxYArr[0].h - minYArr[0].y
+    /*let lastItem = []
     let maxY = arr[0].y
     arr.forEach((children, index) => {
       if (maxY === children.y) {
@@ -238,7 +247,7 @@ export function getGroupHeight (arr) {
     if (maxY < 0) {
       maxY = 0
     }
-    return maxHeight + maxY
+    return maxHeight + maxY*/
   } else {
     return 1
   }