Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

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 <div key={index} className='guanli-right-item'>
                   <Tooltip title={<div className='popover-content'>
-                     <div style={{ width: '100%', height: "100%", marginTop: "0", display: "flex" }}>
+                     <div style={{ width: '100%', height: "100%", marginTop: "0",paddingBottom: 20, display: "flex" }}>
 
                         {picfile?.length > 0 ? <Carousel autoplay style={{ width: 200, height: 200, margin: "20px 0px 0px 20px" }}>
                            {picfile?.map(v => <img className='picfileimg'
@@ -104,14 +103,14 @@ const Guanli = (props) => {
                                  {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"}
                               </span></p>
                            <p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", display: "flex" }}>
-                              执法道路:<span style={{
+                              执法道路:<span title={roadname} style={{
                                  color: "#EEF4FF", marginLeft: "10px", fontFamily: " PingFangSC-Medium, PingFang SC",
                                  overflow: 'hidden', whiteSpace: "nowrap", textOverflow: "ellipsis", display: 'inline-block', width: 160
                               }}>
                                  {roadname}
                               </span></p>
                            <p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", display: "flex" }}>
-                              执法成果:<span style={{
+                              执法成果:<span title={enforcementreslt} style={{
                                  color: "#EEF4FF", marginLeft: "10px", fontFamily: " PingFangSC-Medium, PingFang SC",
                                  overflow: 'hidden', whiteSpace: "nowrap", textOverflow: "ellipsis", display: 'inline-block', width: 160
                               }}>
@@ -170,7 +169,7 @@ const Guanli = (props) => {
                   <span>处罚</span>
                   <span>处理日期</span>
                </div> */}
-               <div style={{ width: "100%", display: "flex", color: "#FFF" }}>
+               <div style={{ width: "90%",margin:"auto", display: "flex", color: "#FFF" }}>
                   <div style={{ width: '50%', textAlign: "center" }}>执法日期</div>
                   <div style={{ width: '50%', textAlign: "center", }}>执法成果</div>
                </div>

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

@@ -64,7 +64,7 @@ const Rightbottom = (props) => {
             if (index < 120) {
                return <div key={index} className='guanli-right-item'>
                   <Tooltip title={<div className='popover-content'>
-                     <div style={{ width: '100%', height: "100%", marginTop: "0", display: "flex" }}>
+                     <div style={{ width: '100%', height: "100%", marginTop: "0", paddingBottom: 20, display: "flex" }}>
 
                         {picfile?.length > 0 ? <Carousel autoplay style={{ width: 200, height: 200, margin: "20px 0px 0px 20px" }}>
                            {picfile?.map(v => <img className='picfileimg'
@@ -89,14 +89,14 @@ const Rightbottom = (props) => {
                                  {enforcementdate && moment(enforcementdate).format("YYYY-MM-DD") || "--"}
                               </span></p>
                            <p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", display: "flex" }}>
-                              执法道路:<span style={{
+                              执法道路:<span title={roadname} style={{
                                  color: "#EEF4FF", marginLeft: "10px", fontFamily: " PingFangSC-Medium, PingFang SC",
                                  overflow: 'hidden', whiteSpace: "nowrap", textOverflow: "ellipsis", display: 'inline-block', width: 160
                               }}>
                                  {roadname}
                               </span></p>
                            <p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC", display: "flex" }}>
-                              执法成果:<span style={{
+                              执法成果:<span title={enforcementreslt} style={{
                                  color: "#EEF4FF", marginLeft: "10px", fontFamily: " PingFangSC-Medium, PingFang SC",
                                  overflow: 'hidden', whiteSpace: "nowrap", textOverflow: "ellipsis", display: 'inline-block', width: 160
                               }}>
@@ -124,7 +124,7 @@ const Rightbottom = (props) => {
       <>
          <Module style={style} title={"道路隐患排查治理"}>
 
-            <div style={{ width: "100%", display: "flex", color: "#FFF" }}>
+            <div style={{ width: "90%", margin: "auto", display: "flex", color: "#FFF" }}>
                <div style={{ width: '50%', textAlign: "center" }}>执法日期</div>
                <div style={{ width: '50%', textAlign: "center", }}>执法成果</div>
             </div>