diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 45edb9a6..118cef79 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -15,7 +15,8 @@ "args": [ "-p 13400", "-f http://localhost:13400", - "-g postgres://FashionAdmin:123456@10.8.16.184:5432/sihaogonglu", + // "-g postgres://FashionAdmin:123456@10.8.16.184:5432/sihaogonglu", + "-g postgres://postgres:123@10.8.30.32:5432/highways4good", // "-g postgres://FashionAdmin:123456@10.8.30.156:5432/highway4goodn0728", "--qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5", "--qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa", 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 35507d0c..3e42faf5 100644 --- a/web/client/src/sections/quanju/containers/footer/guanli/index.js +++ b/web/client/src/sections/quanju/containers/footer/guanli/index.js @@ -1,18 +1,20 @@ import React, { useEffect, useState } from 'react'; import { connect } from 'react-redux'; -import { Carousel, Tooltip } from 'antd' +import { Carousel, Tooltip, Image } from 'antd' import AutoRollComponent from '../build/AutoRollComponent' import VideoMonitor from '../build/videoMonitor' import Module from '../../public/module' +import moment from 'moment' import LeftItem from './LeftItem' import { getjiandmanage, getjiandetail } from '../../../actions/example' +import { getRoadadministration } from '../../../../fillion/actions/luzheng' import './style.less' import NoData from '../../public/noData'; const Guanli = (props) => { const { dispatch } = props const [leftDatas, setleftDatas] = useState([]) const [rightDatas, setrightDatas] = useState([]) - const [rightitemlist, setrightitemlist] = useState() + const [rightitemlist, setrightitemlist] = useState([]) const requestleftDatas = async () => { const res = await dispatch(getjiandmanage()) res.payload.data?.sort((a, b) => { @@ -50,48 +52,80 @@ const Guanli = (props) => { // console.log(d2,'完美') // console.log(res.payload.data,'嘿嘿嘿') } + + const roadManagement = async () => { + await dispatch(getRoadadministration({})).then(res => { + if (res.success) { + setrightitemlist(res.payload.data?.rows || []) + } + }) + + + + } + + + useEffect(() => { requestleftDatas(); - requestRightDatas() + // requestRightDatas() + roadManagement() }, []) - // let datalist = newArry(30) - // datalist.fill({licensePlate:"赣A44454",overrunRate:"30%",fine:"200元",processingTime:"2020年4月1日"}) - // const content = ( - // ); const renderContent = () => { - // console.log(rightitemlist); + return
{overrunRate ? overrunRate.toFixed(2) : 0}%{/* {item.overrunRate ? item.overrunRate + "%" : "--"} */}
-超限
-车牌号{licensePlate}{/* {item.licensePlate} */}
-检测点{nameOfInspectionPoint}
-处罚{deductPoints ? `-${deductPoints}分` : ""}和-{fine}{fine ? "元" : ""}{/* {item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"} */}
-日期{processingTime}{/* {item.processingTime ? item.processingTime : "--"} */}
+ {picfile?.length > 0 ?+ 执法日期: + {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"} +
++ 执法道路: + {roadname} +
++ 执法成果: + {enforcementreslt}