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

# Conflicts: # nezha-fronted/src/components/chart/panelChart.vue
2023-06-08 15:35:37 +08:00
parent 36cfe4f29b 459d2246f0
commit 19e12ca395
4 changed files with 20 additions and 2 deletions
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -113,6 +113,11 @@
    >
      <panel-chart
        v-if="prevChart"
+        :nowTimeType="{
+          id: 4,
+          type: 'hour',
+          value: 1
+        }"
        style="height: 100%;width: 100%"
        :ref="'chart-fullscreen-previewShow'"
        :chart-info="prevChart"