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 44a348cf..9265d77c 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/index.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js @@ -64,7 +64,6 @@ const Guanli = (props) => { } - console.log(1111, qndmn); useEffect(() => { requestleftDatas(); @@ -79,7 +78,7 @@ const Guanli = (props) => { if (index < 120) { return
-
+
{picfile?.length > 0 ? {picfile?.map(v => { {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"}

- 执法道路: {roadname}

- 执法成果: @@ -170,7 +169,7 @@ const Guanli = (props) => { 处罚 处理日期

*/} -
+
执法日期
执法成果
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 6500d1dc..b0aba75d 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 @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react' import Module from '../../../public/module' -import { Carousel, Tooltip,} from 'antd' +import { Carousel, Tooltip, } from 'antd' import Lun from "./lunbo" import moment from 'moment' import "./left.less" @@ -12,41 +12,41 @@ import AutoRollComponent from '../../build/AutoRollComponent' const Rightbottom = (props) => { - const { dispatch } = props - const style = { height: "28%", marginTop: "4%" } - const [beijing, setBeijing] = useState() - const [list, setList] = useState([]) - const [rightDatas, setrightDatas] = useState([]) - const [nums, setNums] = useState([]) - const [num, setNum] = useState() + const { dispatch } = props + const style = { height: "28%", marginTop: "4%" } + const [beijing, setBeijing] = useState() + const [list, setList] = useState([]) + const [rightDatas, setrightDatas] = useState([]) + const [nums, setNums] = useState([]) + const [num, setNum] = useState() const [rightitemlist, setrightitemlist] = useState([]) - const requestRightDatas = async () => { - const res = await dispatch(getZhichaolist()) - var pattern = /[\u4e00-\u9fa5]*/; - let d = res.payload.data?.overSpeedList?.filter((item, index) => { - return /.*[\u4e00-\u9fa5_a-zA-Z]+.*$/.test(item.processingTime) == false - }) - console.log(res); - d.map((item, index) => { - if (parseInt(item.processingTime.match(/([^.]*)$/)[0]) < 10) { - return item.processingTime = `${(item.processingTime.match(/^([^.]*)(.[^.]*)/)[0])}.0${parseInt(item.processingTime.match(/([^.]*)$/)[0])}` - } - }) - d.sort((a, b) => b.processingTime.localeCompare(a.processingTime)) - // setrightDatas(res.payload.data) - setList(d) - } - useEffect(() => { + const requestRightDatas = async () => { + const res = await dispatch(getZhichaolist()) + var pattern = /[\u4e00-\u9fa5]*/; + let d = res.payload.data?.overSpeedList?.filter((item, index) => { + return /.*[\u4e00-\u9fa5_a-zA-Z]+.*$/.test(item.processingTime) == false + }) + console.log(res); + d.map((item, index) => { + if (parseInt(item.processingTime.match(/([^.]*)$/)[0]) < 10) { + return item.processingTime = `${(item.processingTime.match(/^([^.]*)(.[^.]*)/)[0])}.0${parseInt(item.processingTime.match(/([^.]*)$/)[0])}` + } + }) + d.sort((a, b) => b.processingTime.localeCompare(a.processingTime)) + // setrightDatas(res.payload.data) + setList(d) + } + useEffect(() => { // const zhichaolist = dispatch(getZhichaolist()).then((res) => { // setNums(res.payload?.data?.processed) // }) // requestRightDatas() roadManagement() - }, []) + }, []) - const roadManagement = async () => { + const roadManagement = async () => { await dispatch(getRoadadministration({})).then(res => { if (res.success) { setrightitemlist(res.payload.data?.rows || []) @@ -57,18 +57,18 @@ const Rightbottom = (props) => { } - const renderContent = () => { + const renderContent = () => { return
{rightitemlist && rightitemlist.length !== 0 ? rightitemlist?.map(({ enforcementdate, enforcementreslt, roadname, picfile }, index) => { if (index < 120) { return
-
+
{picfile?.length > 0 ? {picfile?.map(v => { {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"}

- 执法道路: {roadname}

- 执法成果: @@ -120,20 +120,20 @@ const Rightbottom = (props) => { }) : ""}

} - return ( - <> - - -
-
执法日期
-
执法成果
-
- {rightitemlist && rightitemlist.length !== 0 ? : } - -
- - ) + return ( + <> + + +
+
执法日期
+
执法成果
+
+ {rightitemlist && rightitemlist.length !== 0 ? : } + +
+ + ) } export default Rightbottom \ No newline at end of file