From 8d062562e23dec4877a2ff94c5450309e085cc64 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 29 Mar 2021 17:57:11 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=AF=BC=E8=87=B4=E6=97=B6=E9=97=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/charts/chartDataFormat.js | 11 +++++++---- .../src/components/charts/line-chart-block.vue | 8 ++++---- .../src/components/common/language/cn.js | 3 ++- .../src/components/common/language/en.js | 4 ++-- nezha-fronted/src/components/common/pickTime.vue | 16 ++++++++-------- .../common/rightBox/alertSilenceBox.vue | 7 ++++--- .../components/page/dashboard/overview/chart.vue | 8 ++++---- 7 files changed, 31 insertions(+), 26 deletions(-) diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index 6f0e2ed75..aeeb0096f 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -726,11 +726,13 @@ export default { } if (value < 1024 && type === 'Data') { - const interVal = value / copies + let interVal = value / copies + interVal = !isNaN(interVal) ? interVal : 1 return interVal } if (value < 1000 && (type === 'DataRate' || type === 'Misc')) { - const interVal = value / copies + let interVal = value / copies + interVal = !isNaN(interVal) ? interVal : 1 return interVal } if (type === 'Data') { @@ -743,7 +745,8 @@ export default { } interVal = Math.ceil(interVal) * Math.pow(1024, pow) } - interVal = interVal || 1 + console.log(interVal) + interVal = !isNaN(interVal) ? interVal : 1 return interVal } if (type === 'DataRate' || type === 'Misc') { @@ -756,7 +759,7 @@ export default { } interVal = Math.ceil(interVal) * Math.pow(1000, pow) } - interVal = interVal || 1 + interVal = !isNaN(interVal) ? interVal : 1 return interVal } return 1 diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 9cdaec2f3..b2d39dfef 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -1766,10 +1766,10 @@ export default { maxValue = 0 minValue = 0 for (let j = 0; j < dataArg.length; j++) { - for (let i = 0; i < dataArg[j].data.length - 1; i++) { - if (dataArg[j].data[i + 1][1] !== 'NaN') { - maxValue = (maxValue < Number(dataArg[j].data[i + 1][1]) ? Number(dataArg[j].data[i + 1][1]) : maxValue) - minValue = (minValue > Number(dataArg[j].data[i + 1][1]) ? Number(dataArg[j].data[i + 1][1]) : minValue) + for (let i = 0; i < dataArg[j].data.length; i++) { + if (!isNaN(dataArg[j].data[i][1])) { + maxValue = (maxValue < Number(dataArg[j].data[i][1]) ? Number(dataArg[j].data[i][1]) : maxValue) + minValue = (minValue > Number(dataArg[j].data[i][1]) ? Number(dataArg[j].data[i][1]) : minValue) } } } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index d9a49f8d3..92940bf3d 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1063,7 +1063,8 @@ const cn = { project: '项目', module: '模块', endpoint: 'endpoint', - asset: '资产' + asset: '资产', + timeError: '结束时间必须大于开始时间' }, P1Rule: 'P1: 万分紧急，可导致业务瘫痪的告警', P2Rule: 'P2: 重要，需要紧急关注的警报，但还没有影响业务', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 5e352da93..00b5806cd 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1068,8 +1068,8 @@ const en = { project: 'project', module: 'module', endpoint: 'endpoint', - asset: 'asset' - + asset: 'asset', + timeError: 'The end time must be greater than the start time' }, P1Rule: 'P1: Critical, alert that can cause business paralysis', P2Rule: 'P2: Major, alert that requires urgent attention, but does not affect the business yet', diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue index 653b8f774..45739dfd0 100644 --- a/nezha-fronted/src/components/common/pickTime.vue +++ b/nezha-fronted/src/components/common/pickTime.vue @@ -98,14 +98,14 @@ export default { } }, getIntervalData (interval) { // interval:结束时间到现在的秒数 - const start = new Date(this.searchTime[0]) - const end = new Date(this.searchTime[1]) - start.setSeconds(start.getSeconds() + interval) - end.setSeconds(end.getSeconds() + interval) - - this.searchTime = this.timeFormate([start, end]) - this.$refs.timePicker.setCostomTime(this.searchTime) - this.$emit('change', this.searchTime) + // const start = new Date(this.searchTime[0]) + // const end = new Date(this.searchTime[1]) + // start.setSeconds(start.getSeconds() + interval) + // end.setSeconds(end.getSeconds() + interval) + // + // this.searchTime = this.timeFormate([start, end]) + // this.$refs.timePicker.setCostomTime(this.searchTime) + // this.$emit('change', this.searchTime) // 刷新数据 this.refreshDataFunc() }, diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index 5205e0322..6b8c4ea7e 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -173,9 +173,9 @@ export default { data () { const validate = (rule, value, callback) => { if (!this.editAlertSilence.startAt) { - callback(new Error('请选择开始时间!')) + callback(new Error(this.$t('alert.silence.selectTime'))) } else if (!this.editAlertSilence.endAt) { - callback(new Error('请选择结束时间!')) + callback(new Error(this.$t('alert.silence.selectTime'))) } else { callback() } @@ -244,8 +244,9 @@ export default { this.editAlertSilence.matcher = this.editAlertSilence.ruleId || this.editAlertSilence.linkId this.$refs.alertSilenceForm.validate((valid) => { if (this.endAtTamp < this.startAtTamp) { + this.prevent_opt.save = false this.$message({ - message: '结束时间必须大于开始时间', + message: this.$t('alert.silence.timeError'), type: 'error' }) return diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index ef07da359..b12bef0d9 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -500,10 +500,10 @@ export default { maxValue = 0 minValue = 0 for (let j = 0; j < dataArg.length; j++) { - for (let i = 0; i < dataArg[j].data.length - 1; i++) { - if (dataArg[j].data[i + 1][1] !== 'NaN') { - maxValue = (maxValue < Number(dataArg[j].data[i + 1][1]) ? Number(dataArg[j].data[i + 1][1]) : maxValue) - minValue = (minValue > Number(dataArg[j].data[i + 1][1]) ? Number(dataArg[j].data[i + 1][1]) : minValue) + for (let i = 0; i < dataArg[j].data.length; i++) { + if (!isNaN(dataArg[j].data[i][1])) { + maxValue = (maxValue < Number(dataArg[j].data[i][1]) ? Number(dataArg[j].data[i][1]) : maxValue) + minValue = (minValue > Number(dataArg[j].data[i][1]) ? Number(dataArg[j].data[i][1]) : minValue) } } }