Merge branch 'dev-3.10' of git.mesalab.cn:nezha/nezha-fronted into dev-3.11

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

@@ -56,6 +56,7 @@
           :chart-info="item"
           :from="from"
           :time-range="timeRange"
+          :nowTimeType="nowTimeType"
           @groupShow="groupShow"
           :isExportHtml="isExportHtml"
           :dataJson="dataJson"
@@ -96,6 +97,7 @@
         :dataJson="dataJson"
         :panelLock="panelLock"
         :time-range="timeRange"
+        :nowTimeType="nowTimeType"
         @showFullscreen="showFullscreen"
       ></panel-chart>
     </el-dialog>
@@ -120,6 +122,9 @@ export default {
     dashboardId: {},
     chartDetailInfo: Object,
     timeRange: Array, // 时间范围
+    nowTimeType: {
+      type: Object
+    },
     isGroup: Boolean,
     groupInfo: {},
     from: String,

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

@@ -228,13 +228,12 @@ export default {
         const now = new Date(bus.computeTimezone(new Date().getTime()))
         const origin = new Date(bus.timeFormate(bus.formateTimeToTime(this.timeRange[1]), 'YYYY-MM-DD HH:mm:ss'))
         const numInterval = now.getTime() - origin.getTime()
-        let nowTimeType = this.$route.query.nowTimeType
+        let nowTimeType = this.nowTimeType
+        console.log(nowTimeType)
         if (!nowTimeType) {
           nowTimeType = {
             value: 1
           }
-        } else {
-          nowTimeType = JSON.parse(nowTimeType)
         }
         if (numInterval >= 15000 && nowTimeType.value !== -1) { // 大于1分钟，则start、end均往后移numInterval，否则时间不变
           startTime = bus.getNewTime(bus.formateTimeToTime(this.timeRange[0]), numInterval, 'YYYY-MM-DD HH:mm:ss')