diff --git a/src/views/sq/qzq/qzqda/toolbar.js b/src/views/sq/qzq/qzqda/toolbar.js
index f9a978838..74df72cce 100644
--- a/src/views/sq/qzq/qzqda/toolbar.js
+++ b/src/views/sq/qzq/qzqda/toolbar.js
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
-import { Form, Input, Button, DatePicker } from 'antd';
+import { Form, Select, Button, DatePicker } from 'antd';
import moment from 'moment';
const { RangePicker } = DatePicker;
@@ -25,8 +25,10 @@ const ToolBar = ({ setSearchVal, onExport, storeData, role }) => {
<>
-
+
+
{
}
},
series: {
- name: '圆环图系列名称',
+ name: '执行情况',
type: 'pie',
// center: ['50%', '50%'],
// radius: ['35%', '50%'],
- hoverAnimation: true,
+ // hoverAnimation: true,
data: plandata,
label: {
normal: {
show: true,
position: 'outside',
- formatter: '{c}'
+ formatter: '{c}',
+
}
+ },
+ itemStyle:{
+ color: function (colors) {
+ var colorList = [
+ '#5b8ff9',
+ '#5ad8a6',
+ '#5d7092',
+ '#f6bd16',
+ '#6f5ef9',
+ ];
+ return colorList[colors.dataIndex];
+ }
}
}
diff --git a/src/views/sz/szzf/ajtj/bincharts.js b/src/views/sz/szzf/ajtj/bincharts.js
index 096a184b1..0f8aa640f 100644
--- a/src/views/sz/szzf/ajtj/bincharts.js
+++ b/src/views/sz/szzf/ajtj/bincharts.js
@@ -49,18 +49,30 @@ const Page = ({ title = '标题' }) => {
}
},
series: {
- name: '圆环图系列名称',
+ name: '案件来源',
type: 'pie',
center: ['50%', '50%'],
radius: ['60%', '80%'],
- hoverAnimation: true,
+ // hoverAnimation: true,
data: plandata,
label: {
normal: {
show: true,
position: 'outside',
- formatter: '{c}'
- }
+ formatter: '{c}',
+ },
+ },
+ itemStyle:{
+ color: function (colors) {
+ var colorList = [
+ '#5b8ff9',
+ '#5ad8a6',
+ '#5d7092',
+ '#f6bd16',
+ '#6f5ef9',
+ ];
+ return colorList[colors.dataIndex];
+ }
}
}
diff --git a/src/views/sz/szzf/ajtj/ldCharts.js b/src/views/sz/szzf/ajtj/ldCharts.js
index 3a00047bb..8cfeb7937 100644
--- a/src/views/sz/szzf/ajtj/ldCharts.js
+++ b/src/views/sz/szzf/ajtj/ldCharts.js
@@ -29,12 +29,14 @@ const Page = ({ title = '标题' }) => {
// }
return {
legend: {
- data: Object.values(obj)
+ data: Object.values(obj),
+ type:'scroll'
},
angleAxis: {
type: 'category',
data: Object.values(obj)
},
+ tooltip: {},
// radar: [
// {
// indicator: [
@@ -81,6 +83,7 @@ const Page = ({ title = '标题' }) => {
polar: {},
series: [
{
+ name:'案件类型',
stack: 'a',
type: 'pie',
center: ['50%', '50%'],
@@ -92,7 +95,17 @@ const Page = ({ title = '标题' }) => {
label: {
show: false,
},
- borderRadius: 8
+ borderRadius: 8,
+ color: function (colors) {
+ var colorList = [
+ '#5b8ff9',
+ '#5ad8a6',
+ '#5d7092',
+ '#f6bd16',
+ '#6f5ef9',
+ ];
+ return colorList[colors.dataIndex];
+ }
},
},
data: plandata