Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6

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)

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) {

nezha-fronted/src/components/page/tool/ping.vue

@@ -165,6 +165,7 @@ export default {
   },
   data () {
     return {
+      tableId: 'ping',
       // 防止用户重复点击
       flag: true,
       loading: false,

nezha-fronted/src/components/page/tool/trace.vue

@@ -158,6 +158,7 @@ export default {
   },
   data () {
     return {
+      tableId: 'trace',
       // 防止用户重复点击
       flag: true,
       loading: false,