养护样式

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) {

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)
                         })

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)
         })

web/client/src/sections/quanju/containers/footer/conserve/left/Lb.js

@@ -52,9 +52,9 @@ return item.maintenanceUnit!==null
                     }}>
                         {beijing == index ? <img src='/assets/images/leadership/bei.png' style={{ width: "100%", height: "100%", position: "absolute" }} /> : ""}
                         <div style={{ width: "25%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "3%", whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" }}>{item.maintenanceUnit}</div>
-                        <div style={{ width: "12%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "33%" }}>{item.management}</div>
-                        <div style={{ width: "12%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "52%" }}>{item.worker}</div>
-                        <div style={{ width: "12%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "70%" }}>{item.publicWelfarePost}</div>
+                        <div style={{ width: "12%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "33%" }}>{item.management||'--'}</div>
+                        <div style={{ width: "12%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "52%" }}>{item.worker||'--'}</div>
+                        <div style={{ width: "12%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "70%" }}>{item.publicWelfarePost||'--'}</div>
                         {/* <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "76%" }}>{item.qiao}</div> */}
                         {/* {
                             num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "55%", marginTop: "0", top: "78%" }}>
@@ -83,7 +83,7 @@ return item.maintenanceUnit!==null
     return (
         <>
             <div style={{ width: "90%", height: "3vh", backgroundColor: "rgba(21,77,160,0.2)", position: "relative", left: "5%", top: "5%" }}>
-                <p style={{ width: "35%", fontSize: "12px", color: "#FFFFFF", height: "100%", textAlign: "center", position: "absolute", lineHeight: "3vh", left: "-5%" }}>管养责任单位</p>
+                <p style={{ width: "35%", fontSize: "12px", color: "#FFFFFF", height: "100%", textAlign: "center", position: "absolute", lineHeight: "3vh", left: "-5%" }}>养护单位</p>
                 <p style={{ width: "25%", fontSize: "12px", color: "#FFFFFF", height: "100%", textAlign: "center", position: "absolute", lineHeight: "3vh", left: "30%" }}>管理人员（人）</p>
                 <p style={{ width: "20%", fontSize: "12px", color: "#FFFFFF", height: "100%", textAlign: "center", position: "absolute", lineHeight: "3vh", left: "54%" }}>工人（人）</p>
                 <p style={{ width: "25%", fontSize: "12px", color: "#FFFFFF", height: "100%", textAlign: "center", position: "absolute", lineHeight: "3vh", left: "73%" }}>公益岗位（人）</p>

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 (
         <>
             <Module style={style} title={"各乡镇养护里程及费用"}>
                 <div onClick={() => {
                     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" }} >
                     {/* <img /> */}
-                    <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px",/*  position: "absolute", top: "0px" */ }}>累计</p></div>
+                    <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px",/*  position: "absolute", top: "0px" */ color:`${flag?'rgba(216,240,255,0.8000)':'#07b9fe'}`}}>累计</p></div>
                 <div onClick={() => {
                     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", }}>
                     {/* <img /> */}
-                    <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px",/*  position: "absolute", top: "0px" */ }}   >上月</p></div >
-                {/* <Row align='middle' style={{ padding: '10px 3% 0px 15px' }}>
-                    <Col span={15}>
-                        <img src='/assets/images/quanju/kelvhua_icon.png' alt='icon' style={{ width: '26%' }} />
-                        <span style={{ color: '#C2EEFF', marginLeft: 5 }}>可绿化里程总数</span>
-                    </Col>
-                    <Col span={9} style={{ fontSize: 24, fontFamily: 'YouSheBiaoTiHei', color: '#fff', textShadow: '0px 0px 4px #07B9FE' }}>{totalData.toFixed(3) || 0}</Col>
-                </Row> */}
-                {/* <div ref={chartRef} style={{ height: "23vh", width: "100%" }}></div> */}
-                {/* <PieChart /> */}
+                    <p style={{ color: "rgba(216,240,255,0.8000)", fontSize: "0.4vh", lineHeight: "20px",/*  position: "absolute", top: "0px" */ color:`${flag?'#07b9fe':'rgba(216,240,255,0.8000)'}`}}   >上月</p></div >
                 {
                     flag ? <Lunbo data={data} /> : <ZheXian shuju={shuju} />
                 }

web/client/src/sections/quanju/containers/footer/conserve/left/lunbozujian.js

@@ -50,10 +50,10 @@ const Lefttbottom = (props) => {
                     }}>
                         {beijing == index ? <img src='/assets/images/leadership/bei.png' style={{ width: "100%", height: "100%", position: "absolute" }} /> : ""}
                         <div style={{ width: "20%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "3%", whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" }}>{item.responsibleUnitForManagementAndMaintenance}</div>
-                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "23%" }}>{item.countyHighway}</div>
-                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "40%" }}>{item.townshipRoad}</div>
-                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "58%" }}>{item.villageRoad}</div>
-                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "76%" }}>{item.bridge}</div>
+                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "23%" }}>{item.countyHighway||'/'}</div>
+                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "40%" }}>{item.townshipRoad||'/'}</div>
+                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "58%" }}>{item.villageRoad||'/'}</div>
+                        <div style={{ width: "15%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "76%" }}>{item.bridge||'/'}</div>
                         {/* {
                             num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "55%", marginTop: "0", top: "78%" }}>
                                 <img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />

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} <br/>{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",
                         },