diff --git a/web/client/src/sections/fillion/actions/infor.js b/web/client/src/sections/fillion/actions/infor.js index 20515f2b..8381bab7 100644 --- a/web/client/src/sections/fillion/actions/infor.js +++ b/web/client/src/sections/fillion/actions/infor.js @@ -399,7 +399,7 @@ export function getCustodyunit() { actionType: 'GET_CUSTODY_UNIT', url: ApiTable.getCustodyunit, msg: { error: '获取管养单位概况失败' }, - // reducer: { name: 'roadMaintenances' } + reducer: { name: 'roadMaintenances_management' } }); } export function postCustodyunit(query) { diff --git a/web/client/src/sections/fillion/components/highways/guanli.js b/web/client/src/sections/fillion/components/highways/guanli.js index 2af7e98e..f2cce139 100644 --- a/web/client/src/sections/fillion/components/highways/guanli.js +++ b/web/client/src/sections/fillion/components/highways/guanli.js @@ -8,7 +8,6 @@ import _ from 'lodash' const Guanli = (props) => { const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd, setDelet } = props const [success, setSuccess] = useState() -console.log(recortd) useEffect(() => { return () => { setRecortd() @@ -25,8 +24,6 @@ console.log(recortd) onFinish={(values) => { setDelet(values) const query = { ...values, id: recortd?.id,serialNumber:recortd?.id } - console.log('邢永春',query) - dispatch(postCustodyunit(query)).then((res) => { setSuccess(res.success) }) diff --git a/web/client/src/sections/quanju/containers/footer/conserve/index.js b/web/client/src/sections/quanju/containers/footer/conserve/index.js index f323c1ac..f5a2c3fb 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/index.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/index.js @@ -28,18 +28,21 @@ const Conserve = (props) => { setRoadMaintenances(res.payload.data || []) }) dispatch(getxiuyang()).then(res => { + // let obj = {}; setData(res.payload.data.filter(item => { if (moment(item.maintenanceDate).format("MM") == (new Date().getMonth() < 10 ? "0" + new Date().getMonth() : new Date().getMonth())) { return item } })) +console.log('是发错地方v',res.payload.data.filter((i)=>i.countyName=='向塘镇人民政府')) // setShuju(res.payload.data.filter(item => { // if ((new Date().getMonth() < 10 ? "0" + new Date().getMonth() : new Date().getMonth()) - 6 < moment(item.maintenanceDate).format("MM") && moment(item.maintenanceDate).format("MM") <= (new Date().getMonth() < 10 ? "0" + new Date().getMonth() : new Date().getMonth())) { // return item // } // })) }) + dispatch(getMaintenance()).then(res => { setShuju(res.payload.data) }) diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/Lb.js b/web/client/src/sections/quanju/containers/footer/conserve/left/Lb.js index e8af2d71..389f3e4b 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/Lb.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/Lb.js @@ -52,9 +52,9 @@ return item.maintenanceUnit!==null }}> {beijing == index ? : ""}
{item.maintenanceUnit}
-
{item.management}
-
{item.worker}
-
{item.publicWelfarePost}
+
{item.management||'--'}
+
{item.worker||'--'}
+
{item.publicWelfarePost||'--'}
{/*
{item.qiao}
*/} {/* { num == index ?
@@ -83,7 +83,7 @@ return item.maintenanceUnit!==null 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 54caef57..f9c8fa5e 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 @@ -13,30 +13,21 @@ const LeftCenter = (props) => { // const chartRef = useState(); // const { roadData } = props const [flag, setFlag] = useState(true) + // const [colorFlage, setColorFlage] = useState(true) return ( <>
{ setFlag(false) - console.log(flag); }} style={{ position: "absolute", top: "38%", left: "80%", width: "50px", height: "20px", background: "linear-gradient(270deg, rgba(15,74,159,0) 0%, rgba(17,75,160,0.95) 100%)", float: "right", textAlign: "center", zIndex: 100, marginRight: "4%", borderLeft: "solid 2px #6E7A83" }} > {/* */} -

累计

+

累计

{ setFlag(true) }} style={{ position: "absolute", width: "50px", left: "60%", top: "38%", height: "20px", background: "linear-gradient(270deg, rgba(15,74,159,0) 0%, rgba(17,75,160,0.95) 100%)", float: "right", textAlign: "center", zIndex: 100, marginRight: "2%", borderLeft: "solid 2px #6E7A83", }}> {/* */} -

上月

- {/* - - icon - 可绿化里程总数 - - {totalData.toFixed(3) || 0} - */} - {/*
*/} - {/* */} +

上月

{ flag ? : } diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js b/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js index b8148e37..5f7a8169 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js @@ -50,10 +50,10 @@ const Lefttbottom = (props) => { }}> {beijing == index ? : ""}
{item.responsibleUnitForManagementAndMaintenance}
-
{item.countyHighway}
-
{item.townshipRoad}
-
{item.villageRoad}
-
{item.bridge}
+
{item.countyHighway||'/'}
+
{item.townshipRoad||'/'}
+
{item.villageRoad||'/'}
+
{item.bridge||'/'}
{/* { num == index ?
diff --git a/web/client/src/sections/quanju/containers/footer/conserve/left/shituzujian.js b/web/client/src/sections/quanju/containers/footer/conserve/left/shituzujian.js index 149805ed..6cc286b0 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/left/shituzujian.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/left/shituzujian.js @@ -7,7 +7,6 @@ const PieChart = (props) => { const chartRef = useRef(null); const [styloptr,setStyloptr]=useState()//费用 const [extent,setExtent]=useState()//长度 - let states = [] let monstate=[] useEffect(()=>{ @@ -47,7 +46,7 @@ const data = [ const option = { tooltip: { trigger: "item", - formatter: "{a}
{b}: {c} ({d}%)", + formatter: "{a}{b}: {c} ({d}%)", show: true, }, legend: { @@ -76,6 +75,8 @@ const data = [ normal: { position: "inner", show: false, + // formatter: "{a}{b}: {c} ({d}%)", + }, @@ -97,7 +98,7 @@ const data = [ data: mons, label: { normal: { - formatter: "{b}:{c}" + "\n\r" + "({d}%)", + // formatter: "{b}:{c}km" + "\n\r" + "({d}%)", show: false, position: "left", },