@@ -1216,8 +1236,9 @@ export default {
case 'bubble':
case 'rank':
case 'funnel':
- if (this.oldType === 'stat') {
- this.chartConfig.param.sparklineMode = 'line'
+ if (type === 'stat') {
+ if (!this.chartConfig.param.sparklineMode) { this.chartConfig.param.sparklineMode = 'line' }
+ if (!this.chartConfig.param.comparison) { this.chartConfig.param.comparison = 'none' }
}
if (this.oldType === 'stat' || this.oldType === 'gauge' || this.oldType === 'sankey' || this.oldType === 'hexagon' || this.oldType === 'bubble' || this.oldType === 'rank' || this.oldType === 'funnel') {
break
@@ -1243,7 +1264,8 @@ export default {
varValue: '',
result: 'show'
},
- sparklineMode: 'line'
+ sparklineMode: 'line',
+ comparison: 'none'
}
break
case 'bar':
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
index c4c331d01..be01b7ad8 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue
@@ -243,8 +243,9 @@ export default {
delete params.param.min
delete params.param.max
}
- if (!this.isShowSparkline(params.type)) {
+ if (!this.isStat(params.type)) {
delete params.param.sparklineMode
+ delete params.param.comparison
}
if (!params.x && !params.y && this.from === 'endpointQuery') { // endpointQuery 新增 放在最后
params.x = 0
diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js b/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
index cf2e6b432..e344a4463 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/chartTypeShow.js
@@ -232,7 +232,7 @@ export default {
default: return false
}
},
- isShowSparkline (type) {
+ isStat (type) {
switch (type) {
case 'stat':
return true
diff --git a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
index 113a9f1ce..3a967fe08 100644
--- a/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
+++ b/nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
@@ -391,6 +391,28 @@ export default {
id: 'none',
name: this.$t('project.topology.none')
}
+ ],
+ comparisonTypeList: [
+ {
+ id: 'none',
+ name: this.$t('project.topology.none')
+ },
+ {
+ id: 'hour',
+ name: this.$t('dashboard.chartForm.comparison.hour')
+ },
+ {
+ id: 'day',
+ name: this.$t('dashboard.chartForm.comparison.day')
+ },
+ {
+ id: 'week',
+ name: this.$t('dashboard.chartForm.comparison.week')
+ },
+ {
+ id: 'month',
+ name: this.$t('dashboard.chartForm.comparison.month')
+ }
]
}
},
diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue
index 11cb7b17e..e1b5b15f6 100644
--- a/nezha-fronted/src/components/page/dashboard/dashboard.vue
+++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue
@@ -486,7 +486,6 @@ export default {
if (!this.hasButton('dashboard_view')) {
return
}
- console.log(this.rightBox.panel.show)
this.rightBox.panel.show = true
// 关闭selectDashboard弹框
this.$refs.selectDashboard && this.$refs.selectDashboard.esc()
@@ -602,8 +601,9 @@ export default {
if (!this.chart.groupId || this.chart.groupId == -1) {
this.chart.groupId = ''
}
- if (this.chart.type === 'stat' && !this.chart.param.sparklineMode) {
- this.chart.param.sparklineMode = 'none'
+ if (this.chart.type === 'stat') {
+ if (!this.chart.param.sparklineMode) { this.chart.param.sparklineMode = 'none' }
+ if (!this.chart.param.comparison) { this.chart.param.comparison = 'none' }
}
if (this.chart.type == 'table') {
const arr = this.chart.param.indexs ? this.chart.param.indexs.split(',') : []
diff --git a/nezha-fronted/src/libs/bus.js b/nezha-fronted/src/libs/bus.js
index d03f4fbf3..6016aa61a 100644
--- a/nezha-fronted/src/libs/bus.js
+++ b/nezha-fronted/src/libs/bus.js
@@ -93,9 +93,9 @@ export default new Vue({
const thirtyDay = 2592000000
if (numInterval < oneDay) { // 小于1天，step为15s
step = '15s'
- } else if (numInterval < sevenDay) { // 小于7天，step为15s
+ } else if (numInterval < sevenDay) { // 小于7天，step为5m
step = '5m'
- } else if (numInterval < thirtyDay) { // 小于30天，step为15s
+ } else if (numInterval < thirtyDay) { // 小于30天，step为10m
step = '10m'
} else {
step = '30m'