diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index 7a41cb76e..c81a1f89a 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -25,7 +25,7 @@ {{chartData.name}} - + diff --git a/nezha-fronted/src/components/charts/chart-bar-statistics.vue b/nezha-fronted/src/components/charts/chart-bar-statistics.vue index 6278b4398..d1c37ecdb 100644 --- a/nezha-fronted/src/components/charts/chart-bar-statistics.vue +++ b/nezha-fronted/src/components/charts/chart-bar-statistics.vue @@ -25,7 +25,7 @@ {{chartData.name}} - + @@ -365,23 +365,25 @@ export default { obj.name = legend[index].name obj.data = [[legendShow, item.value]] obj.stack = true - obj.markLine = { - silent: true, - symbol: ['circle', 'circle'], - label: { - distance: this.computeDistance(chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(chartItem.param.threshold)), - formatter: function (params) { - return chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(params.value) - } - }, - lineStyle: { - color: '#d64f40', - width: 2, - type: 'dotted', - }, - data: [{ - yAxis: Number(chartItem.param.threshold) - }] + if (chartItem.param.threshold) { + obj.markLine = { + silent: true, + symbol: ['circle', 'circle'], + label: { + distance: this.computeDistance(chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(chartItem.param.threshold)), + formatter: function (params) { + return chartDataFormat.getUnit(chartItem.unit ? chartItem.unit : 2).compute(params.value) + } + }, + lineStyle: { + color: '#d64f40', + width: 2, + type: 'dotted' + }, + data: [{ + yAxis: Number(chartItem.param.threshold) + }] + } } nweSeriesItem.push(obj) }) diff --git a/nezha-fronted/src/components/charts/chart-group.vue b/nezha-fronted/src/components/charts/chart-group.vue index d4d0d5b1d..71fe3999a 100644 --- a/nezha-fronted/src/components/charts/chart-group.vue +++ b/nezha-fronted/src/components/charts/chart-group.vue @@ -19,7 +19,7 @@ ({{chartData.children.length}} charts) - + @@ -47,7 +47,7 @@
- +
@@ -222,8 +222,8 @@ export default { this.dropdownMenuShow = false this.$emit('on-remove-chart-block', this.data.id) }, - // 删除group 下的该图表 - removeChartGroup (chart) { + removeGroupItem (chart) { + this.dropdownMenuShow = false this.$emit('on-remove-group-chart', chart) }, addGroupItemChart () { diff --git a/nezha-fronted/src/components/charts/chart-list-group.vue b/nezha-fronted/src/components/charts/chart-list-group.vue index 8ce97d023..32d089135 100644 --- a/nezha-fronted/src/components/charts/chart-list-group.vue +++ b/nezha-fronted/src/components/charts/chart-list-group.vue @@ -1404,7 +1404,7 @@ export default { removeChart (chartId) { // from 区分从哪里点击的删除 1.从图表面板 2.从编辑框 const chart = this.dataList.find(item => item.id === chartId) if (chart) { - this.$emit('on-remove-chart', chart) + this.$emit('on-remove-group-chart', chart) } }, // 复制图表 diff --git a/nezha-fronted/src/components/charts/chart-pie.vue b/nezha-fronted/src/components/charts/chart-pie.vue index 94dd2c393..c0b027a92 100644 --- a/nezha-fronted/src/components/charts/chart-pie.vue +++ b/nezha-fronted/src/components/charts/chart-pie.vue @@ -25,7 +25,7 @@ {{chartData.name}} - + diff --git a/nezha-fronted/src/components/charts/chart-single-stat.vue b/nezha-fronted/src/components/charts/chart-single-stat.vue index 43720c1ee..fd81e4961 100644 --- a/nezha-fronted/src/components/charts/chart-single-stat.vue +++ b/nezha-fronted/src/components/charts/chart-single-stat.vue @@ -25,7 +25,7 @@ {{chartData.name}} - + diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 5b42138f7..5afe9434c 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -26,7 +26,7 @@ {{chartData.name}} - + diff --git a/nezha-fronted/src/components/charts/chart-url.vue b/nezha-fronted/src/components/charts/chart-url.vue index d1a160579..aa725b1d6 100644 --- a/nezha-fronted/src/components/charts/chart-url.vue +++ b/nezha-fronted/src/components/charts/chart-url.vue @@ -13,7 +13,7 @@ {{chartData.name}} - + diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 061978f1c..479459197 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -39,7 +39,7 @@ {{chartData.name}} - + diff --git a/nezha-fronted/src/components/charts/text-chart.vue b/nezha-fronted/src/components/charts/text-chart.vue index 7cb73c1ff..5709fbf0e 100644 --- a/nezha-fronted/src/components/charts/text-chart.vue +++ b/nezha-fronted/src/components/charts/text-chart.vue @@ -13,7 +13,7 @@ {{chartData.name}} - +