+
-
+
)
}
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 (
- <>
-
-
-
-
- 可绿化里程总数
-
- 1234.123
-
- 图表
+ ],
+ // globalCoord: false,
+ };
+ },
+ barBorderRadius: 70,
+ borderWidth: 0,
+ borderColor: "#333",
+ },
+ },
+ emphasis: {
+ disabled: true //禁止移入柱子改变颜色
+ }
+ },
+ ],
+ };
+ chartInstance.setOption(option);
+ window.onresize = function () {
+ chartInstance.resize();
+ }
+ }, []);
-
- >
- )
+ return (
+ <>
+
+
+
+
+
+ 可绿化里程总数
+
+ 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 (
<>
-
+
@@ -26,7 +26,7 @@ const RightTop = () => {
-
+
diff --git a/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js b/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js
index c50f7e59..71718a61 100644
--- a/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js
+++ b/web/client/src/sections/quanju/containers/footer/guanli/LeftItem.js
@@ -5,82 +5,10 @@ export default function LeftItem() {
const seasonChartRef = useRef(null);
useEffect(() => {
let chartInstance = echarts.init(seasonChartRef.current);
- // const seasonOption = {
- // title: [
- // {
- // text: "已处理",
- // x: "center",
- // top: "55%",
- // textStyle: {
- // color: "#E9F7FF",
- // fontSize: 14,
- // },
- // },
- // {
- // text: "2333",
- // x: "center",
- // y: "35%",
- // textStyle: {
- // fontSize: "30",
- // color: "#FFFFFF",
- // fontFamily: "YouSheBiaoTiHei",
- // },
- // },
- // ],
- // polar: {
- // radius: ["78%", "86%"],
- // center: ["50%", "50%"],
- // },
- // angleAxis: {
- // max: 100,
- // clockWise:false, //逆时针加载
- // show: false,
- // },
- // radiusAxis: {
- // type: "category",
- // show: true,
- // axisLabel: {
- // show: false,
- // },
- // axisLine: {
- // show: false,
- // },
- // axisTick: {
- // show: false,
- // },
- // },
- // series: [
- // {
- // name: "",
- // type: "bar",
- // roundCap: true,
- // clockWise:false, //逆时针加载
- // barWidth: 30,
- // showBackground: true,
- // data: [40],
- // coordinateSystem: "polar",
- // itemStyle: {
- // normal: {
- // color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
- // {
- // offset: 0,
- // color: "#AAC8FF",
- // },
- // {
- // offset: 1,
- // color: "#0041BB",
- // },
- // ]),
- // },
- // },
- // },
- // ],
- // };
const option = {
title: {
text: '75%',
top:'35%',
-
textStyle: {
fontSize: 22,
fontFamily: 'PingFangSC-Medium, PingFang SC',
@@ -140,17 +68,17 @@ export default function LeftItem() {
series: [{
type: 'bar',
data: [{
- name: '作文得分',
+ name: '已处理',
value: 75,
itemStyle: {
normal: {
color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [ {
offset: 0,
- color: "#AAC8FF",
+ color: "#00D5FF",
},
{
offset: 1,
- color: "#0041BB",
+ color: "#1978E5",
}])
}
},
@@ -165,7 +93,7 @@ export default function LeftItem() {
data: [{
value: 100,
itemStyle: {
- color: '#e2e2e2',
+ color: '#092B7B ',
shadowColor: 'rgba(0, 0, 0, 0.2)',
shadowBlur: 5,
shadowOffsetY: 2
@@ -178,6 +106,9 @@ export default function LeftItem() {
z: 1
}]
}
+
+
+
chartInstance.setOption(option);
}, [])
@@ -188,7 +119,9 @@ export default function LeftItem() {
244 个
)
diff --git a/web/client/src/sections/quanju/containers/footer/guanli/index.js b/web/client/src/sections/quanju/containers/footer/guanli/index.js
index 88552520..e50e8467 100644
--- a/web/client/src/sections/quanju/containers/footer/guanli/index.js
+++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js
@@ -26,18 +26,18 @@ const Guanli = () => {
})}
}
- renderContent()
+ // renderContent()
return (
-
+
{itemlist.map((item,index)=>
)}
-
+
已处理
diff --git a/web/client/src/sections/quanju/containers/footer/guanli/style.less b/web/client/src/sections/quanju/containers/footer/guanli/style.less
index c225f744..d6f3056a 100644
--- a/web/client/src/sections/quanju/containers/footer/guanli/style.less
+++ b/web/client/src/sections/quanju/containers/footer/guanli/style.less
@@ -19,8 +19,8 @@
justify-content: space-between;
border: 2px solid rgba(28,96,254,0.5000);
.guanli-left-item-left{
- width: 30%;
- height: 70%;
+ width: 45%;
+ height: 60%;
display: flex;
flex-direction: column;
align-items: center;
@@ -37,7 +37,7 @@
font-size: 34px;
font-family: YouSheBiaoTiHei;
color: #FFFFFF;
- height: 60%;
+ height: 70%;
width: 100%;
background: url('/assets/images/quanju/guanlijiance_1.png') no-repeat;
background-size: 100% 80%;
@@ -56,7 +56,20 @@
}
.guanli-left-item-right{
width: 40%;
- height: 60%;
+ height: 50%;
+ position: relative;
+ span{
+ position: absolute;
+ width: 8px;
+ height: 8px;
+ background-color: #fff;
+ top: 1.5%;
+ left: 50%;
+ z-index: 10;
+ border-radius: 4px;
+ display: block;
+ }
+
// background-color: pink;
}
// background-color: pink;
diff --git a/web/readme.md b/web/readme.md
index 5b89376a..5b60bd50 100644
--- a/web/readme.md
+++ b/web/readme.md
@@ -251,4 +251,4 @@
所以在 client/src/themes/xx.json 中的中可以配置想变换的主题变量,变量的获取可以通过查看 antd、antdPro 的源码,然后在 color 中处理;
## 一些考量
-1. 文件上传,如需保存在api所在服务器,可以在api使用 @fs/attachment 包配合 client/src/component/Upload 使用,Upload 组件已经完美兼容该包的使用;
\ No newline at end of file
+1. 文件上传,如需保存在api所在服务器,可以在api使用 @fs/attachment 包配合 client/src/component/Upload 使用,Upload 组件已经完美兼容该包的使用;
\ No newline at end of file