diff --git a/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue b/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue index 1f163eb5..67e073f3 100644 --- a/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue +++ b/src/views/projectAdmin/jlw/jChart/pie/JNestedRingChart.vue @@ -15,6 +15,10 @@ export default { y: '36%' }) }, + legend: { + type: Object, + default: () => ({}) + }, series: { required: true, type: Array, @@ -32,7 +36,7 @@ export default { }, methods: { createChart() { - const { title, series } = this + const { title, legend, series } = this const setSeries = (series => { return series.map(item => ({ type: 'pie', @@ -79,7 +83,8 @@ export default { textStyle: { color: '#ffffff', fontSize: 14 - } + }, + formatter: legend.formatter }, series: setSeries } diff --git a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue index 01faeaf0..9694a3c5 100644 --- a/src/views/projectAdmin/jlw/safeManage/leftCenter.vue +++ b/src/views/projectAdmin/jlw/safeManage/leftCenter.vue @@ -17,7 +17,7 @@ --> - + @@ -55,6 +55,18 @@ export default { series: [], total: 0 } + }, + computed: { + legend() { + const data = (this.series[0] || []).data || [] + const formatter = name => { + const value = ((data.filter(item => item.name === name) || [])[0] || {}).value + return `${name} ${value}` + } + return { + formatter + } + } } }