gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-1364 fix： Chart 点击选择 0 值曲线，切换其他曲线，发现无法显示

Browse Source
This commit is contained in:
zhangyu
2021-11-27 10:40:47 +08:00
parent fb43f27bad
commit d15931a5bf
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -445,6 +445,8 @@ export default {
if (!maxValueCopies.copies) { if (!maxValueCopies.copies) {
option.yAxis.min = 0 option.yAxis.min = 0
option.yAxis.max = 1 option.yAxis.max = 1
} else {
option.yAxis.max = undefined
} }
if (unit.type == 'Time' || option.yAxis.maxInterval === 1) { if (unit.type == 'Time' || option.yAxis.maxInterval === 1) {
delete option.yAxis.maxInterval delete option.yAxis.maxInterval
@@ -559,6 +561,8 @@ export default {
if (!maxValueCopies.copies) { if (!maxValueCopies.copies) {
option.yAxis.min = 0 option.yAxis.min = 0
option.yAxis.max = 1 option.yAxis.max = 1
} else {
option.yAxis.max = undefined
} }
if (unit.type == 'Time' || option.yAxis.maxInterval === 1) { if (unit.type == 'Time' || option.yAxis.maxInterval === 1) {
delete option.yAxis.maxInterval delete option.yAxis.maxInterval
@@ -1000,9 +1004,11 @@ export default {
series: dataArg series: dataArg
} }
if (!maxValueCopies.copies) { if (!maxValueCopies.copies) {
option.yAxis.min = 0 option.yAxis.min = 0
option.yAxis.max = 1 option.yAxis.max = 1
} } else {
option.yAxis.max = undefined
}
if (unit.type == 'Time') { if (unit.type == 'Time') {
delete option.yAxis.maxInterval delete option.yAxis.maxInterval
} }
@@ -1912,9 +1918,11 @@ export default {
} }
} }
if (!maxValueCopies.copies) { if (!maxValueCopies.copies) {
option.yAxis.min = 0 option.yAxis.min = 0
option.yAxis.max = 1 option.yAxis.max = 1
} } else {
option.yAxis.max = undefined
}
if (unit.type == 'Time' || option.yAxis.maxInterval === 1) { if (unit.type == 'Time' || option.yAxis.maxInterval === 1) {
delete option.yAxis.maxInterval delete option.yAxis.maxInterval
} }
@@ -1957,9 +1965,11 @@ export default {
} }
} }
if (!maxValueCopies.copies) { if (!maxValueCopies.copies) {
option.yAxis.min = 0 option.yAxis.min = 0
option.yAxis.max = 1 option.yAxis.max = 1
} } else {
option.yAxis.max = undefined
}
if (unit.type == 'Time' || option.yAxis.maxInterval === 1) { if (unit.type == 'Time' || option.yAxis.maxInterval === 1) {
delete option.yAxis.maxInterval delete option.yAxis.maxInterval
} }

2
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -191,7 +191,7 @@ export default {
dialogText: '', dialogText: '',
url: 'alert/message', url: 'alert/message',
// 导出相关 // 导出相关
importBox: { show: false, title: this.$t('overall.importExcel'), type: 1, record: 'all', format: 1 }, importBox: { show: false, title: this.$t('overall.exportExcel'), type: 1, record: 'all', format: 1 },
deleteBox: { show: false, ids: '', remark: '', state: 2 }, deleteBox: { show: false, ids: '', remark: '', state: 2 },
// 详情相关 // 详情相关
graphShow: false, graphShow: false,