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

fix：解决冲突

Browse Source
This commit is contained in:
zyh
2023-10-25 16:59:32 +08:00
parent ba2ff962db 9800496e9b
commit 0fe7ba9e47
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
View File

@@ -647,7 +647,7 @@ export default {
}, },
chartClick (params) { chartClick (params) {
// 先取消多表联动 防止其它图表setOption // 先取消多表联动 防止其它图表setOption
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.disconnect('timeSeriesGroup')
} }
getChart(this.chartId).dispatchAction({ getChart(this.chartId).dispatchAction({
@@ -705,7 +705,7 @@ export default {
this.toolbox.clickIndex = params.seriesIndex this.toolbox.clickIndex = params.seriesIndex
const e = params.event.event const e = params.event.event
this.toolboxPosition(e) this.toolboxPosition(e)
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.connect('timeSeriesGroup') echarts.connect('timeSeriesGroup')
} }
}, },
@@ -715,7 +715,7 @@ export default {
} }
}, },
showSelectedSeries () { showSelectedSeries () {
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.disconnect('timeSeriesGroup')
} }
this.legends.forEach((item, index) => { this.legends.forEach((item, index) => {
@@ -745,13 +745,13 @@ export default {
] ]
}) })
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.connect('timeSeriesGroup')
} }
this.clickout() this.clickout()
}, },
showAllSeries () { showAllSeries () {
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.disconnect('timeSeriesGroup')
} }
getChart(this.chartId).dispatchAction({ getChart(this.chartId).dispatchAction({
@@ -771,8 +771,8 @@ export default {
] ]
}) })
if (this.isConnect !== 'none') { if (this.isConnect && this.isConnect !== 'none') {
echarts.disconnect('timeSeriesGroup') echarts.connect('timeSeriesGroup')
} }
this.clickout() this.clickout()
} }