diff --git a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue index 562df22b..1f108e54 100644 --- a/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue +++ b/ui/dasadmin/src/views/backend/statAnalysis/powerCurveAnalysis.vue @@ -75,11 +75,9 @@ const statAnalysisInterval = ref('1h') const statAnalysisDeviceId = ref('') const statAnalysisSelectOptions: any = reactive({ interval: [ - { label: '一分钟', value: '1m' }, { label: '一分钟', value: '1m' }, { label: '五分钟', value: '5m' }, { label: '十分钟', value: '10m' }, - { label: '十分钟', value: '10m' }, { label: '十五分钟', value: '15m' }, { label: '一小时', value: '1h' }, { label: '一天', value: '1d' }, diff --git a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue index f777e90d..b78656fe 100644 --- a/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue +++ b/ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue @@ -575,8 +575,8 @@ const getTimestamps = (start: any, end: any, interval: any) => { case '5m': current += 5 * 60 * 1000 break - case '15m': - current += 15 * 60 * 1000 + case '10m': + current += 10 * 60 * 1000 break case '1d': current += 24 * 60 * 60 * 1000