diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index be3107d5c..9096c4ef7 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -6,8 +6,8 @@ @mouseleave="mouseLeaveChart" v-my-loading="chartLoading" > -
{{chartInfo.param.rightYAxis.label}}
@@ -279,9 +279,9 @@ export default {
this.cursorDefault = false
})
}
- if (this.chartInfo.type !== 'point') {
- const option = myChart.getOption()
- const series = this.$lodash.cloneDeep(option.series)
+ const option = myChart.getOption()
+ const series = this.$lodash.cloneDeep(option.series)
+ if (series[params.seriesIndex].type !== 'scatter') {
series[params.seriesIndex].data[params.dataIndex] = {
symbol: 'circle',
itemStyle: {
@@ -301,9 +301,9 @@ export default {
this.tooltip.activeIndex = params.seriesIndex
})
myChart.on('mouseout', (params) => {
- if (this.chartInfo.type !== 'point') {
- const option = myChart.getOption()
- const series = this.$lodash.cloneDeep(option.series)
+ const option = myChart.getOption()
+ const series = this.$lodash.cloneDeep(option.series)
+ if (series[params.seriesIndex].type !== 'scatter') {
series.forEach(s => {
s.data.forEach((item, index) => {
if (item.itemStyle) {
diff --git a/nezha-fronted/src/components/chart/chart/legend.vue b/nezha-fronted/src/components/chart/chart/legend.vue
index 2a8f0a3b4..348da7361 100644
--- a/nezha-fronted/src/components/chart/chart/legend.vue
+++ b/nezha-fronted/src/components/chart/chart/legend.vue
@@ -246,6 +246,17 @@ export default {
return false
}
if (this.isTimeSeries) {
+ if (type == 'highlight' && getChart(this.chartId)) {
+ const option = getChart(this.chartId).getOption()
+ const series = this.$lodash.cloneDeep(option.series)
+ series[index].emphasis.focus = 'series'
+ getChart(this.chartId).setOption({ series })
+ } else if (getChart(this.chartId)) {
+ const option = getChart(this.chartId).getOption()
+ const series = this.$lodash.cloneDeep(option.series)
+ series[index].emphasis.focus = 'none'
+ getChart(this.chartId).setOption({ series })
+ }
getChart(this.chartId) && getChart(this.chartId).dispatchAction({
type: type,
seriesIndex: index,
diff --git a/nezha-fronted/src/components/chart/chart/line-chart-block.vue b/nezha-fronted/src/components/chart/chart/line-chart-block.vue
index 972847ed9..46b0a69fc 100644
--- a/nezha-fronted/src/components/chart/chart/line-chart-block.vue
+++ b/nezha-fronted/src/components/chart/chart/line-chart-block.vue
@@ -1740,13 +1740,13 @@ export default {
theData: {
name: '',
symbol: 'emptyCircle', // 去掉点
- symbolSize: [2, 2],
+ symbolSize: 8,
smooth: 0.2, // 曲线变平滑
showSymbol: false,
data: [],
type: this.data.type,
lineStyle: {
- width: 1,
+ width: 2,
opacity: 0.9
}
// visible: true,
diff --git a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js
index 65b859d54..6435982da 100644
--- a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js
+++ b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js
@@ -152,16 +152,16 @@ export const chartTimeSeriesLineOption = {
type: 'line',
symbol: 'emptyCircle', // 去掉点
connectNulls: true,
- symbolSize: 6,
+ symbolSize: 8,
smooth: 0.2, // 曲线变平滑
showSymbol: false,
data: [],
lineStyle: {
- width: 1,
+ width: 2,
opacity: 0.9
},
emphasis: {
- focus: 'series'
+ focus: 'none'
},
blur: {
lineStyle: {
@@ -189,7 +189,7 @@ export const chartTimeSeriesScatterOption = {
data: [],
z: 9,
emphasis: {
- focus: 'series'
+ focus: 'none'
}
}]
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
index caad524b9..b096181ad 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
@@ -443,7 +443,7 @@ export default {
smooth: 0.2, // 曲线变平滑
name: '',
lineStyle: {
- width: 1,
+ width: 2,
opacity: 0.9
}
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index e40e536c2..026db7ddd 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -841,12 +841,12 @@ export default {
const seriesItem = {
name: '',
symbol: 'emptyCircle', // 去掉点
- symbolSize: [2, 2],
+ symbolSize: 8,
showSymbol: false,
smooth: 0.2, // 曲线变平滑
data: [],
lineStyle: {
- width: 1,
+ width: 2,
opacity: 0.9
},
type: 'line'
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
index 39fee75a3..5195f60a7 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue
@@ -250,8 +250,8 @@ export default {
max: undefined
},
option: {
- lineWidth: 1,
- pointSize: 6
+ lineWidth: 2,
+ pointSize: 8
}
},
elements: [{ expression: '', legend: '', type: 'expert', id: '', name: 'A', state: 1, orderNum: 0 }],
@@ -463,8 +463,8 @@ export default {
}
if (!this.chart.param.option) {
this.chart.param.option = {
- lineWidth: 1,
- pointSize: 6
+ lineWidth: 2,
+ pointSize: 8
}
}
}
@@ -505,8 +505,8 @@ export default {
}
if (!this.chart.param.option) {
this.chart.param.option = {
- lineWidth: 1,
- pointSize: 6
+ lineWidth: 2,
+ pointSize: 8
}
}
}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
deleted file mode 100644
index 7f7d9b8ff..000000000
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue
+++ /dev/null
@@ -1,728 +0,0 @@
-
-
-
-
-
-
-