From 76cbc2b65ee0d585882769995545a02be01d8fa5 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Thu, 3 Aug 2023 02:17:10 +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

---
 .../containers/footer/conserve/right/right-top.js |  7 ++++++-
 .../footer/leadership/centerleft/daolu.js         | 15 +++++++--------
 .../footer/leadership/centerleft/hudong.js        |  1 -
 .../sections/quanju/containers/public/olMap.js    |  8 ++++----
 4 files changed, 17 insertions(+), 14 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 804e442c..a4114c20 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
@@ -89,7 +89,12 @@ const RightTop = (props) => {
                                             <img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
                                             <div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}>
                                                 {
-                                                    item.conserveAfterPic && item.conserveAfterPic.length ?
+                                                    (item.conserveAfterPic && item.conserveAfterPic.length)
+                                                        ||
+                                                        (item.conserveBeforePic && item.conserveBeforePic.length)
+                                                        ||
+                                                        (item.conserveUnderwayPic && item.conserveUnderwayPic.length)
+                                                        ?
                                                         <Hua shuzu={[{
                                                             "imgs": item.conserveAfterPic ?
                                                                 item.conserveAfterPic[0] : ""
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 cf372fb0..d4cf5fdd 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
@@ -71,14 +71,13 @@ const Right = (props) => {
                                             <img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
                                             <div style={{ width: "50%", height: "100%", position: "absolute", top: "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] : "" }
-                                                            ]}
-                                                        /> : ''
+                                                    <Hua
+                                                        shuzu={[
+                                                            { "imgs": item.conserveAfterPic && item.conserveAfterPic.length ? item.conserveAfterPic[0] : "" },
+                                                            { "imgs": item.conserveBeforePic && item.conserveBeforePic.length ? item.conserveBeforePic[0] : "" },
+                                                            { "imgs": item.conserveUnderwayPic && item.conserveUnderwayPic.length ? item.conserveUnderwayPic[0] : "" }
+                                                        ]}
+                                                    />
                                                 }
                                             </div>
                                             <div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js
index a78f90fc..ab842b11 100644
--- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js
+++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js
@@ -83,7 +83,6 @@ class ReactCarousel extends Component {
                                             }} />
                                         </div>
                                     </li>
-
                                 )
                             })
                         }
diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js
index b8ba1c62..6f5cc9af 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 && ((isRoadProject && pointItem.scene_pic && pointItem.scene_pic.length) || (!isRoadProject && pointItem.conserve_after_pic && pointItem.conserve_after_pic.length)) ?
+                                pointItem.id ?
                                     <Hua key={pointItem.id} shuzu={
                                         isRoadProject ?
                                             [{
@@ -464,13 +464,13 @@ const OlMap = (props) => {
                                                     pointItem.scene_pic[0] : ""
                                             }] :
                                             [{
-                                                "imgs": pointItem.conserve_after_pic ?
+                                                "imgs": pointItem.conserve_after_pic && pointItem.conserve_after_pic.length ?
                                                     pointItem.conserve_after_pic[0] : ""
                                             }, {
-                                                "imgs": pointItem.conserve_before_pic ?
+                                                "imgs": pointItem.conserve_before_pic && pointItem.conserve_before_pic.length ?
                                                     pointItem.conserve_before_pic[0] : ""
                                             }, {
-                                                "imgs": pointItem.conserve_underway_pic ?
+                                                "imgs": pointItem.conserve_underway_pic && pointItem.conserve_underway_pic.length ?
                                                     pointItem.conserve_underway_pic[0] : ""
                                             }]}
                                     />