diff --git a/web/client/assets/images/quanju/biaoxian.png b/web/client/assets/images/quanju/biaoxian.png new file mode 100644 index 00000000..056aabcb Binary files /dev/null and b/web/client/assets/images/quanju/biaoxian.png differ diff --git a/web/client/assets/images/quanju/biaozhi.png b/web/client/assets/images/quanju/biaozhi.png new file mode 100644 index 00000000..59007b4f Binary files /dev/null and b/web/client/assets/images/quanju/biaozhi.png differ diff --git a/web/client/assets/images/quanju/chart-circle.png b/web/client/assets/images/quanju/chart-circle.png new file mode 100644 index 00000000..405cd5dc Binary files /dev/null and b/web/client/assets/images/quanju/chart-circle.png differ diff --git a/web/client/assets/images/quanju/circle.png b/web/client/assets/images/quanju/circle.png new file mode 100644 index 00000000..8dd12715 Binary files /dev/null and b/web/client/assets/images/quanju/circle.png differ diff --git a/web/client/assets/images/quanju/fanghu.png b/web/client/assets/images/quanju/fanghu.png new file mode 100644 index 00000000..459b6bf3 Binary files /dev/null and b/web/client/assets/images/quanju/fanghu.png differ diff --git a/web/client/assets/images/quanju/jiancha.png b/web/client/assets/images/quanju/jiancha.png new file mode 100644 index 00000000..382826a6 Binary files /dev/null and b/web/client/assets/images/quanju/jiancha.png differ diff --git a/web/client/assets/images/quanju/kelvhua_icon.png b/web/client/assets/images/quanju/kelvhua_icon.png new file mode 100644 index 00000000..c200b199 Binary files /dev/null and b/web/client/assets/images/quanju/kelvhua_icon.png differ diff --git a/web/client/assets/images/quanju/lupai.png b/web/client/assets/images/quanju/lupai.png new file mode 100644 index 00000000..18207185 Binary files /dev/null and b/web/client/assets/images/quanju/lupai.png differ diff --git a/web/client/assets/images/quanju/renxing.png b/web/client/assets/images/quanju/renxing.png new file mode 100644 index 00000000..313534f0 Binary files /dev/null and b/web/client/assets/images/quanju/renxing.png differ diff --git a/web/client/assets/images/quanju/yushui.png b/web/client/assets/images/quanju/yushui.png new file mode 100644 index 00000000..1eaa50d6 Binary files /dev/null and b/web/client/assets/images/quanju/yushui.png differ diff --git a/web/client/assets/images/quanju/zerenpai.png b/web/client/assets/images/quanju/zerenpai.png new file mode 100644 index 00000000..05072584 Binary files /dev/null and b/web/client/assets/images/quanju/zerenpai.png differ diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/left-bottom.js b/web/client/src/sections/quanju/containers/footer/conserve/left/left-bottom.js index 1d4a813a..51ea4ef7 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/left-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/left-bottom.js @@ -2,7 +2,7 @@ import React from 'react' import Module from '../../../public/module' const LeftBottom = () => { - const style = { height: "30%", marginTop: "5%" } + const style = { height: "31%", marginTop: "3%" } 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 58152ac3..42c7cd48 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,14 +1,30 @@ +import { Col, Row } from 'antd' import React from 'react' +import { useEffect } from 'react' import Module from '../../../public/module' const LeftCenter = () => { - const style = { height: "30%", marginTop: "5%" } + const style = { height: "31%", marginTop: "3%" } + + useEffect(() => { + + }, []) + 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 b16acf6b..6cf714ea 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 @@ -33,7 +33,7 @@ const LeftTop = () => { }, ], polar: { - radius: ["65%", "73%"], + radius: ["60%", "68%"], center: ["50%", "50%"], }, angleAxis: { @@ -107,7 +107,7 @@ const LeftTop = () => { }, ], polar: { - radius: ["65%", "73%"], + radius: ["60%", "68%"], center: ["50%", "50%"], }, angleAxis: { @@ -159,13 +159,13 @@ const LeftTop = () => { chartInstance.setOption(frequentlyOption); }, []) - const style = { height: "30%", marginTop: "5%" } + const style = { height: "31%", marginTop: "3%" } return ( <>
-
-
+
+
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right.js b/web/client/src/sections/quanju/containers/footer/conserve/right.js index eb16ed5c..ee25d2ca 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right.js @@ -5,7 +5,7 @@ import RightTop from './right/right-top' const Right = () => { return ( -
+
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js index 80e9a9d5..9665fb01 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js @@ -2,7 +2,7 @@ import React from 'react' import Module from '../../../public/module' const RightBottom = () => { - const style = { height: "30%", marginTop: "5%" } + const style = { height: "31%", marginTop: "3%" } return ( <> diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js index c3dd6cf0..6689f500 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-center.js @@ -1,12 +1,49 @@ import React from 'react' import Module from '../../../public/module' +import { Col, Row } from 'antd' const RightCenter = () => { - const style = { height: "30%", marginTop: "5%" } + 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 } + return ( <> - +
+ + + icon +
+
检查井
+
89个
+
+ + + icon + +
雨水口
+
61个
+
+ +
+ + + icon + +
路牌名
+
2230个
+
+ + + icon + +
养护责任牌
+
1217个
+
+ +
+
) 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 bea2ad12..18b24f6b 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 @@ -1,14 +1,50 @@ +import { Col, Row } from 'antd' import React from 'react' import Module from '../../../public/module' -const RightTop= () => { - const style = { height: "30%", marginTop: "5%" } +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 } return ( - <> - - - - + <> + +
+ + + icon +
+
标线
+
1352km
+
+ + + icon + +
人行道
+
80处
+
+ +
+ + + icon + +
标志牌
+
4563个
+
+ + + icon + +
防护栏
+
1054km
+
+ +
+
+
+ ) } export default RightTop \ No newline at end of file