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

3 files changed, 2 insertions, 26 deletions

diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
index 7e8d6842e..2c1abefd4 100644
--- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue
+++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue
@@ -104,28 +104,6 @@ export default {
     closeDialog () {
       this.$emit('close')
     },
-    // setSearchTime (type, val, nowTimeType) { // 设置searchTime
-    //   if (type === 'minute') {
-    //     const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setMinutes(new Date(bus.computeTimezone(new Date().getTime())).getMinutes() - val))
-    //     const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
-    //     this.$set(this.searchTime, 0, startTime)
-    //     this.$set(this.searchTime, 1, endTime)
-    //     this.$set(this.searchTime, 2, val + 'm')
-    //   } else if (type === 'hour') {
-    //     const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - val))
-    //     const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
-    //     this.$set(this.searchTime, 0, startTime)
-    //     this.$set(this.searchTime, 1, endTime)
-    //     this.$set(this.searchTime, 2, val + 'h')
-    //   } else if (type === 'date') {
-    //     const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setDate(new Date(bus.computeTimezone(new Date().getTime())).getDate() - val))
-    //     const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
-    //     this.$set(this.searchTime, 0, startTime)
-    //     this.$set(this.searchTime, 1, endTime)
-    //     this.$set(this.searchTime, 2, val + 'd')
-    //   }
-    //   this.$refs.pickTime.$refs.timePicker.searchTime = this.searchTime
-    // },
     showTime (type) {
       switch (type) {
         case 'line' :
diff --git a/nezha-fronted/src/components/chart/chartHeaderMixin.js b/nezha-fronted/src/components/chart/chartHeaderMixin.js
index 57db56a1b..7f248fab0 100644
--- a/nezha-fronted/src/components/chart/chartHeaderMixin.js
+++ b/nezha-fronted/src/components/chart/chartHeaderMixin.js
@@ -32,8 +32,6 @@ export default {
       type: Boolean,
       default: true
     },
-    nowTimeType: {
-    },
     hiddenText: { // 隐藏图表的悬浮文字
       type: String
     },
diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue
index 84df9cd2b..febb5d8a2 100644
--- a/nezha-fronted/src/components/chart/panelChart.vue
+++ b/nezha-fronted/src/components/chart/panelChart.vue
@@ -222,7 +222,7 @@ export default {
       let startTime = ''
       let endTime = ''
       // todo 刷新 需要判断是否是相对时间
-      if (isRefresh) { // 刷新则视情况更新时间范围
+      if (isRefresh || this.isFullscreen) { // 刷新则视情况更新时间范围
         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()
@@ -234,7 +234,7 @@ export default {
         } else {
           nowTimeType = JSON.parse(nowTimeType)
         }
-        if (numInterval >= 60000 && nowTimeType.value !== -1) { // 大于1分钟，则start、end均往后移numInterval，否则时间不变
+        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')
           endTime = bus.timeFormate(now, 'YYYY-MM-DD HH:mm:ss')
         } else {