diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue index 437d9593b..6271427ea 100644 --- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue +++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue @@ -201,8 +201,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) - this.setSearchTime(this.nowType.type, this.nowType.value, this.nowType) + if (!this.nowTimeType) { + 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) + } } } } diff --git a/nezha-fronted/src/components/chart/chartHeaderMixin.js b/nezha-fronted/src/components/chart/chartHeaderMixin.js index cecb692c7..227a72802 100644 --- a/nezha-fronted/src/components/chart/chartHeaderMixin.js +++ b/nezha-fronted/src/components/chart/chartHeaderMixin.js @@ -27,6 +27,9 @@ export default { type: Boolean, default: false }, + nowTimeType: { + type: Number + }, hiddenText: { // 隐藏图表的悬浮文字 type: String } diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index f9a08cad1..70e5901eb 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/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" @@ -27,6 +28,7 @@ :is-group="isGroup(chartInfo.type)" :isError="isError" :from="from" + :nowTimeType="nowTimeType" :chartData="chartData" :chart-info="chartInfo" :showAllData.sync="showAllData" @@ -95,6 +97,9 @@ export default { type: Boolean, default: true }, + nowTimeType: { + type: Object + }, isExportHtml: { // 是否是导出的html type: Boolean, default: false diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue index 3429fac45..8337af8f6 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue @@ -113,6 +113,11 @@ >