free-sun
/
Highways4Good
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

没有图片信息的时候弹框隐藏图片框

dev
巴林闲侠 1 year ago
parent
f2cb86ff59
commit
78b370de2c
3 changed files with 30 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
  2. 17
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
  3. 2
      web/client/src/sections/quanju/containers/public/olMap.js

24
web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js
View File

@ -88,16 +88,20 @@ const RightTop = (props) => {
<div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, right: "24%", marginTop: "0", top: "25%" }}> <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%" }} /> <img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}> <div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}>
<Hua shuzu={[{ {
"imgs": item.conserveAfterPic ? item.conserveAfterPic && item.conserveAfterPic.length ?
item.conserveAfterPic[0] : "" <Hua shuzu={[{
}, { "imgs": item.conserveAfterPic ?
"imgs": item.conserveBeforePic ? item.conserveAfterPic[0] : ""
item.conserveBeforePic[0] : "" }, {
}, { "imgs": item.conserveBeforePic ?
"imgs": item.conserveUnderwayPic ? item.conserveBeforePic[0] : ""
item.conserveUnderwayPic[0] : "" }, {
}]} /> "imgs": item.conserveUnderwayPic ?
item.conserveUnderwayPic[0] : ""
}]} />
: ''
}
</div> </div>
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}> <div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}> <p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>

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

@ -17,7 +17,11 @@ const Right = (props) => {
useEffect(() => { useEffect(() => {
const daolus = dispatch(getRoadmaintain()).then((res) => { const daolus = dispatch(getRoadmaintain()).then((res) => {
setList(res.payload.data.reportList.filter((item, index) => { 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) => { setNums(res.payload.data.reportCount.reduce((count, item) => {
if (item.projectType == "road" || item.projectType == "countyRoad" || item.projectType == "villageRoad" || item.projectType == "rusticRoad") { 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%" }}> <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%" }} /> <img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ width: "50%", height: "100%", position: "absolute", top: "0", }}> <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>
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}> <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> <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>

2
web/client/src/sections/quanju/containers/public/olMap.js
View File

@ -456,7 +456,7 @@ const OlMap = (props) => {
<div style={{ display: "flex", }}> <div style={{ display: "flex", }}>
<div style={{ width: "50%", height: "100%", }}> <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={ <Hua key={pointItem.id} shuzu={
isRoadProject ? isRoadProject ?
[{ [{

Write Preview
Loading…
Cancel
Save