diff --git a/nezha-fronted/src/components/chart/chart/chartGroup.vue b/nezha-fronted/src/components/chart/chart/chartGroup.vue
index 9aade87df..0e20aa002 100644
--- a/nezha-fronted/src/components/chart/chart/chartGroup.vue
+++ b/nezha-fronted/src/components/chart/chart/chartGroup.vue
@@ -6,6 +6,8 @@
       name="group"
       :class="{'show-top':showTopBtn}"
       :data-list="dataList"
+      :dataJson = "dataJson.chartsData"
+      :is-export-html="!!dataJson"
       :nowTimeType="nowTimeType"
       :from="from"
       :panel-lock="panelLock"
@@ -43,7 +45,8 @@ export default {
       fromRoute,
       dataList: [],
       showTopBtn: false,
-      chartListLoading: false
+      chartListLoading: false,
+      dataJson: window.dataJson || ''
     }
   },
   methods: {
diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js
index 7e3d6fc1b..f4aa247c8 100644
--- a/nezha-fronted/src/components/chart/chartMixin.js
+++ b/nezha-fronted/src/components/chart/chartMixin.js
@@ -118,12 +118,16 @@ export default {
         //  legend = ''
       }
       // 处理legend别名
-      alias = alias + this.handleLegendAlias(legend, chartInfo.elements[expressionIndex].legend)
-      if (!alias) {
-        alias = chartInfo.elements[expressionIndex].expression || ''
-      }
-      if (alias == 'Previous ') {
-        alias += chartInfo.elements[expressionIndex].expression
+      if (chartInfo.elements) {
+        if (chartInfo.elements[expressionIndex]) {
+          alias = alias + this.handleLegendAlias(legend, chartInfo.elements[expressionIndex].legend)
+        }
+        if (!alias) {
+          alias = chartInfo.elements[expressionIndex].expression || ''
+        }
+        if (alias == 'Previous ') {
+          alias += chartInfo.elements[expressionIndex].expression
+        }
       }
       // proj_status_
       const legendIndex = expressionIndex + 'and' + dataIndex
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 354a7a825..0a544af1e 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -435,8 +435,9 @@ export default {
           }
           case 'system': {
             this.chartData = []
-            this.chartData.push(this.dataJson[this.chartInfo.id + '_' + 0])
+            this.chartData.push(this.dataJson[this.chartInfo.id + '_' + 0].result)
           }
+            break
           case 'misc': {
             this.loading = false
             setTimeout(() => {
@@ -503,6 +504,9 @@ export default {
             break
           }
         }
+        if (this.chartInfo.type === 'log') {
+          this.logChartDataFormat()
+        }
         this.loading = false
       } catch (e) {
         this.loading = false
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index a4fc76683..d1e0b090b 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -424,7 +424,7 @@ export default {
           item.chartId = ''
           delete item.seq
         })
-        if (this.chart.datasource !== 'metrics' && this.chart.datasource !== 'log') {
+        if (this.chart.datasource !== 'metrics' && this.chart.datasource !== 'logs') {
           delete this.chart.elements
         }
         if (!this.chart.groupId || this.chart.groupId == -1) {
diff --git a/nezha-fronted/src/entrance/exportHtml/App.vue b/nezha-fronted/src/entrance/exportHtml/App.vue
index 8fb2c3dca..1587a49cb 100644
--- a/nezha-fronted/src/entrance/exportHtml/App.vue
+++ b/nezha-fronted/src/entrance/exportHtml/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="entrance" class="theme-light body container list-page" style="height: 100%">
+  <div id="entrance" class="theme-light body container list-page" style="height: calc(100% - 50px)">
     <div class="main-list">
       <div id="tableList" class="table-list" style='overflow-y: unset'>
         <div class="table-list-box">
@@ -9,12 +9,12 @@
                     height="40px"
                    style="vertical-align: middle;margin-left: 5px"
               />
-              {{dataJson.panel.name}}
+              {{dataJson.panel.data.name}}
             </span>
 
             <span>
-              <i class="nz-icon nz-icon-arrow-down"/>
-              {{timeFormate(dataJson.start)}} - {{timeFormate(dataJson.start)}}
+<!--              <i class="nz-icon nz-icon-arrow-down"/>-->
+              {{timeFormate(dataJson.start * 1000)}} - {{timeFormate(dataJson.start * 1000)}}
             </span>
           </div>
           <div  id="dashboardScrollbar" class="box-content"  ref="dashboardScrollbar" style='overflow-y: auto'>
diff --git a/nezha-fronted/src/entrance/exportHtml/exportHtml.html b/nezha-fronted/src/entrance/exportHtml/exportHtml.html
index 304c847dd..df1671855 100644
--- a/nezha-fronted/src/entrance/exportHtml/exportHtml.html
+++ b/nezha-fronted/src/entrance/exportHtml/exportHtml.html
@@ -1,59 +1,6 @@
 <!DOCTYPE html>
 <html>
 <script>
-  window.dataJson = {
-    panel: { id: 1487, name: 'Overview', createBy: 1, type: 'dashboard', link: 0, pid: 0, weight: 0, buildIn: 1, seq: 'v3.2-buildin', children: [], parent: null, chartNum: 18 },
-    language: 'zh',
-    start: 1651833659000,
-    end: 1651833659000,
-    charts: {
-      msg: 'success',
-      code: 200,
-      data: {
-        total: 1,
-        pageSize: -1,
-        pages: 1,
-        pageNo: 1,
-        list: [{
-          id: 10341,
-          name: 'Last Slave',
-          panelId: 675,
-          groupId: 0,
-          span: 4.0,
-          height: 4.0,
-          updateBy: 106,
-          updateAt: '2022-04-26 01:53:21',
-          type: 'line',
-          unit: 2,
-          weight: 0,
-          param: { stack: 0, thresholds: [{ color: '#06a041' }], thresholdShow: true, legend: { values: ['range', 'last'], show: true, placement: 'bottom' }, enable: { thresholds: false, legend: true, valueMapping: false }, link: '', valueMapping: [], nullType: 'null' },
-          pid: null,
-          buildIn: 0,
-          remark: '',
-          seq: null,
-          x: 0.0,
-          y: 12.0,
-          elements: [{ id: 16051, chartId: 10341, expression: 'redis_rdb_last_save_timestamp_seconds', type: 'expert', legend: '', buildIn: 0, seq: null, name: 'A', state: 1 }],
-          sync: null,
-          panel: { id: 675, name: 'NZ Mariadb', createBy: null, type: null, link: null, pid: null, weight: null, buildIn: null, seq: null, children: null, parent: null, chartNum: null },
-          group: { id: 0, name: null, panelId: null, groupId: null, span: null, height: null, updateBy: null, updateAt: null, type: null, unit: null, weight: null, param: null, pid: null, buildIn: null, remark: null, seq: null, x: null, y: null, elements: null, sync: null, panel: null, group: null, children: null, chartNums: null, asset: null, varType: null, varId: null, varName: null, datasource: null },
-          children: null,
-          chartNums: null,
-          asset: null,
-          varType: null,
-          varId: null,
-          varName: null,
-          datasource: 'metrics'
-        }]
-      },
-      time: '2022-05-05 07:26:03'
-    },
-    chartsData: {
-      '10341_0': { data: { result: [{ metric: { endpoint: '7400-192.168.40.165-MCN0-MAAT', module_id: '293', nz_agent_id: '75', __name__: 'redis_rdb_last_save_timestamp_seconds', project_id: '25', module: 'MCN0-MAAT', endpoint_id: '253', project: '7400', datacenter: 'xin_xi_gang_DC', asset_id: '29', asset: '7400-192.168.40.165', datacenter_id: '4' }, values: [[1651735328, '1651735257'], [1651735343, '1651735257'], [1651735358, '1651735257'], [1651735373, '1651735257'], [1651735388, '1651735257'], [1651735403, '1651735257'], [1651735418, '1651735257'], [1651735433, '1651735257'], [1651735448, '1651735257'], [1651735463, '1651735257'], [1651735478, '1651735257'], [1651735493, '1651735257'], [1651735508, '1651735257'], [1651735523, '1651735257'], [1651735538, '1651735257'], [1651735553, '1651735257'], [1651735568, '1651735257'], [1651735583, '1651735257'], [1651735598, '1651735257'], [1651735613, '1651735257'], [1651735628, '1651735257']] }, { metric: { endpoint: 'CM-Sync-Redis-Bifang-CM-Server', module_id: '173', nz_agent_id: '73', __name__: 'redis_rdb_last_save_timestamp_seconds', project_id: '19', module: 'CM-Sync-Redis', endpoint_id: '433', project: 'Bifang-CM', datacenter: 'xin_xi_gang_DC', asset_id: '127', asset: 'Bifang-CM-Server', datacenter_id: '4' }, values: [[1651735328, '1651735396'], [1651735343, '1651735396'], [1651735358, '1651735396'], [1651735373, '1651735396'], [1651735388, '1651735396'], [1651735403, '1651735396'], [1651735418, '1651735396'], [1651735433, '1651735396'], [1651735448, '1651735396'], [1651735463, '1651735396'], [1651735478, '1651735396'], [1651735493, '1651735396'], [1651735508, '1651735396'], [1651735523, '1651735396'], [1651735538, '1651735396'], [1651735553, '1651735396'], [1651735568, '1651735396'], [1651735583, '1651735396'], [1651735598, '1651735396'], [1651735613, '1651735396'], [1651735628, '1651735396']] }, { metric: { endpoint: 'CM-Sync-Redis-Bifang-CM-Server1', module_id: '173', nz_agent_id: '75', __name__: 'redis_rdb_last_save_timestamp_seconds', project_id: '19', module: 'CM-Sync-Redis', endpoint_id: '435', project: 'Bifang-CM', datacenter: 'xin_xi_gang_DC', asset_id: '129', asset: 'Bifang-CM-Server1', datacenter_id: '4' }, values: [[1651735328, '1651735396'], [1651735343, '1651735396'], [1651735358, '1651735396'], [1651735373, '1651735396'], [1651735388, '1651735396'], [1651735403, '1651735396'], [1651735418, '1651735396'], [1651735433, '1651735396'], [1651735448, '1651735396'], [1651735463, '1651735396'], [1651735478, '1651735396'], [1651735493, '1651735396'], [1651735508, '1651735396'], [1651735523, '1651735396'], [1651735538, '1651735396'], [1651735553, '1651735396'], [1651735568, '1651735396'], [1651735583, '1651735396'], [1651735598, '1651735396'], [1651735613, '1651735396'], [1651735628, '1651735396']] }, { metric: { endpoint: 'CM-Redis-192.168.44.18', module_id: '173', nz_agent_id: '75', __name__: 'redis_rdb_last_save_timestamp_seconds', project_id: '19', module: 'CM-Sync-Redis', endpoint_id: '57', project: 'Bifang-CM', datacenter: 'xin_xi_gang_DC', asset_id: '11', asset: 'Bifang-CM-Server2', datacenter_id: '4' }, values: [[1651735328, '1651735371'], [1651735343, '1651735371'], [1651735358, '1651735371'], [1651735373, '1651735371'], [1651735388, '1651735371'], [1651735403, '1651735371'], [1651735418, '1651735371'], [1651735433, '1651735371'], [1651735448, '1651735371'], [1651735463, '1651735371'], [1651735478, '1651735371'], [1651735493, '1651735371'], [1651735508, '1651735371'], [1651735523, '1651735371'], [1651735538, '1651735371'], [1651735553, '1651735371'], [1651735568, '1651735371'], [1651735583, '1651735371'], [1651735598, '1651735371'], [1651735613, '1651735371'], [1651735628, '1651735371']] }], resultType: 'matrix' }, status: 'success' },
-      '1_1': { data: { result: [], resultType: 'matrix' }, status: 'success' },
-      '[id]_[index]': {}
-    }
-  }
 </script>
 <head>
   <meta charset="utf-8">