Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/Highways4Good into dev

web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js

@@ -14,7 +14,10 @@ const Right = (props) => {
             setList(res.payload.data.reportList.filter((item, index) => {
                 return item.projectType == "road"
             }))
-            setNums(res.payload.data.processed)
+            setNums(res.payload.data.reportCount.filter((item, index) => {
+                return item.projectType == "road"
+            }))
+            console.log(res.payload.data);
         })
     }, [])
     useEffect(() => {
@@ -24,6 +27,7 @@ const Right = (props) => {
             // const
         })
     }, [])
+    console.log("1211", nums);
     const renderBody = () => {
         return (
 
@@ -59,13 +63,13 @@ const Right = (props) => {
                         <p style={{ width: "50%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", textAlign: "right", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["县"].toFixed(3)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>公里</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>县道道路</span></p>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
-                        <div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "40%", background: "url(/assets/images/leadership/zuo.png)", backgroundSize: "100% 100%", position: "absolute", top: "50%" }}>
-
-                            {/* </div>
-                        <div style={{ width: "15%", height: "20%", background: "url(/assets/images/leadership/center.png)", backgroundSize: "100% 100%", position: "absolute", top: "67%", left: "34%" }}> */}
+                        <div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#fff", float: "left", marginTop: "5.6%" }}>
 
                         </div>
-                        <div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", background: "url(/assets/images/leadership/you.png)", backgroundSize: "100% 100%", position: "absolute", right: "-1%", top: "70%" }}></div>
+                        {/* <div style={{ width: "15%", height: "20%", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
+
+</div> */}
+                        <div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}></div>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
                         <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村道道路<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{(roads?.["乡"] + roads?.["村"]).toFixed(3)}</span><span style={{ marginLeft: "4%" }}>公里</span></p>
@@ -77,7 +81,7 @@ const Right = (props) => {
                         {/* <p>{title || []}</p> */}
                         <img src='/assets/images/quanju/icon.png' style={{ width: "24px", position: "absolute", left: "-1%", top: "23%" }} />
                         <span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>养护事件</span>
-                        <p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>道路</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>{nums || []}</span><span style={{ marginLeft: "10%" }}>次</span></p>
+                        <p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>道路</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>{nums ? nums[0]?.count : []}</span><span style={{ marginLeft: "10%" }}>次</span></p>
                         {/* <img src='/assets/images/leadership/zibiaoti.png' style={{ width: "95%", height: "34px", position: "absolute", top: "12px", left: "6%" }} /> */}
                     </div>
                     <Lun

web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js

@@ -9,11 +9,15 @@ const Right = (props) => {
     const [beijing, setBeijing] = useState()
     const [list, setList] = useState([])
     const [roads, setRoads] = useState()
+    const [nums, setNums] = useState()
     useEffect(() => {
         const daolus = dispatch(getRoadmaintain()).then((res) => {
             setList(res.payload.data.reportList.filter((item, index) => {
                 return item.projectType == "culvert"
             }))
+            setNums(res.payload.data.reportCount.filter((item, index) => {
+                return item.projectType == "culvert"
+            }))
         })
     }, [])
     useEffect(() => {
@@ -59,16 +63,16 @@ const Right = (props) => {
                         <p style={{ width: "50%", position: "absolute", right: "0%", textAlign: "right", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["县"].toFixed(0)}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>个</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>县涵洞</span></p>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
-                        <div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "40%", backgroundColor: "#fff", float: "left", marginTop: "4%" }}>
+                        <div style={{ width: (roads?.["县"] / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#fff", float: "left", marginTop: "5.6%" }}>
 
                         </div>
                         {/* <div style={{ width: "15%", height: "20%", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
 
                         </div> */}
-                        <div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}></div>
+                        <div style={{ width: ((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}></div>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
-                        <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村涵洞<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{(roads?.["乡"] + roads?.["村"]).toFixed(3)}</span><span style={{ marginLeft: "4%" }}>个</span></p>
+                        <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>乡村涵洞<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{(roads?.["乡"] + roads?.["村"]).toFixed(0)}</span><span style={{ marginLeft: "4%" }}>个</span></p>
                         <p style={{ position: "absolute", right: "0", color: "rgba(216,240,255,0.8)" }}>占比<span>{((roads?.["乡"] + roads?.["村"]) / (roads?.["乡"] + roads?.["村"] + roads?.["县"])).toFixed(4) * 100}</span><span>%</span></p>
                     </div>
                 </div>
@@ -77,7 +81,7 @@ const Right = (props) => {
                         {/* <p>{title || []}</p> */}
                         <img src='/assets/images/quanju/icon.png' style={{ width: "24px", position: "absolute", left: "-1%", top: "23%" }} />
                         <span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>养护事件</span>
-                        <p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>道路</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>187</span><span style={{ marginLeft: "10%" }}>次</span></p>
+                        <p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>涵洞</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>{nums ? nums[0]?.count : []}</span><span style={{ marginLeft: "10%" }}>次</span></p>
                         {/* <img src='/assets/images/leadership/zibiaoti.png' style={{ width: "95%", height: "34px", position: "absolute", top: "12px", left: "6%" }} /> */}
                     </div>
                     <Lun

web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/bottomlunbo.js

@@ -31,9 +31,9 @@ const Bottomlunbo = (props) => {
                     业户信息:
                 </div>
                 <div style={{ width: "40%", height: "60%", float: "left" }}>
-                    <div style={{ width: "100%", height: "100%", position: "relative" }}>
-                        <img src='/assets/images/leadership/di.png' style={{ width: "60%", marginLeft: "20%", marginTop: "15%" }} />
-                        <p style={{ fontSize: "16px", color: "#FFFFFF", fontFamily: "PingFangSC-Medium, PingFang SC", position: "absolute", top: "90%", left: "33%" }}>出租车</p>
+                    <div style={{ width: "100%", height: "90%", position: "relative", top: "60%" }}>
+                        <img src='/assets/images/leadership/di.png' style={{ width: "60%", height: "100%", marginLeft: "20%" }} />
+                        <p style={{ fontSize: "16px", color: "#FFFFFF", fontFamily: "PingFangSC-Medium, PingFang SC", position: "absolute", top: "10%", left: "33%" }}>出租车</p>
                     </div>
                 </div>
                 <Lunbotop

web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/style.less

@@ -4,3 +4,8 @@
 }
 
 .hidden-scroll-bar-y::-webkit-scrollbar { width: 0 !important }
+.huoyun{
+     overflow: hiddden;
+      text-overflow: ellipsis;
+       white-space: nowrap
+}

web/client/src/sections/quanju/containers/footer/leadership/centerleft/lunbo/toplunbo.js

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import Lunbotop from "../../right/lunbo"
 import { getyunzheng } from "../../../../../actions/example"
+import "./style.less"
 
 
 const Toplunbo = (props) => {
@@ -30,9 +31,9 @@ const Toplunbo = (props) => {
                 height: "50%",
             }}>
                 <div style={{ width: "40%", height: "60%", float: "left" }}>
-                    <div style={{ width: "100%", height: "100%", position: "relative", top: "-30%" }}>
-                        <img src='/assets/images/leadership/di.png' style={{ width: "60%", marginLeft: "20%" }} />
-                        <p style={{ fontSize: "16px", color: "#FFFFFF", fontFamily: "PingFangSC-Medium, PingFang SC", position: "absolute", top: "20%", left: "33%" }}>危险货运</p>
+                    <div style={{ width: "100%", height: "110%", position: "relative", top: "-30%" }}>
+                        <img src='/assets/images/leadership/di.png' style={{ width: "60%", height: "100%", marginLeft: "20%" }} />
+                        <p className='huoyun' style={{ fontSize: "16px", color: "#FFFFFF", fontFamily: "PingFangSC-Medium, PingFang SC", position: "absolute", top: "10%", left: "33%" }}>危险货运</p>
                     </div>
                 </div>
                 <Lunbotop

web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js

@@ -8,11 +8,15 @@ const Right = (props) => {
     const [beijing, setBeijing] = useState()
     const [list, setList] = useState([])
     const [roads, setRoads] = useState()
+    const [nums, setNums] = useState()
     useEffect(() => {
         const daolus = dispatch(getRoadmaintain()).then((res) => {
             setList(res.payload.data.reportList.filter((item, index) => {
                 return item.projectType == "bridge"
             }))
+            setNums(res.payload.data.reportCount.filter((item, index) => {
+                return item.projectType == "bridge"
+            }))
         })
     }, [])
     useEffect(() => {
@@ -55,16 +59,16 @@ const Right = (props) => {
                 <div style={{ width: "100%", height: "43%", position: "relative", left: "1%" }}>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
                         <p style={{ position: "absolute", color: "rgba(216,240,255,0.8)" }}>占比<span style={{ fontFamily: " PingFangSC-Regular, PingFang SC" }}>{(roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(4) * 100}</span>%</p>
-                        <p style={{ width: "25%", position: "absolute", right: "1%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%" }}>{roads?.["大桥"]}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>座</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>大桥</span></p>
+                        <p style={{ width: "25%", position: "absolute", right: "0%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF", marginLeft: "10%", textAlign: "right" }}>{roads?.["大桥"]}<span style={{ color: "#F5FCFF", fontSize: "16px", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>座</span><span style={{ fontSize: "18px", color: "rgba(216,240,255,0.8)", fontFamily: "PingFangSC-Regular, PingFang SC", marginLeft: "5%" }}>大桥</span></p>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%", height: "50%" }}>
-                        <div style={{ width: (roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "40%", backgroundColor: "#fff", float: "left", marginTop: "4%" }}>
+                        <div style={{ width: (roads?.["大桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#fff", float: "left", marginTop: "5.6%" }}>
 
                         </div>
-                        <div style={{ width: (roads?.["中桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
+                        <div style={{ width: (roads?.["中桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#df0001", float: "left", marginTop: "5.6%" }}>
 
                         </div>
-                        <div style={{ width: (roads?.["小桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%" }}></div>
+                        <div style={{ width: (roads?.["小桥"] / (roads?.["小桥"] + roads?.["中桥"] + roads?.["大桥"])).toFixed(2) * 100 + "%" || "", height: "20%", transform: "skewX(-45deg)", backgroundColor: "#18ABFF", float: "left", marginTop: "5.6%", borderRadius: "0 2% 2% 0" }}></div>
                     </div>
                     <div style={{ width: "96%", position: "relative", left: "2%" }}>
                         <p style={{ width: "50%", position: "absolute", color: "rgba(216,240,255,0.8)", fontSize: "18px" }}>中小桥梁<span style={{ marginLeft: "4%", fontFamily: "YouSheBiaoTiHei", fontSize: "24px", color: "#F5FCFF" }}>{roads?.["小桥"] + roads?.["中桥"]}</span><span style={{ marginLeft: "4%" }}>座</span></p>
@@ -76,7 +80,7 @@ const Right = (props) => {
                         {/* <p>{title || []}</p> */}
                         <img src='/assets/images/quanju/icon.png' style={{ width: "24px", position: "absolute", left: "-1%", top: "23%" }} />
                         <span style={{ position: "absolute", color: "#FFFFFF", fontSize: "24px", fontFamily: "YouSheBiaoTiHei", left: "3%" }}>养护事件</span>
-                        <p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>道路</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>187</span><span style={{ marginLeft: "10%" }}>次</span></p>
+                        <p style={{ position: "absolute", color: "#D8F0FF", fontSize: "14px", right: "6%" }}><span style={{ marginLeft: "-20%" }}>桥梁</span><span style={{ fontSize: "18px", fontFamily: "YouSheBiaoTiHei", color: "#ffffff", marginLeft: "10%" }}>{nums ? nums[0]?.count : []}</span><span style={{ marginLeft: "10%" }}>次</span></p>
                         {/* <img src='/assets/images/leadership/zibiaoti.png' style={{ width: "95%", height: "34px", position: "absolute", top: "12px", left: "6%" }} /> */}
                     </div>
                     <Lun

web/client/src/sections/quanju/containers/footer/leadership/left/echarts/lefttopecharts.js

@@ -98,7 +98,7 @@ const Lefttopecharts = () => {
                         offsetCenter: [0, 46], // x, y，单位px
                         textStyle: {
                             color: "#fff",
-                            fontSize: 14, //表盘上的标题文字大小
+                            fontSize: "2vh", //表盘上的标题文字大小
                             fontWeight: 400,
                             fontFamily: "PingFangSC",
                         },

web/client/src/sections/quanju/containers/footer/leadership/left/left-top.js

@@ -9,9 +9,11 @@ const Lefttop = () => {
     const style = { height: "68%" }
     useEffect(() => {
         // return () => {
-        request('GET', '/search').then((success, failure) => {
-            console.log(success);
-        });
+        request('get', 'https://report.amap.com/ajax/districtRank.do?linksType=1&cityCode=360100')
+            // .set({ 'cookie': 'user_unique_id=a185bbc78215de5101823ec9f8455ff7; SESSION=781150e0-bd25-4431-b3ac-267bb49075fd; UM_distinctid=1823ec9ec89ce5-08fca33c64505f-76492e29-1fa400-1823ec9ec8a1447; CNZZDATA1256662931=1445129462-1658907884-https%253A%252F%252Freport.amap.com%252F%7C1658907884' })
+            .then((success, failure) => {
+                console.log(success, failure);
+            });
         // };
     }, [])
     return (

web/client/src/sections/quanju/containers/footer/leadership/right/hudong.js

@@ -61,20 +61,41 @@ class ReactCarousel extends Component {
 
                             this.state.imgs.map((value, index) => {
                                 return (
-                                    <li style={{ position: "relative", left: "8%", width: "100%", height: "100%" }} className={index === this.state.showIndex ? 'show' : ''}
+                                    <li style={{ position: "relative", left: "8%", width: "100%", height: "100%", top: "-5%", fontSize: "12px" }} className={index === this.state.showIndex ? 'show' : ''}
                                         key={index}
                                     >
-                                        <div style={{ width: "40%", height: "40%", backgroundColor: "red", position: "absolute", left: "-3%", top: "3%" }}>
-                                            {value[0]?.name}
+                                        <div style={{ width: "45%", height: "40%", backgroundColor: "red", position: "absolute", left: "-3%", top: "5%" }}>
+                                            <div style={{ width: "100%", height: "100%", position: "absolute", top: "80%" }}>
+                                                <div style={{ width: "100%", height: "20%", backgroundColor: "rgba(0,0,0,0.6)", overflow: "hiddden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
+                                                    <img src='/assets/images/leadership/weizhis.png' style={{ width: "6%", height: "80%", marginLeft: "3%", marginRight: "3%" }} />
+                                                    {value[0]?.name}
+                                                </div>
+                                            </div>
+
                                         </div>
-                                        {value[1]?.name ? <div style={{ width: "40%", height: "40%", backgroundColor: "#fff", position: "absolute", left: "45%", top: "3%" }}>
-                                            {value[1]?.name}
+                                        {value[1]?.name ? <div style={{ width: "45%", height: "40%", backgroundColor: "#fff", position: "absolute", left: "45%", top: "5%" }}>
+                                            <div style={{ width: "100%", height: "100%", position: "absolute", top: "80%" }}>
+                                                <div style={{ width: "100%", height: "20%", backgroundColor: "rgba(0,0,0,0.6)", overflow: "hiddden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
+                                                    <img src='/assets/images/leadership/weizhis.png' style={{ width: "6%", height: "80%", marginLeft: "3%", marginRight: "3%" }} />
+                                                    {value[1]?.name}
+                                                </div>
+                                            </div>
                                         </div> : ""}
-                                        {value[2]?.name ? <div style={{ width: "40%", height: "40%", backgroundColor: "bule", position: "absolute", left: "-3%", top: "50%" }}>
-                                            {value[2]?.name}
+                                        {value[2]?.name ? <div style={{ width: "45%", height: "40%", backgroundColor: "bule", position: "absolute", left: "-3%", top: "49%" }}>
+                                            <div style={{ width: "100%", height: "100%", position: "absolute", top: "80%" }}>
+                                                <div style={{ width: "100%", height: "20%", backgroundColor: "rgba(0,0,0,0.6)", overflow: "hiddden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
+                                                    <img src='/assets/images/leadership/weizhis.png' style={{ width: "6%", height: "80%", marginLeft: "3%", marginRight: "3%" }} />
+                                                    {value[2]?.name}
+                                                </div>
+                                            </div>
                                         </div> : ""}
-                                        {value[3]?.name ? <div style={{ width: "40%", height: "40%", backgroundColor: "pink", position: "absolute", left: "45%", top: "50%" }}>
-                                            {value[3]?.name}
+                                        {value[3]?.name ? <div style={{ width: "45%", height: "40%", backgroundColor: "pink", position: "absolute", left: "45%", top: "49%" }}>
+                                            <div style={{ width: "100%", height: "100%", position: "absolute", top: "80%" }}>
+                                                <div style={{ width: "100%", height: "20%", backgroundColor: "rgba(0,0,0,0.6)", overflow: "hiddden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
+                                                    <img src='/assets/images/leadership/weizhis.png' style={{ width: "6%", height: "80%", marginLeft: "3%", marginRight: "3%" }} />
+                                                    {value[3]?.name}
+                                                </div>
+                                            </div>
                                         </div> : ""}
                                         {/* <div>{value[1].name}</div>
                                         <div>{value[2].name}</div>
@@ -97,8 +118,12 @@ class ReactCarousel extends Component {
 
                     </ul> */}
                     <div className="control" style={{ width: "100%", height: "10%" }}>
-                        <span className="left" onClick={(e) => { this.previous(e) }}>左</span>
-                        <span className="right" onClick={(e) => { this.next(e) }}>右</span>
+                        <span style={{ position: "absolute", top: "86%", width: "3%", height: "8%" }} className="left" onClick={(e) => { this.previous(e) }}>
+                            <img src='/assets/images/leadership/zuofanye.png' style={{ width: "100%", height: "100%" }} />
+                        </span>
+                        <span style={{ position: "absolute", top: "86%", width: "3%", height: "8%", right: "6%" }} className="right" onClick={(e) => { this.next(e) }}>
+                            <img src='/assets/images/leadership/youofanye.png' style={{ width: "100%", height: "100%" }} />
+                        </span>
                     </div>
                 </div>
             </div>
@@ -119,7 +144,7 @@ class ReactCarousel extends Component {
         let { timer } = this.state;
         timer = setInterval(() => {
             this.next();
-        }, 300000);
+        }, 2000);
         this.setState({
             timer
         })

web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js

@@ -27,10 +27,10 @@ const Rightbottom = (props) => {
                         // console.log(beijing);
                     }}>
                         {beijing == index ? <img src='/assets/images/leadership/bei.png' style={{ width: "100%", height: "100%", position: "absolute" }} /> : ""}
-                        <div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute" }}>{item.licensePlate}</div>
-                        <div style={{ width: "10%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "30%" }}>{item.overrunRate ? item.overrunRate : "--"}</div>
-                        <div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "40%" }}>{item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}</div>
-                        <div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == item.name ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "70%" }}>{item.processingTime ? item.processingTime : "--"}</div>
+                        <div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute" }}>{item.licensePlate}</div>
+                        <div style={{ width: "10%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "30%" }}>{item.overrunRate ? item.overrunRate : "--"}</div>
+                        <div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "40%" }}>{item.deductPoints ? "-" + item.deductPoints + "分" : ""}{item.deductPoints && item.fine ? "和" : ""}{item.fine ? "-" + item.fine + "元" : ""}{item.deductPoints || item.fine ? "" : "--"}</div>
+                        <div style={{ width: "30%", height: "100%", textAlign: "center", lineHeight: "3vh", fontSize: "14px", color: beijing == index ? "#FFFFFF" : "rgba(216,240,255,0.8000)", position: "absolute", left: "70%" }}>{item.processingTime ? item.processingTime : "--"}</div>
                     </li>
                 })
 

web/client/src/sections/quanju/containers/footer/leadership/right/right-top.js

@@ -73,9 +73,12 @@ const Righttop = () => {
     return (
         <>
             <Module style={style} title={"路面执法监控"}>
-                <div style={{ width: "100%", height: "65%" }}>
+                <div style={{ width: "100%", height: "65%", position: "relative" }}>
+                    <p style={{ position: "absolute", left: "30%", top: "2%", fontSize: "14px", color: "#FFFFFF" }}>监控总数</p><p style={{ position: "absolute", left: "42%", fontSize: "24px", marginLeft: "1%", top: "-0.5%", color: "#FFFFFF", fontFamily: "YouSheBiaoTiHei" }}>129</p>
+                    <p style={{ position: "absolute", left: "60%", top: "2%", fontSize: "14px", color: "#FFFFFF" }}>在线率</p><p style={{ position: "absolute", left: "68%", fontSize: "24px", marginLeft: "2%", top: "-0.5%", color: "#FFFFFF", fontFamily: "YouSheBiaoTiHei" }}>88.87%</p>
                     <div style={{ width: "100%", height: "10%", position: "relative" }}>
                         <img src='/assets/images/leadership/head.png' style={{ width: "15%", marginLeft: "5%" }} />
+
                         <div className='wy-rightTop' style={{ position: "absolute", right: "5%", top: "130%" }}>
                             <Select
                                 size={size}