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

# Conflicts:
#	nezha-fronted/src/components/chart/chartHeaderMixin.js

nezha-fronted/src/components/chart/ChartScreenHeader.vue

@@ -203,8 +203,13 @@ export default {
       this.searchTime[1] = bus.timeFormate(this.timeRange[1])
       this.nowType.start_time = this.searchTime[0]
       this.nowType.end_time = this.searchTime[1]
-      this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
+      if (!this.nowTimeType) {
-      this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType)
+        this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowType)
+        this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType)
+      } else {
+        this.$refs.pickTime.$refs.timePicker.setCustomTime(this.nowTimeType)
+        this.setSearchTime(this.nowType.type, this.nowType.value, this.nowTimeType)
+      }
     }
   }
 }

nezha-fronted/src/components/chart/chartHeaderMixin.js

@@ -31,6 +31,9 @@ export default {
       type: Boolean,
       default: true
     },
+    nowTimeType: {
+      type: Number
+    },
     hiddenText: { // 隐藏图表的悬浮文字
       type: String
     }

nezha-fronted/src/components/chart/panelChart.vue

@@ -8,6 +8,7 @@
       :isExportHtml="isExportHtml"
       :isError="isError"
       :from="from"
+      :nowTimeType="nowTimeType"
       :chartData="chartData"
       :chart-info="chartInfo"
       :showAllData.sync="showAllData"
@@ -28,6 +29,7 @@
       :is-group="isGroup(chartInfo.type)"
       :isError="isError"
       :from="from"
+      :nowTimeType="nowTimeType"
       :chartData="chartData"
       :chart-info="chartInfo"
       :showAllData.sync="showAllData"
@@ -98,6 +100,9 @@ export default {
       type: Boolean,
       default: true
     },
+    nowTimeType: {
+      type: Object
+    },
     isExportHtml: { // 是否是导出的html
       type: Boolean,
       default: false

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"