From 775b87d5e366bfc549200a5a2b10bb73002e483b Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 31 Oct 2023 10:46:48 +0800 Subject: [PATCH 01/11] =?UTF-8?q?NEZ-3290=20fix=EF=BC=9ADashboard=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E4=B8=BB=E9=A2=98=E4=B8=BAdark=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=94=BE=E5=A4=A7=E5=9B=BE=E4=B8=AD=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E9=A2=9C=E8=89=B2=E8=BF=87=E6=B7=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/components/chart/chart.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 8488b8f05..2c900c840 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -143,7 +143,7 @@ overflow: hidden; white-space: nowrap; font-size: 18px; - color: #333; + color: $--color-text-primary; font-weight: 700; } .chart-header__tools { From 690513cd81fb761c33b7088d6f335f3cade4de15 Mon Sep 17 00:00:00 2001 From: zyh Date: Tue, 31 Oct 2023 14:03:40 +0800 Subject: [PATCH 02/11] =?UTF-8?q?NEZ-3299=20fix=EF=BC=9A=E6=96=B0=E5=BB=BA?= =?UTF-8?q?Record=20Rules=EF=BC=8CExpression=E4=B8=BA=E7=A9=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/rightBox/recordRuleBox.vue | 4 ++-- .../src/components/page/dashboard/explore/promqlInput.vue | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue index d3659eba2..0b5e94b47 100644 --- a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue @@ -12,8 +12,7 @@
- + Date: Tue, 31 Oct 2023 18:22:57 +0800 Subject: [PATCH 03/11] =?UTF-8?q?NEZ-3302=20fix=EF=BC=9Aalert=20message=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common.scss | 20 +++++++++++++++++++ .../src/components/common/js/constants.js | 6 +++++- .../common/rightBox/chart/chartConfig.vue | 1 - .../rightBox/chart/systemChartConfig.vue | 1 - .../common/rightBox/editEndpointBoxNew.vue | 4 ---- .../components/common/rightBox/moduleBox.vue | 4 ---- .../rightBox/software/softwareTypeBox.vue | 1 - .../components/page/alert/alertMessage.vue | 2 +- .../src/components/page/config/monitor.vue | 1 - 9 files changed, 26 insertions(+), 14 deletions(-) diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 65fb76be4..40b79648d 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -746,3 +746,23 @@ i.nz-icon-override{ input::placeholder{ text-transform:capitalize; } +.vue-tags-input { + .ti-tag.ti-valid { + max-width: 100%; + .ti-content { + max-width: 90%; + flex-shrink: 0; + .ti-tag-center { + max-width: 100%; + flex-shrink: 0; + > span { + max-width: 100%; + display: inline-block; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + } + } + } +} diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index 7299860ce..9093fb8ce 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -363,11 +363,15 @@ export const chart = { export const intervalList = [ { value: 0, label: i18n.t('dashboard.dashboard.chartForm.lockList.off') }, + { value: 5, label: '5s' }, + { value: 10, label: '10s' }, { value: 30, label: '30s' }, { value: 60, label: '1m' }, { value: 300, label: '5m' }, { value: 900, label: '15m' }, - { value: 1800, label: '30m' } + { value: 1800, label: '30m' }, + { value: 3600, label: '1h' }, + { value: 7200, label: '2h' } ] export const setting = { diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 7da534753..20dea23cf 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -181,7 +181,6 @@ > --> - + diff --git a/nezha-fronted/src/components/page/config/monitor.vue b/nezha-fronted/src/components/page/config/monitor.vue index 1c131cbd7..b59463ffc 100644 --- a/nezha-fronted/src/components/page/config/monitor.vue +++ b/nezha-fronted/src/components/page/config/monitor.vue @@ -30,7 +30,6 @@ Date: Wed, 1 Nov 2023 09:54:51 +0800 Subject: [PATCH 04/11] =?UTF-8?q?NEZ-3304=20=20fix=EF=BC=9ADashboard?= =?UTF-8?q?=E4=B8=AD=E5=88=9B=E5=BB=BA=E5=9B=BE=E8=A1=A8=E4=BE=A7=E6=BB=91?= =?UTF-8?q?=E6=A1=86=EF=BC=8C=20log=E6=97=A5=E5=BF=97Label=20browser?= =?UTF-8?q?=E4=B8=AD=E5=86=85=E5=AE=B9=E8=B6=85=E5=87=BA=E7=95=8C=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/page/dashboard/explore/queryPrompt.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss index 779d38df2..940b121bf 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/queryPrompt.scss @@ -1,6 +1,6 @@ .query-prompt-box { //width: calc(100% - 10px); - height: 400px; + height: 440px; background: $--background-color-empty; box-shadow: 0px 0px 21px 4px $--dropdown-menu-box-shadow-color; border-radius: 2px; @@ -9,7 +9,7 @@ //left: 5px; transform: unset; z-index: 11; - max-height: 400px; + max-height: 440px; font-size: 14px; .explore-history-box-header { padding-left: 20px; @@ -32,6 +32,7 @@ } .query-prompt-log-content { height: 220px; + flex-shrink: 0; border: 1px solid $--border-color-light; border-radius: 2px; display: flex; From 76ca5031b10a9af7ecd1e205526e97914e8a0932 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 1 Nov 2023 10:32:21 +0800 Subject: [PATCH 05/11] =?UTF-8?q?NEZ-3302=20fix=EF=BC=9AbottomBox=20=20ale?= =?UTF-8?q?rt=20message=20=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/bottomBox/tabs/alertMessageTabNew.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index ad31ad674..27dcb4042 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -19,7 +19,7 @@ - + @@ -133,6 +142,7 @@ import { initColor } from '@/components/chart/chart/tools' import * as echarts from 'echarts' import chartSparklineOption from './options/chartSparkline' import lodash from 'lodash' +import tinycolor from 'tinycolor2' export default { name: 'chart-stat', mixins: [chartMixin, chartFormat], @@ -291,7 +301,6 @@ export default { }) }, renderStat (layout) { - let isDouble = false const width = this.boxWidth / layout.col const height = this.boxHeight / layout.row const integer = Math.floor(this.statData.length / layout.col) @@ -305,86 +314,62 @@ export default { } else { item.width = width } - let font = '' // 获取显示的字体 let display = '' if (item.mapping) { display = this.handleDisplay(item.mapping.display, { ...item.label, value: item.showValue }) } + let titleFont = '' + let valueFont = '' + let titleFontSize = '' + let valueFontSize = '' + const padding = 10 switch (this.chartInfo.param.text) { case 'all': + titleFont = item.legend if (item.mapping) { - isDouble = true - if (item.legend.length > item.showValue.length + 2) { - font = item.legend - } else { - font = display - if (item.mapping.icon) { - font += 'AA' - } + valueFont = display + if (item.mapping.icon) { + valueFont += 'AA' } } else { - isDouble = true - if (item.legend.length > item.showValue.length) { - font = item.legend - } else { - font = item.showValue - } + valueFont = item.showValue } + titleFontSize = this.calculateFontSize(titleFont, (item.width - padding * 2), (item.height - padding * 2) * 0.4, 30) + valueFontSize = this.calculateFontSize(valueFont, (item.width - padding * 2), (item.height - padding * 2) * 0.4) + titleFontSize = Math.min(valueFontSize * 0.7, titleFontSize) break case 'legend': + titleFont = item.legend if (item.mapping) { - isDouble = true - if (item.legend.length > item.showValue.length + 2) { - font = item.legend - } else { - font = display - if (item.mapping.icon) { - font += 'AA' - } + if (item.mapping.icon) { + titleFont += 'AA' } - } else { - font = item.legend } + valueFontSize = this.calculateFontSize(titleFont, (item.width - padding * 2), (item.height - padding * 2) * 0.4) break - case 'none': - font = '' + titleFontSize = '' + valueFontSize = '' break case 'value': default: if (item.mapping) { - font = display + valueFont = display if (item.mapping.icon) { - font += 'AA' + valueFont += 'AA' } } else { - font = item.showValue + valueFont = item.showValue } + valueFontSize = this.calculateFontSize(valueFont, (item.width - padding * 2), (item.height - padding * 2) * 0.4) break } - const el = this.$refs['temp-dom'] - el.innerText = font - const elWidth = el.offsetWidth - const elHeight = el.offsetHeight - const dimension = Math.min(item.width, item.height * 1.3) - const fontScale = parseInt('70%', 10) / 100 - let fontSize = Math.min(dimension / 5, 100) * fontScale - let scale = item.width / elWidth - if (scale * elHeight > item.height) { - scale = item.height / elHeight - } - if (isDouble) { - if (scale * elHeight * 2.5 > item.height) { - scale = item.height / elHeight * 2.5 - } - } - item.scale = scale < 1 ? 1 : parseFloat(scale) - fontSize = fontSize > 12 ? fontSize : this.minFontSzie - item.fontSize = fontSize + item.titleFontSize = titleFontSize + item.valueFontSize = valueFontSize - if (fontSize > 36) { + if (item.valueFontSize > 36) { item.comparisonFont = 16 - } else if (fontSize > 24) { + } else if (item.valueFontSize > 24) { item.comparisonFont = 14 } else { item.comparisonFont = 12 @@ -392,28 +377,43 @@ export default { }) this.isInit = false }, + + calculateFontSize (text, width, height, maxSize, lineHeight = 1.2) { + const el = this.$refs['temp-dom'] + el.innerText = text + const elWidth = el.offsetWidth + const fontSizeBasedOnWidth = (width / (elWidth + 2)) * 14 + const fontSizeBasedOnHeight = height / lineHeight + + const optimalSize = Math.min(fontSizeBasedOnHeight, fontSizeBasedOnWidth) + return Math.min(optimalSize, maxSize || optimalSize) + }, + // 绘制图表 drawChart () { this.statData.forEach((item, index) => { const chart = this.sparkline[index] ? this.sparkline[index] : echarts.init(document.getElementById(`chart-canvas-${this.chartId}-${index}`)) const chartOption = lodash.cloneDeep(chartSparklineOption) - // sparkline 颜色和 字体颜色 保持一致 - const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light' - let color = theme === 'light' ? '#666666' : '#BEBEBE' - if (item.mapping) { - color = item.mapping.color.text + + // sparkline 颜色根据背景色计算 + const color = item.mapping ? item.mapping.color.bac : this.colorList[index] + const lineColor = tinycolor(color).brighten(40).toRgbString() + let areaColor = 'rgba(255,255,255,0.4)' + if (this.statData.length === 1 && !item.mapping) { + areaColor = tinycolor(color).setAlpha(0.2).toRgbString() } + chartOption.series = [{ ...chartOption.series[0], data: item.data, lineStyle: { - color + width: 1, + color: lineColor } }] if (this.chartInfo.param.sparklineMode === 'area') { chartOption.series[0].areaStyle = { - color: color, - opacity: 0.1 + color: areaColor } } chartOption.yAxis.max = this.maxValue From 6371ef5b021588addaffec3c76948339fe1d4d4d Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 1 Nov 2023 16:11:44 +0800 Subject: [PATCH 08/11] =?UTF-8?q?NEZ-3310=20=20fix=EF=BC=9A=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BD=AC=E5=8C=96=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart/chartLog.vue | 4 ++-- .../src/components/common/bottomBox/tabs/logBottomTab.vue | 4 ++-- .../src/components/page/dashboard/explore/exploreItem.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/chartLog.vue b/nezha-fronted/src/components/chart/chart/chartLog.vue index 555226b9d..932089341 100644 --- a/nezha-fronted/src/components/chart/chart/chartLog.vue +++ b/nezha-fronted/src/components/chart/chart/chartLog.vue @@ -218,8 +218,8 @@ export default { const descending = this.operations.descending const params = { logql: this.chartInfo.elements.map(item => item.expression), - start: this.$stringTimeParseToUnix(this.filterTime[0]), - end: this.$stringTimeParseToUnix(this.filterTime[1]), + start: this.momentStrToTimestamp(this.filterTime[0]), + end: this.momentStrToTimestamp(this.filterTime[1]), direction: descending ? 'backward' : 'forward', limit } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue index 9cc2e7edb..68cb0e8ba 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue @@ -89,8 +89,8 @@ export default { exportLog ({ limit, descending }) { const params = { logql: this.expressions, - start: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[0])), - end: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[1])), + start: this.momentStrToTimestamp(this.filterTime[0]), + end: this.momentStrToTimestamp(this.filterTime[1]), direction: descending ? 'backward' : 'forward', limit } diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 2c18a0eff..43b789ad9 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -3722,8 +3722,8 @@ export default { exportLog ({ limit, descending }) { const params = { logql: this.expressions, - start: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[0])), - end: this.$stringTimeParseToUnix(bus.formateTimeToTime(this.filterTime[1])), + start: this.momentStrToTimestamp(this.filterTime[0]), + end: this.momentStrToTimestamp(this.filterTime[1]), direction: descending ? 'backward' : 'forward', limit } From aae955491e20d0e190247513be8ed8c15dfbdc62 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 1 Nov 2023 16:14:39 +0800 Subject: [PATCH 09/11] =?UTF-8?q?fix=EF=BC=9A=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2=20=E6=A0=B9=E6=8D=AE=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/explore/histoyrComponent/exploreHistory.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/page/dashboard/explore/histoyrComponent/exploreHistory.vue b/nezha-fronted/src/components/page/dashboard/explore/histoyrComponent/exploreHistory.vue index 7fbbd51b8..835c342a5 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/histoyrComponent/exploreHistory.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/histoyrComponent/exploreHistory.vue @@ -98,7 +98,7 @@ export default { const params = { ...this.pageObj, queryValue: this.searchStr, - orderBy: 'uts' + orderBy: '-uts' } if (this.type === 'metric') { params.queryKey = 'explore-metric' @@ -151,7 +151,7 @@ export default { const params = { pageNo: 1, queryValue: this.searchStr, - orderBy: 'uts', + orderBy: '-uts', pageSize } if (this.type === 'metric') { From abd248793f635222cf4c856d7e43e6b30c58232f Mon Sep 17 00:00:00 2001 From: zyh Date: Wed, 1 Nov 2023 17:24:40 +0800 Subject: [PATCH 10/11] =?UTF-8?q?NEZ-3309=20fix=EF=BC=9ADashBoard=20templa?= =?UTF-8?q?tes=E5=8F=8Cy=E8=BD=B4=E5=9B=BE=E8=A1=A8=E4=B8=AD=E6=9C=AA?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=8Cy=E8=BD=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/bottomBox/bottomBox.scss | 2 +- nezha-fronted/src/components/chart/panelChart.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index 27e60897f..3a9419775 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -233,7 +233,7 @@ .bottom-box__top .my-loading-box { height: calc(100% + 20px) !important; } - .my-loading-parent--relative{ + .my-loading-parent--relative:not(.panel-chart){ height: calc(100% - 20px) !important; } } diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index fce3d9ced..679671164 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -271,11 +271,11 @@ export default { case 'logs': { if (this.from === fromRoute.chartTemp || this.from === fromRoute.dashboardTemp || this.from === fromRoute.integration) { setTimeout(() => { - this.chartData = [chartTempData.data.result] - this.chartData.forEach(item => { - item.forEach(children => { - children.elements = elements[0] - }) + this.chartData = [] + elements.forEach(item => { + const data = this.$lodash.cloneDeep(chartTempData.data.result) + data[0].elements = item + this.chartData.push(data) }) this.loading = false }, 100) From 5456e8784d8c23763ee1ef25498058b31d5b617a Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 1 Nov 2023 18:00:29 +0800 Subject: [PATCH 11/11] =?UTF-8?q?style=EF=BC=9A=20=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=20=E4=B8=8B=E6=8B=89=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/common/timePicker.scss | 7 +++++++ nezha-fronted/src/components/common/js/constants.js | 4 ++-- nezha-fronted/src/components/common/pickTime.vue | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/timePicker.scss b/nezha-fronted/src/assets/css/components/common/timePicker.scss index 38145eb36..64a843f58 100644 --- a/nezha-fronted/src/assets/css/components/common/timePicker.scss +++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss @@ -342,3 +342,10 @@ .el-date-range-picker__content.el-date-range-picker__content__only{ width: 100%; } +.nz-time-box.nz-dropdown { + width: 64px; + .dropdown-content { + height: 32px; + line-height: 32px; + } +} diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index 9093fb8ce..5b5b5cf3f 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -370,8 +370,8 @@ export const intervalList = [ { value: 300, label: '5m' }, { value: 900, label: '15m' }, { value: 1800, label: '30m' }, - { value: 3600, label: '1h' }, - { value: 7200, label: '2h' } + // { value: 3600, label: '1h' }, + // { value: 7200, label: '2h' } ] export const setting = { diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue index 4da1b1b0e..011ac35c8 100644 --- a/nezha-fronted/src/components/common/pickTime.vue +++ b/nezha-fronted/src/components/common/pickTime.vue @@ -12,7 +12,7 @@ {{interLabel}} -
    +
    • {{$t(i.label)}}