gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev

Browse Source
This commit is contained in:
chenjinsong
2022-03-22 16:27:31 +08:00
parent c787bddb0c afee231fe8
commit 43d6c6dc57
2 changed files with 41 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/views/charts/charts/ChartEchart.vue
View File

@@ -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

33
src/views/charts/charts/options/line.js
View File

@@ -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: {}
}
]
}