From de8507618d674f01f1fe9ec3bc8e90bd833ee687 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Tue, 15 Nov 2022 16:14:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E6=A8=A1=E6=9D=BFGroup=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/config/template/chartTemp.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/template/chartTemp.vue b/nezha-fronted/src/components/page/config/template/chartTemp.vue
index e75a44b79..dd3d5e95e 100644
--- a/nezha-fronted/src/components/page/config/template/chartTemp.vue
+++ b/nezha-fronted/src/components/page/config/template/chartTemp.vue
@@ -270,10 +270,13 @@ export default {
         const length = this.object.name.length - 64
         this.object.name = u.name.substring(0, u.name.length - length) + '-copy'
       }
-      this.object.elements = this.object.elements.map(item => {
-        item.id = ''
-        return item
-      })
+      if (this.object.type !== 'group') {
+        this.object.elements = this.object.elements.map(item => {
+          item.id = ''
+          return item
+        })
+      }
+
       this.rightBox.show = true
     },
     chartBySync (row) {

From 46b0dfe2e4cb2821d5f0456d15e26f3c3ade0e7b Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 16 Nov 2022 11:49:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?NEZ-2395=20fix=EF=BC=9A=20terminalLog=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/terminalLogCMDTab.vue    | 4 +++-
 nezha-fronted/src/components/page/tool/ping.vue               | 1 +
 nezha-fronted/src/components/page/tool/trace.vue              | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
index 248da7b15..0b69452f3 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
@@ -1,5 +1,6 @@
 <template>
   <nz-bottom-data-list
+    :showPagination="false"
     :showTitle='showTitle'
     :obj='obj'
     :layout="[]"
@@ -50,7 +51,8 @@ export default {
     calcTime () {
       return function (time) {
         if (this.obj.startTime) {
-          const startTime = new Date(this.utcTimeToTimezoneStr(this.obj.startTime)).getTime()
+          console.log(this.utcTimeToTimezoneStr(this.obj.startTime))
+          const startTime = this.momentStrToTimestamp(this.utcTimeToTimezoneStr(this.obj.startTime))
           if (startTime) {
             const thisTime = startTime + time
             return this.momentTz(thisTime)
diff --git a/nezha-fronted/src/components/page/tool/ping.vue b/nezha-fronted/src/components/page/tool/ping.vue
index 9fb3ec1ef..0cac8f410 100644
--- a/nezha-fronted/src/components/page/tool/ping.vue
+++ b/nezha-fronted/src/components/page/tool/ping.vue
@@ -165,6 +165,7 @@ export default {
   },
   data () {
     return {
+      tableId: 'ping',
       // 防止用户重复点击
       flag: true,
       loading: false,
diff --git a/nezha-fronted/src/components/page/tool/trace.vue b/nezha-fronted/src/components/page/tool/trace.vue
index 89d33d64c..a797e9cb1 100644
--- a/nezha-fronted/src/components/page/tool/trace.vue
+++ b/nezha-fronted/src/components/page/tool/trace.vue
@@ -158,6 +158,7 @@ export default {
   },
   data () {
     return {
+      tableId: 'trace',
       // 防止用户重复点击
       flag: true,
       loading: false,