From afee231fe88c6548ed85544a4ae64cb4e01f74f3 Mon Sep 17 00:00:00 2001 From: zhangxiaolong Date: Tue, 22 Mar 2022 16:03:07 +0800 Subject: [PATCH] =?UTF-8?q?CN-408=20fix=20:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E6=9D=A1=E7=BA=BF=E6=AE=B5=E7=9A=84=E6=8A=98=E7=BA=BF=E5=9B=BE?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=BA=BF=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/charts/charts/ChartEchart.vue | 78 +++++++++++++------------ src/views/charts/charts/options/line.js | 33 +---------- 2 files changed, 41 insertions(+), 70 deletions(-) diff --git a/src/views/charts/charts/ChartEchart.vue b/src/views/charts/charts/ChartEchart.vue index 4cac5017..26fdf630 100644 --- a/src/views/charts/charts/ChartEchart.vue +++ b/src/views/charts/charts/ChartEchart.vue @@ -132,46 +132,48 @@ export default { } if (this.isEchartsLine) { serie.data = serie.data.slice(1, serie.data.length - 2) - serie.markLine = { - silent: true, - symbol: 'none', - label: { - distance:[-50,0], - formatter(params) { - const arr = unitConvert( - params.value, - chartParams.unitType, - ).join(' ') - let desc = '' - switch (params.dataIndex) { - case 0: { - desc = 'P50' - break + if (this.chartData.length === 1) { + serie.markLine = { + silent: true, + symbol: 'none', + label: { + distance: [-50, 0], + formatter(params) { + const arr = unitConvert( + params.value, + chartParams.unitType, + ).join(' ') + let desc = '' + switch (params.dataIndex) { + case 0: { + desc = 'P50' + break + } + case 1: { + desc = 'P90' + break + } + default: + break } - case 1: { - desc = 'P90' - break - } - default: - break - } - return `${arr} (${desc})` + return `${arr} (${desc})` + }, }, - }, - data: [ - { - name: 'P50', - yAxis: this.chartData[0].aggregation.p50 - ? this.chartData[0].aggregation.p50 - : 50, - }, - { - name: 'P90', - yAxis: this.chartData[0].aggregation.p90 - ? this.chartData[0].aggregation.p90 - : 90, - }, - ], + data: [ + { + name: 'P50', + yAxis: this.chartData[0].aggregation.p50 + ? this.chartData[0].aggregation.p50 + : 50, + }, + { + name: 'P90', + yAxis: this.chartData[0].aggregation.p90 + ? this.chartData[0].aggregation.p90 + : 90, + }, + ], + } } } return serie diff --git a/src/views/charts/charts/options/line.js b/src/views/charts/charts/options/line.js index 16cc559f..9f510208 100644 --- a/src/views/charts/charts/options/line.js +++ b/src/views/charts/charts/options/line.js @@ -63,38 +63,7 @@ export const line = { smooth: false, symbol: 'none', data: [], - markLine: { - silent: true, - symbol: 'none', - label: { - formatter(params) { - console.log(params); - // console.log(chartInfo.params.unitType); - const arr = unitConvert(params.value, unitTypes.number).join(' ') - let desc = '' - switch (params.dataIndex) { - case 0: { - desc = 'P50' - break - } - case 1: { - desc = 'P90' - break - } - default: break - } - console.log(`${arr} (${desc})`); - return `${arr} (${desc})` - } - }, - data: [ - { - name: 'P50', - yAxis: '', - }, - { yAxis: '', - name: 'P90' }] - } + markLine: {} } ] }