diff --git a/web/client/assets/images/quanju/circle2.png b/web/client/assets/images/quanju/circle2.png new file mode 100644 index 00000000..ee584235 Binary files /dev/null and b/web/client/assets/images/quanju/circle2.png differ diff --git a/web/client/assets/images/quanju/kelvhua_bdbg.png b/web/client/assets/images/quanju/kelvhua_bdbg.png new file mode 100644 index 00000000..6cb1b42c Binary files /dev/null and b/web/client/assets/images/quanju/kelvhua_bdbg.png differ diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js index 79945530..bf811a2f 100644 --- a/web/client/src/sections/organization/containers/user.js +++ b/web/client/src/sections/organization/containers/user.js @@ -181,7 +181,9 @@ const UserManage = (props) => { // 删除部门 const delDepartment = (id) => { dispatch(delDep(id)).then(res => { - dispatch(getDepMessage()) + if(res.success){ + dispatch(getDepMessage()) + } }); } const renderTree = (item, id) => { diff --git a/web/client/src/sections/quanju/containers/footer/conserve/index.js b/web/client/src/sections/quanju/containers/footer/conserve/index.js index cfb98746..5e83a6d5 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/index.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/index.js @@ -3,10 +3,11 @@ import Left from './left' import Right from './right' const Conserve = () => { + return ( -
+
- +
) } diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js index 42c7cd48..47bfba29 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-center.js @@ -1,30 +1,222 @@ import { Col, Row } from 'antd' import React from 'react' -import { useEffect } from 'react' +import { useEffect, useRef } from 'react' import Module from '../../../public/module' +import * as echarts from 'echarts'; const LeftCenter = () => { - const style = { height: "31%", marginTop: "3%" } + const style = { height: "31%", marginTop: "3%" } + const chartRef = useRef(null); + useEffect(() => { + let chartInstance = echarts.init(chartRef.current); + let colorArray = [ + { + top: "#07B9FE", + bottom: "#10274B", + }, + { + top: "#1978E5", + bottom: " #10274B", + }, + { + top: "#1978E5", + bottom: "#10274B", + }, + ]; + const option = { + tooltip: { + show: true, + trigger: "axis", + axisPointer: { + type: "none", + }, + }, + grid: { + left: "5%", + top: "12%", + right: "1%", + bottom: "8%", + containLabel: true, + }, - useEffect(() => { + xAxis: { + type: "value", + show: true, + position: "bottom", + axisTick: { + show: true, + lineStyle: { + color: "rgba(176,215,255,0.25)", + // type: "dashed", + }, + }, + axisLine: { + show: false, + lineStyle: { + color: "rgba(216,240,255,0.8000)", + }, + }, + splitLine: { + show: true, + lineStyle: { + color: "rgba(176,215,255,0.25)", + type: "dashed", + }, + }, + }, + yAxis: [ + { + type: "category", + axisTick: { + show: false, + alignWithLabel: false, + length: 5, + }, + splitLine: { + //网格线 + show: false, + }, + inverse: true, //排序 + axisLine: { + show: false, + lineStyle: { + color: "rgba(176,215,255,0.8)", + }, + }, + zlevel: 100, + data: ["县级可绿化里程", "乡级可绿化里程", "村级可绿化里程"], + }, + { + type: "category", + axisTick: { + show: false, + alignWithLabel: false, + length: 5, + }, + splitLine: { + //网格线 + show: false, + }, + axisLabel: { + show: true, + backgroundColor: { + image: 'assets/images/quanju/kelvhua_bdbg.png', + }, + width: 50, + height: 20, + color: '#D8F0FF', + margin:40, + verticalAlign: 'middle', + align: 'center' + // formatter:(f) =>{console.log('f:',f);} + }, + inverse: true, //排序 + axisLine: { + show: false, + lineStyle: { + color: "rgba(176,215,255,0.8)", + }, - }, []) + }, + data: [60, 132, 89], + }, + ], + series: [ + { + name: '背景', + type: "bar", + barWidth: 3, + barGap: "100%", + barCategoryGap: "50%", + color: "#15356E", + data: [150, 150, 150, 150], + tooltip: { + show: false, + }, + }, + { + name: "", + type: "bar", + zlevel: 1, + barWidth: 3, + barGap: "-100%", + barCategoryGap: "50%", + data: [60, 132, 89], + label: { + show: true, + position: 'right', // 位置 + fontSize: 12, + lineHeight: 13, + distance: -2, + verticalAlign: "middle", + formatter: [ + '{a| }', + ].join(''), // 这里是数据展示的时候显示的数据 + rich: { + a: { + backgroundColor: { + image: 'assets/images/quanju/circle2.png' + }, + width: 15, + height: 15, + align: 'left', + verticalAlign: "center", + } + } + }, + itemStyle: { + normal: { + show: true, + color: function (params) { + return { + type: "linear", + colorStops: [ + { + offset: 0, + color: colorArray[params.dataIndex].bottom, + }, + { + offset: 1, + color: colorArray[params.dataIndex].top, + }, - return ( - <> - - - - icon - 可绿化里程总数 - - 1234.123 - -
图表
+ ], + // globalCoord: false, + }; + }, + barBorderRadius: 70, + borderWidth: 0, + borderColor: "#333", + }, + }, + emphasis: { + disabled: true //禁止移入柱子改变颜色 + } + }, + ], + }; + chartInstance.setOption(option); + window.onresize = function () { + chartInstance.resize(); + } + }, []); -
- - ) + return ( + <> + + + + + icon + 可绿化里程总数 + + 1234.123 + +
+ +
+ + ) } export default LeftCenter \ No newline at end of file diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js index 89333c1e..3ab9489d 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-top.js @@ -12,6 +12,9 @@ const LeftTop = () => { useEffect(() => { let chartInstance = echarts.init(seasonChartRef.current); const seasonOption = { + tooltip:{ + show:true + }, title: [ { text: "季节性", @@ -37,6 +40,13 @@ const LeftTop = () => { radius: ["60%", "68%"], center: ["50%", "50%"], }, + grid: { + left: "5%", + top: "12%", + right: "1%", + bottom: "8%", + containLabel: true, + }, angleAxis: { max: 100, show: false, @@ -61,7 +71,7 @@ const LeftTop = () => { roundCap: true, barWidth: 30, showBackground: true, - data: [40], + data: [{value:40,name:'季节性'}], coordinateSystem: "polar", itemStyle: { normal: { @@ -81,11 +91,21 @@ const LeftTop = () => { ], }; chartInstance.setOption(seasonOption); + window.addEventListener('resize',() =>{ + if(chartInstance) { + chartInstance.resize() + } + }) }, []) useEffect(() => { let chartInstance = echarts.init(frequentlyChartRef.current); + const frequentlyOption = { + tooltip:{ + show:true, + trigger: "item", + }, title: [ { text: "经常性", @@ -111,6 +131,14 @@ const LeftTop = () => { radius: ["60%", "68%"], center: ["50%", "50%"], }, + grid: { + left: "10%", + top: "12%", + right: "1%", + bottom: "8%", + width: '70%', + containLabel: true, + }, angleAxis: { max: 100, show: false, @@ -135,7 +163,7 @@ const LeftTop = () => { roundCap: true, barWidth: 30, showBackground: true, - data: [40], + data:[{value:40,name:'经常性'}], coordinateSystem: "polar", itemStyle: { normal: { @@ -157,30 +185,34 @@ const LeftTop = () => { ], }; chartInstance.setOption(frequentlyOption); - + window.addEventListener('resize', () => { + if (chartInstance) { + chartInstance.resize() + } + }) }, []) const style = { height: "31%", marginTop: "3%" } return ( <> -
-
-
+
+
+
-
+
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js index 18b24f6b..6e1cd0c6 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js @@ -5,12 +5,12 @@ import Module from '../../../public/module' const RightTop = () => { const style = { height: "31%", marginTop: "3%" } const textStyle = { fontSize: 14, color: '#E9F7FF' } - const numStyle = { color: '#fff', fontSize: 24, fontFamily: 'YouSheBiaoTiHei', textShadow: '0px 0px 8px #1C60FE', marginTop: 8 } + const numStyle = { color: '#fff', fontSize: 20, fontFamily: 'YouSheBiaoTiHei', textShadow: '0px 0px 8px #1C60FE', marginTop: 8 } return ( <>
- + icon
@@ -26,7 +26,7 @@ const RightTop = () => { - + icon