-
-
-
-
-
: ""}
{beijing == index ? 
: ""}
- {item.name}
-{item.name}
-{item.name}
-{item.name}
+日常养护
+ {item.user?.name ?{item.user.name}
:--
} +{item.road ? item.road : "--"}
+{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
) }) } @@ -65,16 +53,35 @@ const Right = () => { <>
+
+
{
+const Leftbottomecharts = (props) => {
const chartRef = useRef(null);
+ const { dispatch } = props
+ const [list, setList] = useState([])
+ const [max, setMax] = useState()
+ useEffect(() => {
+ const yunzheng = dispatch(getyunzheng()).then((res) => {
+ // console.log(res.payload);
+ setMax(Math.max.apply(null, [res.payload.data.passengerTransport, res.payload.data.hazardousGoods, res.payload.data.taxi, res.payload.data.bus]));
+ setList([res.payload.data.passengerTransport, res.payload.data.hazardousGoods, res.payload.data.taxi, res.payload.data.bus])
+ })
+ }, [])
+
useEffect(() => {
var chartInstance = echarts.init(chartRef.current);
var colorArray = [
@@ -35,7 +47,7 @@ const Leftbottomecharts = () => {
grid: {
left: "5%",
top: "12%",
- right: "1%",
+ right: "4%",
bottom: "8%",
containLabel: true,
},
@@ -99,7 +111,7 @@ const Leftbottomecharts = () => {
// zlevel: 1,
barCategoryGap: "50%",
color: "#042B7F",
- data: [150, 150, 150, 150],
+ data: [max + 20, max + 20, max + 20, max + 20],
tooltip: {
show: false,
},
@@ -111,7 +123,7 @@ const Leftbottomecharts = () => {
barWidth: 10,
barGap: "-100%",
barCategoryGap: "50%",
- data: [60, 132, 89, 134],
+ data: list || [],
markPoint: {
Symbol: "",/* 可以通过’image: *///url’设置为图片，其中url为图片的链接
data: [{ type: "max", name: "最大值" }],
@@ -188,7 +200,7 @@ const Leftbottomecharts = () => {
window.onresize = function () {
chartInstance.resize();
}
- }, []);
+ }, [list]);
return (
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
index 673c4a15..8a55a8b5 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
@@ -1,41 +1,29 @@
import React, { useState, useEffect } from 'react'
-import Lun from "./lunbo/lunbo"
+import Lun from "../right/lunbo"
+import { getRoadmaintain, getdaolutongji } from "../../../../actions/example"
+import moment from 'moment'
-const Right = () => {
+
+const Right = (props) => {
+ const { dispatch } = props
const [beijing, setBeijing] = useState()
- const [list, setList] = useState([{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11121", chaoxian: "30%", penalty: "-6分和扣200元", days: "2022年5月4日" },
- { name: "苏LD112512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD1151121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11912121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD16112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L2D111221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "62", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11152121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L1D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD13112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD111612121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD111216221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L63D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD163112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD651112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" }])
+ const [list, setList] = useState([])
+ const [roads, setRoads] = useState()
+ useEffect(() => {
+ const daolus = dispatch(getRoadmaintain()).then((res) => {
+ setList(res.payload.data.reportList.filter((item, index) => {
+ return item.projectType == "culvert"
+ }))
+ })
+ }, [])
+ useEffect(() => {
+ const daolus = dispatch(getdaolutongji()).then((res) => {
+ // console.log("[roads]", res.payload.data.roadType);
+ setRoads(res.payload.data.townCulvert)
+ console.log(res.payload.data.townCulvert);
+ // const
+ })
+ }, [])
const renderBody = () => {
return (
@@ -51,10 +39,10 @@ const Right = () => {
}}>
{beijing == index ? : ""}
{beijing == index ? : ""}
-
施工了{c}公里", + formatter: " {b}年
{c}公里", trigger: "axis", axisPointer: { lineStyle: { @@ -46,15 +61,13 @@ const Leftbottomecharts = () => { }, axisLine: { lineStyle: { - color: "rgba(176,215,255,0.4)", + color: /* "rgba(176,215,255,0.4)" */"rgba(216,240,255,0.8)", }, }, - data: [ - "13:00", - "13:05", - "13:10", - "13:15", - ], + axisLabel: { + color: "rgba(216,240,255,0.8)", + }, + data: list, normal: { lineStyle: { color: "rgba(226,240,255,0.4)"//折线的颜色 @@ -77,9 +90,9 @@ const Leftbottomecharts = () => { // nameTextStyle: { // color: "#abb8ce", // }, - // axisLabel: { - // color: "#abb8ce", - // }, + axisLabel: { + color: "rgba(216,240,255,0.8)", + }, axisTick: { //y轴刻度线 show: false, @@ -121,7 +134,7 @@ const Leftbottomecharts = () => { shadowBlur: 10, }, }, - data: [220, 182, 191, 134], + data: count, }, ], }; @@ -129,7 +142,7 @@ const Leftbottomecharts = () => { window.addEventListener('resize', function () { chartInstance.resize(); }) - }, []); + }, [list, count]); return ( diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js index 8fbcd053..458f0972 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js @@ -2,12 +2,13 @@ import React from 'react' import Module from '../../../public/module' import Echartes from "./echarts/leftbottomecharts" -const Leftbottom = () => { +const Leftbottom = (props) => { + const { dispatch } = props const style = { height: "28%", marginTop: "5%" } return ( <>
-
)
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js
index 19dd88b8..03d1e8a5 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-center.js
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react'
import Module from '../../../public/module'
-import Lunbo from "../centerleft/lunbo/lunbo"
+import Lunbo from "../right/lunbo"
// import "./left.less"
const Leftcenter = () => {
@@ -25,7 +25,7 @@ const Leftcenter = () => {
])
useEffect(() => {
const timer = setInterval(() => {
- if (num == 12) {
+ if (num == list.length) {
setNum(1);
setTu(list[0].img);
} else {
@@ -42,13 +42,13 @@ const Leftcenter = () => {
return (
// {
const style = { height: "68%" }
+ useEffect(() => {
+ // return () => {
+ request('GET', '/search').then((success, failure) => {
+ console.log(success);
+ });
+ // };
+ }, [])
return (
<>
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right.js b/web/client/src/sections/quanju/containers/footer/leadership/right.js
index 58172bba..4623d72a 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/right.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/right.js
@@ -3,12 +3,13 @@ import Righttop from './right/right-top'
import Rightcenter from './right/right-center'
import Rightbottom from './right/right-bottom'
-const Right = () => {
+const Right = (props) => {
+ const { dispatch } = props
return (
<>
+
+ 占比{(roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+{roads?.["县"].toFixed(3)}公里县道道路
+
+
+
+
+ {/*
+ */}
-
+
+
+
+
+
+ 乡村道道路{(roads?.["乡"] + roads?.["村"]).toFixed(3)}公里
+占比{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+
{/* 
- 离线详情
+ 养护事件
+ 
*/}
{title || []}
*/}
- 离线详情
+ 养护事件
+ 道路{nums || []}次
{/* */}
: ""}
{beijing == index ? : ""}
- {item.name}
-{item.name}
-{item.name}
-{item.name}
+日常养护
+ {item.user?.name ?{item.user.name}
:--
} +{item.road ? item.road : "--"}
+{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
) }) } @@ -65,16 +53,35 @@ const Right = () => { <>
+ {
+const Right = (props) => {
+ const { dispatch } = props
const [beijing, setBeijing] = useState()
- const [list, setList] = useState([{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11121", chaoxian: "30%", penalty: "-6分和扣200元", days: "2022年5月4日" },
- { name: "苏LD112512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD1151121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11912121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD16112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L2D111221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "62", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11152121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L1D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD13112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD111612121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD111216221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L63D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD163112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD651112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" }])
+ const [list, setList] = useState([])
+ const [roads, setRoads] = useState()
+ useEffect(() => {
+ const daolus = dispatch(getRoadmaintain()).then((res) => {
+ setList(res.payload.data.reportList.filter((item, index) => {
+ return item.projectType == "bridge"
+ }))
+ })
+ }, [])
+ useEffect(() => {
+ const daolus = dispatch(getdaolutongji()).then((res) => {
+ // console.log("[roads]", res.payload.data.roadType);
+ setRoads(res.payload.data.bridgeSize)
+ console.log(res.payload.data.bridgeSize);
+ // const
+ })
+ }, [])
const renderBody = () => {
return (
@@ -51,10 +38,10 @@ const Right = () => {
}}>
{beijing == index ? : ""}
{beijing == index ? : ""}
-
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/index.js b/web/client/src/sections/quanju/containers/footer/leadership/index.js
index cbd1980a..e12bf0bb 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/index.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/index.js
@@ -4,12 +4,13 @@ import Right from './right'
import CenterLeft from "./centerLeft"
import Centerright from "./centerRight"
-const Leadership = () => {
+const Leadership = (props) => {
+ const { dispatch } = props
return (
<>
-
+
{
- const [list, setList] = useState([
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- ])
+const Bottomlunbo = (props) => {
+ const { dispatch } = props
+ const [list, setList] = useState([])
+ useEffect(() => {
+ const car = dispatch(getyunzheng()).then((res) => {
+ setList(res.payload.data.taxiBusiness);
+ })
+ }, [])
const renderBody = () => {
return (
{q.data[index].substring(0, showWord) + '...'}
- // } else {
- // return {q.data[index]}
- // }
- // }
- }
-
- } else {
- if (c.indexOf("时间") == -1)
- if (q.data[index].length > showWord) {
- return {q.data[index].substring(0, showWord) + '...'}
- }
- return {q.data[index]}
- }
-
- // c === changeStyleCol ?
- // color ?
- // {q.data[index]}
- // : q.levelbg ?
- // q.isSiteAlermListMock ? 已处理 :
- // {q.data[index]}
- // : {q.data[index]}
-
-
- // : ['时间'].indexOf(c) != -1 ? !customColorBox ? {q.data[index]} :
- // {q.data[index].substring(0, showWord) + '...'}
- // : {q.data[index]}
- }
-
- getContent = () => {
- const { changeStyleCol, heads, spans, data, showWord, color, dataTextAlign, customColorBox, } = this.props;
- let result = ;
- if (data) {
- result = data.map((q, idx) => {
- return (
-
+
+ 占比{(roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+{roads?.["县"].toFixed(0)}个县涵洞
+
+
+
+
+
+ {/*
-
+
+
*/}
+
+
+
+ 乡村涵洞{(roads?.["乡"] + roads?.["村"]).toFixed(3)}个
+占比{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}%
+
{/*
- 离线详情
+ 养护事件
+ */}
{title || []}
*/}
- 离线详情
+ 养护事件
+ 道路187次
{/* */}
{
list.map((item, index) => {
- return
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/lunbo.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/lunbo.js
deleted file mode 100644
index e992fb0d..00000000
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/lunbo.js
+++ /dev/null
@@ -1,182 +0,0 @@
-'use strict'
-import React, { Component } from 'react';
-// import { Col, Row, Tag, Tooltip } from '@douyinfe/semi-ui';
-import { Col, Row, Tag, Toolip } from 'antd';
-import './style.less';
-export default class AutoRollComponent extends Component {
-
- constructor(props) {
- super(props);
- this.scrollElem = null;
- this.stopscroll = false;
- this.preTop = 0;
- this.cloneEle = null;
- this.currentTop = 0;
- this.marqueesHeight = 0;
- this.interval = null;
- }
-
- marque = (height) => {
- try {
- this.scrollElem = document.getElementById(this.props.divId);
- this.marqueesHeight = height;
- if (this.scrollElem) {
- this.scrollElem.style.height = this.marqueesHeight;
- this.scrollElem.style.overflow = 'hidden';
- }
-
- if (!this.props.closeroll) {
- this.repeat()
- }
- } catch (e) { console.log(e) }
- }
-
-
- repeat = () => {
- this.scrollElem.scrollTop = 0;
-
- this.interval = setInterval(() => {
- if (this.stopscroll) return;
- this.currentTop = this.currentTop + 1;
- this.preTop = this.scrollElem.scrollTop;
- this.scrollElem.scrollTop = this.scrollElem.scrollTop + 1;
- // console.log(this.scrollElem.scrollTop);
- if (this.preTop === this.scrollElem.scrollTop) {
- this.scrollElem.scrollTop = this.marqueesHeight;
- this.scrollElem.scrollTop = this.scrollElem.scrollTop + 1;
- // console.log(this.scrollElem.scrollTop);
- }
- }, 80);
- }
-
-
- componentWillUnmount() {
- clearInterval(this.interval);
- }
-
- componentDidMount() {
- this.marque(10);
- }
-
- onMouseOver = () => {
- this.stopscroll = true;
- }
-
- onMouseOut = () => {
- this.stopscroll = false;
- }
-
- loadDataColumn = (c, index, q) => {
- const { changeStyleCol, heads, spans, data, showWord, color, dataTextAlign, customColorBox, } = this.props;
- if (c === changeStyleCol) {
- if (color) {
- {q.data[index]}
- } else {
- if (['时间'].indexOf(c) != -1) {
- return {q.data[index]}
- }
- // if (c.indexOf("时间") == -1) {
- // if (customColorBox) {
- // return {item.name}
+ return {item.nameOfBusinessOwner}
})
}
-
- {q.data[1] == -1 ? null : heads.map((c, index) => {
- let extraStyle = {}
- if (q.isSiteAlermListMock && c == "状态") {
- extraStyle = { color: "green" }
- }
-
- return
-
- )
- })
- } else {
- result =
-
-
- }
- return result;
- }
-
- render() {
-
- const { heads, spans, divId, divHeight, content, color, titleLeft, containerStyle = {} } = this.props;
- return (
-
- {heads ?
-
- {heads.map((c, index) => {
- return
- : ''}
-
- )
- }
-}
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js
index 910a3937..3fe2c09d 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js
@@ -1,31 +1,23 @@
import React, { useState, useEffect } from 'react'
-import Lunbotop from "./lunbo"
+import Lunbotop from "../../right/lunbo"
+import { getyunzheng } from "../../../../../actions/example"
-const Toplunbo = () => {
- const [list, setList] = useState([
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- { name: "南昌宁昌物流运输有限公司" },
- ])
+
+const Toplunbo = (props) => {
+ const { dispatch } = props
+ const [list, setList] = useState([])
+ useEffect(() => {
+ const cars = dispatch(getyunzheng()).then((res) => {
+ setList(res.payload.data.hazardousGoodsBusiness)
+ // console.log(res.payload.data.hazardousGoodsBusiness);
+ })
+ }, [])
const renderBody = () => {
return (
-
-
- {content ? content : ''}
- {this.getContent()}
-
-
{
list.map((item, index) => {
- return
@@ -44,7 +36,7 @@ const Toplunbo = () => {
{item.name}
+ return {item.nameOfBusinessOwner}
})
}
: ""}
{beijing == index ? : ""}
- {item.name}
-{item.name}
-{item.name}
-{item.name}
+日常养护
+ {item.user?.name ?{item.user.name}
:--
} +{item.road ? item.road : "--"}
+{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}
) }) } @@ -65,16 +52,35 @@ const Right = () => { <>
+
+
{
- const { tabChange, tabKey } = props
+ const { tabChange, tabKey, dispatch } = props
+ const [list, setList] = useState()
+ const [culvert, setCulvert] = useState()
+ const [bridge, setBridge] = useState()
// const [tab, setTad] = useState("base")
const onClick = (tab) => {
// setTad({ tab })
tabChange(tab)
}
+ useEffect(() => {
+ const daolus = dispatch(getdaolutongji()).then((res) => {
+ // console.log("[roads]", res.payload.data.roadType);
+ setList(res.payload.data.roadType)
+ // const
+ setCulvert(res.payload.data.townCulvert)
+ setBridge(res.payload.data.bridgeSize)
+ })
+ }, [])
return (
<>
+
+ 占比{(roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}%
+{roads?.["大桥"]}座大桥
+
+
+
+
+
+
-
+
+
+
+
+
+ 中小桥梁{roads?.["小桥"] + roads?.["中桥"]}座
+占比{((roads?.["小桥"] + roads?.["中桥"]) / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}%
+
{/*
- 离线详情
+ 养护事件
+ */}
{title || []}
*/}
- 离线详情
+ 养护事件
+ 道路187次
{/* */}
@@ -25,7 +39,7 @@ const Leftcenter = (props) => {
道路统计公里
-2333.4
+{(list?.["县"] + list?.["乡"] + list?.["村"]).toFixed(3)}
{
@@ -39,7 +53,7 @@ const Leftcenter = (props) => {
涵洞统计个
-2333.4
+{(culvert?.["县"] + culvert?.["乡"] + culvert?.["村"]).toFixed(0)}
{
@@ -53,7 +67,7 @@ const Leftcenter = (props) => {
桥梁统计座
-2333.4
+{(bridge?.["小桥"] + bridge?.["中桥"] + bridge?.["大桥"])}
-
)
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js b/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js
index 3b856b15..35f776a4 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js
@@ -1,7 +1,22 @@
-import React, { useEffect, useRef } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
import * as echarts from 'echarts';
+import { getdaolutongji } from "../../../../../actions/example"
-const Leftbottomecharts = () => {
+const Leftbottomecharts = (props) => {
+ const { dispatch } = props
+ const [list, setList] = useState([])
+ const [count, setCount] = useState([])
+ useEffect(() => {
+ const res = dispatch(getdaolutongji()).then((res) => {
+ setList(res.payload.data.construction.map((item, index) => {
+ return item.year
+ }));
+ setCount(res.payload.data.construction.map((item, index) => {
+ return item.count.toFixed(3)
+ }))
+ });
+ }, [])
+ console.log(list, count);
const chartRef = useRef(null);
useEffect(() => {
var chartInstance = echarts.init(chartRef.current);
@@ -9,7 +24,7 @@ const Leftbottomecharts = () => {
title: {
},
tooltip: {
- formatter: " {b}年施工了{c}公里", + formatter: " {b}年
{c}公里", trigger: "axis", axisPointer: { lineStyle: { @@ -46,15 +61,13 @@ const Leftbottomecharts = () => { }, axisLine: { lineStyle: { - color: "rgba(176,215,255,0.4)", + color: /* "rgba(176,215,255,0.4)" */"rgba(216,240,255,0.8)", }, }, - data: [ - "13:00", - "13:05", - "13:10", - "13:15", - ], + axisLabel: { + color: "rgba(216,240,255,0.8)", + }, + data: list, normal: { lineStyle: { color: "rgba(226,240,255,0.4)"//折线的颜色 @@ -77,9 +90,9 @@ const Leftbottomecharts = () => { // nameTextStyle: { // color: "#abb8ce", // }, - // axisLabel: { - // color: "#abb8ce", - // }, + axisLabel: { + color: "rgba(216,240,255,0.8)", + }, axisTick: { //y轴刻度线 show: false, @@ -121,7 +134,7 @@ const Leftbottomecharts = () => { shadowBlur: 10, }, }, - data: [220, 182, 191, 134], + data: count, }, ], }; @@ -129,7 +142,7 @@ const Leftbottomecharts = () => { window.addEventListener('resize', function () { chartInstance.resize(); }) - }, []); + }, [list, count]); return ( diff --git a/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js index 8fbcd053..458f0972 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/left/left-bottom.js @@ -2,12 +2,13 @@ import React from 'react' import Module from '../../../public/module' import Echartes from "./echarts/leftbottomecharts" -const Leftbottom = () => { +const Leftbottom = (props) => { + const { dispatch } = props const style = { height: "28%", marginTop: "5%" } return ( <>
// {/*
*/}
- {
+ {
setTu(item.img);
setNum(index + 1);
setName(item.name)
// console.log(list);
}}>
- 
// {/*
*/}
@@ -86,7 +86,7 @@ const Leftcenter = () => {
}
{item.name}
+{item.name}
-
)
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js b/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js
index e740f270..f672f98a 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js
@@ -40,14 +40,15 @@ class ReactCarousel extends Component {
imgs: [],
showIndex: 0, //显示第几个图片
timer: null, // 定时器
- show: false // 前后按钮显示
+ show: false, // 前后按钮显示
+ // arr1: ""
}
- this.setState({
- imgs: this.chunk((this.state.shuzu), 4)
- })
- console.log(this.chunk((this.state.shuzu), 4));
+ // console.log(this.state.imgs);
+ this.state.imgs = this.chunk((this.state.shuzu), 4)
}
+
+
render() {
return (
@@ -57,15 +58,27 @@ class ReactCarousel extends Component {
>
-
{
+
this.state.imgs.map((value, index) => {
return (
-
-
- {value[0].name}-{value[1].name}++ {value[0]?.name} ++ {value[1]?.name ?+ {value[1]?.name} +: ""} + {value[2]?.name ?+ {value[2]?.name} +: ""} + {value[3]?.name ?+ {value[3]?.name} +: ""} + {/*{value[1].name}{value[2].name}-{value[3].name}+{value[3].name}*/}
)
})
@@ -94,6 +107,7 @@ class ReactCarousel extends Component {
componentDidMount() { //一开始自动播放
this.start();
}
+
componentWillUnmount() { //销毁前清除定时器
this.stop();
}
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/left.less b/web/client/src/sections/quanju/containers/footer/leadership/right/left.less
index dcf56b90..bb7613be 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/right/left.less
+++ b/web/client/src/sections/quanju/containers/footer/leadership/right/left.less
@@ -2,13 +2,16 @@ li{
list-style-type:none
}
-.ant-select-selector, .ant-select-selection-placeholder{
+.wy-rightTop{
+ .ant-select-selector, .ant-select-selection-placeholder{
background-color:#011f59 !important;
border:#1E7BD6 1px solid !important;
font-family: PingFangSC-Regular, PingFang SC !important;
height: 25px !important;
// line-height: 25px !important;
}
+}
+
.ant-select-selection-item{
line-height: 25px !important;
}
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/lunbo copy.js b/web/client/src/sections/quanju/containers/footer/leadership/right/lunbo copy.js
deleted file mode 100644
index f6230ea7..00000000
--- a/web/client/src/sections/quanju/containers/footer/leadership/right/lunbo copy.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import React from 'react'
-
-function lunbo() {
- return (
-
- { - // }}>{item.name} - //
- { + {list?.map((item, index) => { + return
- {
setBeijing(index)
// console.log(beijing);
}}>
- {item.name}-{item.chaoxian}-{item.penalty}-{item.days}
+ {beijing == index ?
lunbo copy
- )
-}
-
-export default lunbo
\ No newline at end of file
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js
index 0558c40e..833f6b23 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js
@@ -2,54 +2,36 @@ import React, { useState, useEffect } from 'react'
import Module from '../../../public/module'
import Lun from "./lunbo"
import "./left.less"
+import { getZhichaolist } from "../../../../actions/example"
-const Rightbottom = () => {
+const Rightbottom = (props) => {
+ const { dispatch } = props
const style = { height: "28%", marginTop: "4%" }
const [beijing, setBeijing] = useState()
- const [list, setList] = useState([{ name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11121", chaoxian: "30%", penalty: "-6分和扣200元", days: "2022年5月4日" },
- { name: "苏LD112512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD1151121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11912121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD16112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L2D111221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "62", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11152121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L1D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD11512121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD13112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD111612121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD111216221", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏L63D1112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD163112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD162112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" },
- { name: "苏LD651112121", chaoxian: "30%", penalty: "-6分", days: "2022年5月4日" }])
+ const [list, setList] = useState([])
+ const [nums, setNums] = useState([])
+ useEffect(() => {
+ const zhichaolist = dispatch(getZhichaolist()).then((res) => {
+ setList(res.payload?.data?.overSpeedList)
+ // console.log(res);
+ setNums(res.payload?.data?.processed)
+ })
+ })
+ // console.log(list);
const renderBody = () => {
return (
- // {
- // lists.map((item, index) => {
- // return (
- //
)
-
- // })
- // }
- //
- //
- //
- {list.map((item, index) => {
- return 
: ""}
+
- 已处理192件
+ 已处理{nums}件
: ""}
{num == index ? 
: ""}
- */}
//
)
@@ -76,7 +76,7 @@ const Righttop = () => {
: ""}
+ {item.licensePlate}
+ {item.overrunRate ? item.overrunRate : "--"}
+ {item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}
+ {item.processingTime ? item.processingTime : "--"}
+
})
}
@@ -61,7 +43,7 @@ const Rightbottom = () => {
- 已处理192件
+ 已处理{nums}件
车牌号
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js b/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js index ea666b61..51a657c3 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from 'react'; import Module from '../../../public/module' import { Radio, Select } from 'antd'; -import Lunbo from "../centerleft/lunbo/lunbo" +import Lunbo from "./lunbo" import Huadong from './hudong'; import "./left.less" @@ -60,7 +60,7 @@ const Righttop = () => { {num == index ? : ""}
{num == index ? : ""}
- {item.name}
{item.name}
+{item.name}
{item.name}
// {/*
-
+
-
+
@@ -106,7 +106,7 @@ const Righttop = () => {
+