From 01faf800caf38e994c9bdcb155a201b9d12f681c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 21 Jan 2022 16:07:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=B7=BB=E5=8A=A0group=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/charts/Chart2.vue            |  6 ++++--
 src/views/charts/Panel.vue             |  3 +++
 src/views/charts/charts/ChartGroup.vue | 23 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 src/views/charts/charts/ChartGroup.vue

diff --git a/src/views/charts/Chart2.vue b/src/views/charts/Chart2.vue
index 2e51e59d..a6a59748 100644
--- a/src/views/charts/Chart2.vue
+++ b/src/views/charts/Chart2.vue
@@ -35,12 +35,12 @@
         :entity="entity"
       ></chart-block>
 
-      <chart-block
+      <chart-group
               v-else-if="isGroup"
               :chart-info="chartInfo"
               :chart-data="chartData"
               :entity="entity"
-      ></chart-block>
+      ></chart-group>
 
       <ip-basic-info
         v-else-if="isIpBasicInfo"
@@ -156,6 +156,7 @@ import ChartTabs from '@/views/charts/charts/ChartTabs'
 import ChartMap from '@/views/charts/charts/ChartMap'
 import ChartSingleValue from '@/views/charts/charts/ChartSingleValue'
 import ChartBlock from '@/views/charts/charts/ChartBlock'
+import ChartGroup from '@/views/charts/charts/ChartGroup'
 import IpBasicInfo from '@/views/charts/charts/IpBasicInfo'
 import ChartEchartLine from '@/views/charts/charts/ChartEchartLine'
 import ChartActiveIpTable from '@/views/charts/charts/ChartActiveIpTable'
@@ -226,6 +227,7 @@ export default {
     ChartCategoryBar,
     ChartIpOpenPortBar,
     ChartRelationShip,
+    ChartGroup
   },
   props: {
     chartInfo: Object,
diff --git a/src/views/charts/Panel.vue b/src/views/charts/Panel.vue
index 0ef1985f..c5f1e46e 100644
--- a/src/views/charts/Panel.vue
+++ b/src/views/charts/Panel.vue
@@ -124,6 +124,9 @@ export default {
           chart.h = 1
         }
       }
+      if (chart.type === 95) {
+        chart.h += 1
+      }
       if (!this.$_.isEmpty(chart.children)) {
         chart.children.forEach(c => {
           this.recursionParamsConvert(c)
diff --git a/src/views/charts/charts/ChartGroup.vue b/src/views/charts/charts/ChartGroup.vue
new file mode 100644
index 00000000..9e80059e
--- /dev/null
+++ b/src/views/charts/charts/ChartGroup.vue
@@ -0,0 +1,23 @@
+<template>
+  <panel-chart-list
+      :time-filter="timeFilter"
+      :data-list="chartInfo.children"
+      :panel-lock="true"
+      :entity="entity"
+  >
+  </panel-chart-list>
+</template>
+
+<script>
+import chartMixin from '@/views/charts/charts/chart-mixin'
+
+export default {
+  name: 'ChartBlock',
+  mixins: [chartMixin],
+  props: {
+    timeFilter: Object
+  },
+  mounted () {
+  }
+}
+</script>