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 @@ - - - - - diff --git a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue index 4e6d19c46..161c2666f 100644 --- a/nezha-fronted/src/components/common/project/L5/topoTooltip.vue +++ b/nezha-fronted/src/components/common/project/L5/topoTooltip.vue @@ -230,12 +230,12 @@ export default { theData: { name: '', symbol: 'emptyCircle', // 去掉点 - symbolSize: [2, 2], + symbolSize: 8, smooth: 0.2, // 曲线变平滑 showSymbol: false, data: [], lineStyle: { - width: 1, + width: 2, opacity: 0.9 }, animation: false, diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 18ce25508..416f8cab8 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -1263,8 +1263,8 @@ export default { max: undefined }, option: { - lineWidth: 1, - pointSize: 6 + lineWidth: 2, + pointSize: 86 } } this.$nextTick(() => { diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue index 7705b934e..635ea9af0 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartRightBox.vue @@ -404,8 +404,8 @@ export default { max: undefined }, option: { - lineWidth: 1, - pointSize: 6 + lineWidth: 2, + pointSize: 8 } } } diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index 7086e8f9d..94c793534 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -324,7 +324,7 @@ export default { smooth: 0.2, // 曲线变平滑 name: '', lineStyle: { - width: 1, + width: 2, opacity: 0.9 }, markLine: { diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 447410db5..8a6d4f365 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -821,12 +821,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/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue index 89a896f21..5652397a4 100644 --- a/nezha-fronted/src/components/page/dashboard/dashboard.vue +++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue @@ -267,8 +267,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 }], @@ -634,8 +634,8 @@ export default { } if (!this.chart.param.option) { this.chart.param.option = { - lineWidth: 1, - pointSize: 6 + lineWidth: 2, + pointSize: 8 } } } @@ -676,8 +676,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/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index f851ac6c6..fa44242c0 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -3768,16 +3768,16 @@ export default { type: 'line', name: '', symbol: 'emptyCircle', // 去掉点 - symbolSize: [6, 6], + symbolSize: 8, showSymbol: false, smooth: 0.2, // 曲线变平滑 data: [], lineStyle: { - width: 1, + width: 2, opacity: 0.9 }, emphasis: { - focus: 'series' + focus: 'none' }, blur: { lineStyle: { @@ -3861,16 +3861,16 @@ export default { type: 'line', name: '', symbol: 'emptyCircle', // 去掉点 - symbolSize: [6, 6], + symbolSize: 8, showSymbol: false, smooth: 0.2, // 曲线变平滑 data: [], lineStyle: { - width: 1, + width: 2, opacity: 0.9 }, emphasis: { - focus: 'series' + focus: 'none' }, blur: { lineStyle: { @@ -4277,8 +4277,8 @@ export default { max: undefined }, option: { - lineWidth: 1, - pointSize: 6 + lineWidth: 2, + pointSize: 8 } }, elements: [], diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue index bde8c6939..48a5c3e04 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItemHtml.vue @@ -308,16 +308,16 @@ export default { type: 'line', name: '', symbol: 'emptyCircle', // 去掉点 - symbolSize: [6, 6], + symbolSize: 8, showSymbol: false, smooth: 0.2, // 曲线变平滑 data: [], lineStyle: { - width: 1, + width: 2, opacity: 0.9 }, emphasis: { - focus: 'series' + focus: 'none' }, blur: { lineStyle: { @@ -523,16 +523,16 @@ export default { type: 'line', name: '', symbol: 'emptyCircle', // 去掉点 - symbolSize: [6, 6], + symbolSize: 8, showSymbol: false, smooth: 0.2, // 曲线变平滑 data: [], lineStyle: { - width: 1, + width: 2, opacity: 0.9 }, emphasis: { - focus: 'series' + focus: 'none' }, blur: { lineStyle: { diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index 81cf1fb4f..709989065 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -370,6 +370,17 @@ export default { if (this.legend[index].isGray) { return false } + if (type == 'highlight' && this.chart) { + const option = this.chart.getOption() + const series = this.$lodash.cloneDeep(option.series) + series[index].emphasis.focus = 'series' + this.chart.setOption({ series }) + } else if (this.chart) { + const option = this.chart.getOption() + const series = this.$lodash.cloneDeep(option.series) + series[index].emphasis.focus = 'none' + this.chart.setOption({ series }) + } this.chart && this.chart.dispatchAction({ type: type, seriesIndex: index,