From 78b370de2cad5f3b28353fe79d2b470140001fe5 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Thu, 3 Aug 2023 01:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=9B=BE=E7=89=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=97=B6=E5=80=99=E5=BC=B9=E6=A1=86=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=9B=BE=E7=89=87=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../footer/conserve/right/right-top.js        | 24 +++++++++++--------
 .../footer/leadership/centerleft/daolu.js     | 17 +++++++++++--
 .../quanju/containers/public/olMap.js         |  2 +-
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
index 540362c5..804e442c 100644
--- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
+++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
@@ -88,16 +88,20 @@ const RightTop = (props) => {
                                         <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, right: "24%", marginTop: "0", top: "25%" }}>
                                             <img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
                                             <div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}>
-                                                <Hua shuzu={[{
-                                                    "imgs": item.conserveAfterPic ?
-                                                        item.conserveAfterPic[0] : ""
-                                                }, {
-                                                    "imgs": item.conserveBeforePic ?
-                                                        item.conserveBeforePic[0] : ""
-                                                }, {
-                                                    "imgs": item.conserveUnderwayPic ?
-                                                        item.conserveUnderwayPic[0] : ""
-                                                }]} />
+                                                {
+                                                    item.conserveAfterPic && item.conserveAfterPic.length ?
+                                                        <Hua shuzu={[{
+                                                            "imgs": item.conserveAfterPic ?
+                                                                item.conserveAfterPic[0] : ""
+                                                        }, {
+                                                            "imgs": item.conserveBeforePic ?
+                                                                item.conserveBeforePic[0] : ""
+                                                        }, {
+                                                            "imgs": item.conserveUnderwayPic ?
+                                                                item.conserveUnderwayPic[0] : ""
+                                                        }]} />
+                                                        : ''
+                                                }
                                             </div>
                                             <div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
                                                 <p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
index ed949479..cf372fb0 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
@@ -17,7 +17,11 @@ const Right = (props) => {
     useEffect(() => {
         const daolus = dispatch(getRoadmaintain()).then((res) => {
             setList(res.payload.data.reportList.filter((item, index) => {
-                return item.projectType == "road" || item.projectType == "countyRoad" || item.projectType == "villageRoad" || item.projectType == "rusticRoad"
+                return item.projectType == "road"
+                    || item.projectType == "countyRoad"
+                    || item.projectType == "villageRoad"
+                    || item.projectType == "rusticRoad"
+                    || !item.projectType
             }))
             setNums(res.payload.data.reportCount.reduce((count, item) => {
                 if (item.projectType == "road" || item.projectType == "countyRoad" || item.projectType == "villageRoad" || item.projectType == "rusticRoad") {
@@ -66,7 +70,16 @@ const Right = (props) => {
                                         <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "50%", marginTop: "0", top: "35%" }}>
                                             <img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
                                             <div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}>
-                                                <Hua shuzu={[{ "imgs": item.conserveAfterPic ? item.conserveAfterPic[0] : "" }, { "imgs": item.conserveBeforePic ? item.conserveBeforePic[0] : "" }, { "imgs": item.conserveUnderwayPic ? item.conserveUnderwayPic[0] : "" }]} />
+                                                {
+                                                    item.conserveAfterPic && item.conserveAfterPic.length ?
+                                                        <Hua
+                                                            shuzu={[
+                                                                { "imgs": item.conserveAfterPic ? item.conserveAfterPic[0] : "" },
+                                                                { "imgs": item.conserveBeforePic ? item.conserveBeforePic[0] : "" },
+                                                                { "imgs": item.conserveUnderwayPic ? item.conserveUnderwayPic[0] : "" }
+                                                            ]}
+                                                        /> : ''
+                                                }
                                             </div>
                                             <div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
                                                 <p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js
index 5a221ea3..b8ba1c62 100644
--- a/web/client/src/sections/quanju/containers/public/olMap.js
+++ b/web/client/src/sections/quanju/containers/public/olMap.js
@@ -456,7 +456,7 @@ const OlMap = (props) => {
                     <div style={{ display: "flex", }}>
                         <div style={{ width: "50%", height: "100%", }}>
                             {
-                                pointItem.id ?
+                                pointItem.id && ((isRoadProject && pointItem.scene_pic && pointItem.scene_pic.length) || (!isRoadProject && pointItem.conserve_after_pic && pointItem.conserve_after_pic.length)) ?
                                     <Hua key={pointItem.id} shuzu={
                                         isRoadProject ?
                                             [{