From d1c6a8c8b0d24ef978309a73dcfa7d37806ca070 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 17 Dec 2021 16:39:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=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/components/chart/chartList.vue          | 8 +++++---
 .../components/common/rightBox/chart/chartRightBox.vue    | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue
index 7d196b35f..e52334498 100644
--- a/nezha-fronted/src/components/chart/chartList.vue
+++ b/nezha-fronted/src/components/chart/chartList.vue
@@ -86,7 +86,7 @@
 <script>
 import VueGridLayout from 'vue-grid-layout'
 import { fromRoute } from '@/components/common/js/constants'
-import { getGroupHeight, getLayoutPosition } from './chart/tools'
+import {getGroupHeight, getLayoutPosition, isGroup} from './chart/tools'
 import panelChart from '@/components/chart/panelChart'
 import bus from '@/libs/bus'
 import groupData from '@/components/chart/tempGroup'
@@ -289,8 +289,10 @@ export default {
         this.firstInit = true
         this.gridLayoutLoading = true
         this.noData = !n || n.length < 1
-        const position = getLayoutPosition(n)
-        this.$store.commit('setChartLastPosition', position)
+        if (!this.isGroup) {
+          const position = getLayoutPosition(n)
+          this.$store.commit('setChartLastPosition', position)
+        }
         const tempList = n.map(item => {
           let param = ''
           let height = ''
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index 38c9d78ef..529d0f1b7 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -174,10 +174,14 @@ export default {
         if (!params.groupId) {
           params.groupId = 0
         }
-        if (!params.x || !params.y) {
+        if (!params.x && !params.y) {
           params.x = this.chartLastPosition.x + params.span > 12 ? 0 : this.chartLastPosition.x
           params.y = this.chartLastPosition.y + 12
         }
+        if (!params.x && !params.y && params.groupId) { // group 内的坐标需要单独计算
+          params.x = 0
+          params.y = 999
+        }
         delete params.panel
         if (params.type === 'table') {
           delete params.param.tags