lishenfeng
/
mcfxkh-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lishenfeng:258560d5b45b32e40ee6b71b2d0c054243c683c4
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:lsf-dev
..
compare: lishenfeng:014b388ee2dab39a472777794cfd72aa6b83c5bc
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:lsf-dev

No commits in common. "258560d5b45b32e40ee6b71b2d0c054243c683c4" and "014b388ee2dab39a472777794cfd72aa6b83c5bc" have entirely different histories.
258560d5b4 ... 014b388ee2

7 changed files with 68 additions and 98 deletions
Show Stats Expand all files Collapse all files

BIN
public/assets/jrx.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 64 KiB

2
src/models/map/index.js
View File

@ -263,7 +263,7 @@ const map = {
RealSkLayer: false, RealSkLayer: false,
RainDrpLayer: true, RainDrpLayer: true,
ShuikuLayer: false, ShuikuLayer: false,
BxSkLayer: false, BxSkLayer: true,
FzdxLayer: false, FzdxLayer: false,
WataLayer: false, WataLayer: false,
AdcdLayer: true, AdcdLayer: true,

4
src/models/shyjview/index.js
View File

@ -34,7 +34,7 @@ const shyjview = {
} }
dispatch.runtime.setHome(); // dispatch.runtime.setHome();
}, },
async showWeatherRadar(_, state) { async showWeatherRadar(_, state) {
dispatch.map.setCalculating(true); dispatch.map.setCalculating(true);
@ -49,7 +49,7 @@ const shyjview = {
} }
dispatch.runtime.setHome(); // dispatch.runtime.setHome();
}, },
async showYj24hContour(latest) { async showYj24hContour(latest) {

4
src/views/Home/panels/BxSkOverall/OverallContent.js
View File

@ -65,8 +65,8 @@ export default function OverallContent({ data, skAll }) {
<div> <div>
<span className={classes.titleDate}>{start}9时</span>至<span className={classes.titleDate}>{end}9时</span> <span className={classes.titleDate}>{start}9时</span>至<span className={classes.titleDate}>{end}9时</span>
24小时中共有<span className={classes.number}>1</span> 24小时中共有<span className={classes.number}>1</span>
个站点雨量为<span className={classes.sttype}>暴雨</span>，雨量值 个站点雨量为<span className={classes.sttype}>大暴雨</span>，雨量值
<span className={classes.number}>50.2mm</span>； <span className={classes.number}>261mm</span>；
共产生<span className={classes.number}>3</span>个山洪预警（2个内部预警，1个外部预警），均已处置；<span className={classes.number}>1</span>个水库超汛限，已短信通知责任人；<span className={classes.number}>1</span>个超警戒河道预警。 共产生<span className={classes.number}>3</span>个山洪预警（2个内部预警，1个外部预警），均已处置；<span className={classes.number}>1</span>个水库超汛限，已短信通知责任人；<span className={classes.number}>1</span>个超警戒河道预警。
</div> </div>

80
src/views/Home/panels/Byjc/index.js
View File

@ -915,47 +915,39 @@ function DrpReal({ style }) {
"aRz": -17.4 "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 [showbx, setShowdbx] = useState(0)
const [showsy, setShowdsy] = useState(0) const [showsy, setShowdsy] = useState(0)
const [showsl, setShowdsl] = useState(0) const [showsl, setShowdsl] = useState(0)
const [showby, setShowdby] = useState(0) const [showby, setShowdby] = useState(0)
// useEffect(() => { useEffect(() => {
// const map = window.__mapref; const map = window.__mapref;
// if (map) { if (map) {
// if (tab === '1' && data1 && showbx) { if (tab === '1' && data1 && showbx) {
// setLayer(data1, '变形') setLayer(data1, '变形')
// } }
// if (tab === '2' && data2 && showsy) { if (tab === '2' && data2 && showsy) {
// setLayer(data2, '渗压') setLayer(data2, '渗压')
// } }
// if (tab === '3' && data3 && showsl) { if (tab === '3' && data3 && showsl) {
// setLayer(data3, '渗流') setLayer(data3, '渗流')
// } }
// if (tab === '4' && data4 && showby) { if (tab === '4' && data4 && showby) {
// setLayer(data4, '白蚁') setLayer(data4, '白蚁')
// } }
// } }
// else { else {
// const dsq = setInterval(() => { const dsq = setInterval(() => {
// const map = window.__mapref; const map = window.__mapref;
// if (map && skdata.length > 0) { if (map && skdata.length > 0) {
// clearInterval(dsq) clearInterval(dsq)
// setLayer(skdata, 'sk') setLayer(skdata, 'sk')
// } }
// }, 500); }, 500);
// } }
// }, [data1, data2, data3, data4, tab, showbx, showsy, showsl, showby]) }, [data1, data2, data3, data4, tab, showbx, showsy, showsl, showby])
const setLayer = (data = [], type) => { const setLayer = (data = [], type) => {
const map = window.__mapref; const map = window.__mapref;
@ -1237,10 +1229,8 @@ function DrpReal({ style }) {
key={row.stcd} key={row.stcd}
onClick={() => { onClick={() => {
const { lgtd, lttd, res_nm: stnm } = row; const { lgtd, lttd, res_nm: stnm } = row;
removePoint()
if (stnm == '浮桥河水库') { if (stnm == '浮桥河水库') {
setShowdbx(showbx == 1 ? 0 : 1) setShowdbx(1)
setLayer([row],'变形')
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
@ -1284,10 +1274,8 @@ function DrpReal({ style }) {
key={row.stcd} key={row.stcd}
onClick={() => { onClick={() => {
const { lgtd, lttd, res_nm: stnm } = row; const { lgtd, lttd, res_nm: stnm } = row;
removePoint()
if (stnm == '浮桥河水库') { if (stnm == '浮桥河水库') {
setShowdsy(showsy == 1 ? 0 : 1) setShowdsy(1)
setLayer([row],'渗压')
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
@ -1327,9 +1315,7 @@ function DrpReal({ style }) {
key={row.stcd} key={row.stcd}
onClick={() => { onClick={() => {
const { lgtd, lttd } = row; const { lgtd, lttd } = row;
removePoint() setShowdsl(1)
setShowdsl(showsl == 1 ? 0 : 1)
setLayer([row],'渗流')
if (row.cd == 1) { if (row.cd == 1) {
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
@ -1370,12 +1356,8 @@ function DrpReal({ style }) {
<DpTableRow <DpTableRow
key={row.stcd} key={row.stcd}
onClick={() => { onClick={() => {
removePoint()
const { lgtd, lttd } = row; const { lgtd, lttd } = row;
setShowdby(showby == 1 ? 0 : 1) setShowdby(1)
setLayer([row],'白蚁')
if (row.cd == '0AB3ED') { if (row.cd == '0AB3ED') {
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({

74
src/views/Home/panels/Glzd/index.js
View File

@ -892,36 +892,35 @@ function DrpReal({ style }) {
const [showDrp, setShowdDrp] = useState(0) const [showDrp, setShowdDrp] = useState(0)
const [showHd, setShowdHd] = useState(0) const [showHd, setShowdHd] = useState(0)
// useEffect(() => { useEffect(() => {
// const map = window.__mapref; const map = window.__mapref;
// if (map) { if (map) {
// debugger if (tab === '1' && drpData && showDrp) {
// if (tab === '1' && drpData) { setLayer(drpData, 'drp')
// setLayer(drpData, 'drp') }
// } if (tab === '2' && hdData && showHd) {
// if (tab === '2' && hdData ) { setLayer(hdData, 'hd')
// setLayer(hdData, 'hd') }
// } if (tab === '3' && data3) {
// if (tab === '3' && data3) { setLayer(data3, 'll')
// setLayer(data3, 'll') }
// } if (tab === '4' && data4) {
// if (tab === '4' && data4) { setLayer(data4, 'tx')
// setLayer(data4, 'tx') }
// } if (tab === '5' && data5) {
// if (tab === '5' && data5) { setLayer(data5, 'sk')
// setLayer(data5, 'sk') }
// } } else {
// } else { const dsq = setInterval(() => {
// const dsq = setInterval(() => { const map = window.__mapref;
// const map = window.__mapref; if (map && drpData.length > 0) {
// if (map && drpData.length > 0) { clearInterval(dsq)
// clearInterval(dsq) setLayer(drpData, 'drp')
// setLayer(drpData, 'drp') }
// } }, 500);
// }, 500); }
// }
// }, [drpData, hdData, skObj, showDrp, showHd]) }, [drpData, hdData, skObj, tab, showDrp, showHd])
@ -1224,15 +1223,7 @@ function DrpReal({ style }) {
setShowdDrp(0) setShowdDrp(0)
}, [tab]) }, [tab])
const removePoint = () => {
dispatch?.runtime.setFeaturePop({})
const map = window.__mapref;
const layer = map.getLayer('关联站点')
// if (layer) {
// map.removeLayer('关联站点');
// map.removeSource('关联站点');
// }
}
return ( return (
<PanelBox <PanelBox
@ -1279,10 +1270,8 @@ function DrpReal({ style }) {
key={row.stcd} key={row.stcd}
onClick={() => { onClick={() => {
const { lgtd, lttd } = row; const { lgtd, lttd } = row;
removePoint()
if (row.stnm == '浮桥河') { if (row.stnm == '浮桥河') {
setShowdDrp(showDrp == 1 ? 0 : 1) setShowdDrp(1)
setLayer([row],'drp')
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealDrpPop', properties: row, coordinates: [row.lgtd, row.lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealDrpPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
@ -1324,8 +1313,7 @@ function DrpReal({ style }) {
<div className="table-ellipsis cursor-pointer" onClick={() => { <div className="table-ellipsis cursor-pointer" onClick={() => {
const { lgtd, lttd } = row; const { lgtd, lttd } = row;
if (row.stnm == '浮桥河') { if (row.stnm == '浮桥河') {
setShowdHd(showHd == 1 ? 0: 1) setShowdHd(1)
setLayer([row],'hd')
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: row, coordinates: [row.lgtd, row.lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({

2
src/views/Home/panels/Shksh/index.js
View File

@ -199,7 +199,7 @@ const useStyles = makeStyles({
return ( return (
<PanelBox <PanelBox
style={style} style={style}
title="山洪可视化预案" title="山洪可视化"
color="green" color="green"
> >
<div style={{padding:'10px 8px'}}> <div style={{padding:'10px 8px'}}>