diff --git a/public/assets/jrx.png b/public/assets/jrx.png index bc0253f..38eab7a 100644 Binary files a/public/assets/jrx.png and b/public/assets/jrx.png differ diff --git a/src/models/map/index.js b/src/models/map/index.js index fd6b6bb..b82d058 100644 --- a/src/models/map/index.js +++ b/src/models/map/index.js @@ -263,7 +263,7 @@ const map = { RealSkLayer: false, RainDrpLayer: true, ShuikuLayer: false, - BxSkLayer: true, + BxSkLayer: false, FzdxLayer: false, WataLayer: false, AdcdLayer: true, diff --git a/src/models/shyjview/index.js b/src/models/shyjview/index.js index 74533d1..e21ef8f 100644 --- a/src/models/shyjview/index.js +++ b/src/models/shyjview/index.js @@ -34,7 +34,7 @@ const shyjview = { } - // dispatch.runtime.setHome(); + dispatch.runtime.setHome(); }, async showWeatherRadar(_, state) { dispatch.map.setCalculating(true); @@ -49,7 +49,7 @@ const shyjview = { } - // dispatch.runtime.setHome(); + dispatch.runtime.setHome(); }, async showYj24hContour(latest) { diff --git a/src/views/Home/panels/BxSkOverall/OverallContent.js b/src/views/Home/panels/BxSkOverall/OverallContent.js index 4983534..bfcf57f 100644 --- a/src/views/Home/panels/BxSkOverall/OverallContent.js +++ b/src/views/Home/panels/BxSkOverall/OverallContent.js @@ -65,8 +65,8 @@ export default function OverallContent({ data, skAll }) {
{start}9时{end}9时 24小时中共有1 - 个站点雨量为大暴雨,雨量值 - 261mm; + 个站点雨量为暴雨,雨量值 + 50.2mm; 共产生3个山洪预警(2个内部预警,1个外部预警),均已处置;1个水库超汛限,已短信通知责任人;1个超警戒河道预警。
diff --git a/src/views/Home/panels/Byjc/index.js b/src/views/Home/panels/Byjc/index.js index aae5cba..bbae704 100644 --- a/src/views/Home/panels/Byjc/index.js +++ b/src/views/Home/panels/Byjc/index.js @@ -915,39 +915,47 @@ function DrpReal({ style }) { "aRz": -17.4 } ] - + const removePoint = () => { + const map = window.__mapref; + const layer = map.getLayer('关联站点') + dispatch?.runtime.setFeaturePop({}) + if (layer) { + map.removeLayer('关联站点'); + map.removeSource('关联站点'); + } + } const [showbx, setShowdbx] = useState(0) const [showsy, setShowdsy] = useState(0) const [showsl, setShowdsl] = useState(0) const [showby, setShowdby] = useState(0) - useEffect(() => { - const map = window.__mapref; - if (map) { - if (tab === '1' && data1 && showbx) { - setLayer(data1, '变形') - } - if (tab === '2' && data2 && showsy) { + // useEffect(() => { + // const map = window.__mapref; + // if (map) { + // if (tab === '1' && data1 && showbx) { + // setLayer(data1, '变形') + // } + // if (tab === '2' && data2 && showsy) { - setLayer(data2, '渗压') - } - if (tab === '3' && data3 && showsl) { - setLayer(data3, '渗流') - } - if (tab === '4' && data4 && showby) { - setLayer(data4, '白蚁') - } - } - else { - const dsq = setInterval(() => { - const map = window.__mapref; - if (map && skdata.length > 0) { - clearInterval(dsq) - setLayer(skdata, 'sk') - } - }, 500); - } + // setLayer(data2, '渗压') + // } + // if (tab === '3' && data3 && showsl) { + // setLayer(data3, '渗流') + // } + // if (tab === '4' && data4 && showby) { + // setLayer(data4, '白蚁') + // } + // } + // else { + // const dsq = setInterval(() => { + // const map = window.__mapref; + // if (map && skdata.length > 0) { + // clearInterval(dsq) + // setLayer(skdata, 'sk') + // } + // }, 500); + // } - }, [data1, data2, data3, data4, tab, showbx, showsy, showsl, showby]) + // }, [data1, data2, data3, data4, tab, showbx, showsy, showsl, showby]) const setLayer = (data = [], type) => { const map = window.__mapref; @@ -1229,8 +1237,10 @@ function DrpReal({ style }) { key={row.stcd} onClick={() => { const { lgtd, lttd, res_nm: stnm } = row; + removePoint() if (stnm == '浮桥河水库') { - setShowdbx(1) + setShowdbx(showbx == 1 ? 0 : 1) + setLayer([row],'变形') if (lgtd && lttd) { dispatch.runtime.setCameraTarget({ center: [lgtd, lttd], @@ -1274,8 +1284,10 @@ function DrpReal({ style }) { key={row.stcd} onClick={() => { const { lgtd, lttd, res_nm: stnm } = row; + removePoint() if (stnm == '浮桥河水库') { - setShowdsy(1) + setShowdsy(showsy == 1 ? 0 : 1) + setLayer([row],'渗压') if (lgtd && lttd) { dispatch.runtime.setCameraTarget({ center: [lgtd, lttd], @@ -1315,7 +1327,9 @@ function DrpReal({ style }) { key={row.stcd} onClick={() => { const { lgtd, lttd } = row; - setShowdsl(1) + removePoint() + setShowdsl(showsl == 1 ? 0 : 1) + setLayer([row],'渗流') if (row.cd == 1) { if (lgtd && lttd) { dispatch.runtime.setCameraTarget({ @@ -1356,8 +1370,12 @@ function DrpReal({ style }) { { + removePoint() + const { lgtd, lttd } = row; - setShowdby(1) + setShowdby(showby == 1 ? 0 : 1) + setLayer([row],'白蚁') + if (row.cd == '0AB3ED') { if (lgtd && lttd) { dispatch.runtime.setCameraTarget({ diff --git a/src/views/Home/panels/Glzd/index.js b/src/views/Home/panels/Glzd/index.js index ac97594..805469d 100644 --- a/src/views/Home/panels/Glzd/index.js +++ b/src/views/Home/panels/Glzd/index.js @@ -892,35 +892,36 @@ function DrpReal({ style }) { const [showDrp, setShowdDrp] = useState(0) const [showHd, setShowdHd] = useState(0) - useEffect(() => { - const map = window.__mapref; - if (map) { - if (tab === '1' && drpData && showDrp) { - setLayer(drpData, 'drp') - } - if (tab === '2' && hdData && showHd) { - setLayer(hdData, 'hd') - } - if (tab === '3' && data3) { - setLayer(data3, 'll') - } - if (tab === '4' && data4) { - setLayer(data4, 'tx') - } - if (tab === '5' && data5) { - setLayer(data5, 'sk') - } - } else { - const dsq = setInterval(() => { - const map = window.__mapref; - if (map && drpData.length > 0) { - clearInterval(dsq) - setLayer(drpData, 'drp') - } - }, 500); - } + // useEffect(() => { + // const map = window.__mapref; + // if (map) { + // debugger + // if (tab === '1' && drpData) { + // setLayer(drpData, 'drp') + // } + // if (tab === '2' && hdData ) { + // setLayer(hdData, 'hd') + // } + // if (tab === '3' && data3) { + // setLayer(data3, 'll') + // } + // if (tab === '4' && data4) { + // setLayer(data4, 'tx') + // } + // if (tab === '5' && data5) { + // setLayer(data5, 'sk') + // } + // } else { + // const dsq = setInterval(() => { + // const map = window.__mapref; + // if (map && drpData.length > 0) { + // clearInterval(dsq) + // setLayer(drpData, 'drp') + // } + // }, 500); + // } - }, [drpData, hdData, skObj, tab, showDrp, showHd]) + // }, [drpData, hdData, skObj, showDrp, showHd]) @@ -1223,7 +1224,15 @@ function DrpReal({ style }) { setShowdDrp(0) }, [tab]) - + const removePoint = () => { + dispatch?.runtime.setFeaturePop({}) + const map = window.__mapref; + const layer = map.getLayer('关联站点') + // if (layer) { + // map.removeLayer('关联站点'); + // map.removeSource('关联站点'); + // } + } return ( { const { lgtd, lttd } = row; + removePoint() if (row.stnm == '浮桥河') { - setShowdDrp(1) + setShowdDrp(showDrp == 1 ? 0 : 1) + setLayer([row],'drp') if (lgtd && lttd) { dispatch.runtime.setFeaturePop({ type: 'RealDrpPop', properties: row, coordinates: [row.lgtd, row.lttd] }); dispatch.runtime.setCameraTarget({ @@ -1313,7 +1324,8 @@ function DrpReal({ style }) {
{ const { lgtd, lttd } = row; if (row.stnm == '浮桥河') { - setShowdHd(1) + setShowdHd(showHd == 1 ? 0: 1) + setLayer([row],'hd') if (lgtd && lttd) { dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: row, coordinates: [row.lgtd, row.lttd] }); dispatch.runtime.setCameraTarget({ diff --git a/src/views/Home/panels/Shksh/index.js b/src/views/Home/panels/Shksh/index.js index 2e2f4cc..9377906 100644 --- a/src/views/Home/panels/Shksh/index.js +++ b/src/views/Home/panels/Shksh/index.js @@ -199,7 +199,7 @@ const useStyles = makeStyles({ return (