diff --git a/public/assets/13291750658674_.pic.jpg b/public/assets/13291750658674_.pic.jpg new file mode 100644 index 0000000..982fc7d Binary files /dev/null and b/public/assets/13291750658674_.pic.jpg differ diff --git a/src/views/Home/InfoDlg/AllSkDlg/index.js b/src/views/Home/InfoDlg/AllSkDlg/index.js new file mode 100644 index 0000000..c34fe7a --- /dev/null +++ b/src/views/Home/InfoDlg/AllSkDlg/index.js @@ -0,0 +1,109 @@ +import React from 'react'; +import DpTab from '../../../../layouts/mui/DpTab'; +import Dialog from '@material-ui/core/Dialog'; +import DialogContent from '@material-ui/core/DialogContent'; +import DpPaperComponent from '../../../../layouts/mui/DpPaperCompanent'; +import DpTabs from '../../../../layouts/mui/DpTabs'; +import DpAppBar from '../../../../layouts/mui/DpAppBar'; +import { useDispatch, useSelector } from 'react-redux'; +import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop'; +import DpCloseButton from '../../../../layouts/mui/DpCloseButton'; + +function HDStDlg({ record, onClose }) { + const [value, setValue] = React.useState(0); + const dispatch = useDispatch(); + + const data = { + "stcd": "716129061", + "type": "sk", + "hasRz": true, + "stnm": "仰天窝水库", + "adcd": "421181201000", + "wscd": null, + "importancy": 0, + "lgtd": 115.106667, + "lttd": 31.126389, + "elev": 0, + "damel": 325.08, + "dsflz": 324.18, + "fsltdz": 323.5, + "ddz": 319.5, + "zcxsw": 323.5, + "drpTm": "2025-04-11T05:00:00.000Z", + "today": 0, + "h1": 0, + "h3": 0, + "h6": 0, + "h12": 0, + "h24": 0, + "h48": 0, + "drpState": 2, + "rz": 325.16, + "w": 0.132, + "a_fsltdz": 4.660000000000025, + "rzTm": "2025-04-11T05:00:00.000Z", + "rzWarning": 1, + "rzState": 2, + "pic": [ + { + "stcd": "716129061", + "tm": "2023-03-12T06:05:00.000Z", + "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg" + }, + { + "stcd": "716129061", + "tm": "2023-03-12T07:25:00.000Z", + "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg" + } + ], + "layer": "RealSkLayer", + "layerPop": "RealSkPop", + "aRz": 4.66, + "strarz": "4.66" +} + + const flyTo = (row) => { + onClose() + dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: row }) + // const { lgtd, lttd } = row; + // if (lgtd && lttd) { + // // dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] }); + // dispatch.runtime.setCameraTarget({ + // center: [lgtd, lttd + 0.005], + // zoom: 15, + // pitch: 50, + // bearing: 0 + // }); + // } + } + + return ( + +
+ + + setValue(v)}> + + + + +
+ +
flyTo(data)} + >
+
+
+
+
+ ) +} + +export default React.memo(HDStDlg); diff --git a/src/views/Home/InfoDlg/index.js b/src/views/Home/InfoDlg/index.js index a9451d5..e876853 100644 --- a/src/views/Home/InfoDlg/index.js +++ b/src/views/Home/InfoDlg/index.js @@ -47,6 +47,7 @@ import ShuiBengDlg from './ShuiBengDlg' import ShuichangguanwangDlg from './ShuichangguanwangDlg'; import FlowjcDlg from './FlowjcDlg' import EditFaDlg from './EditFaDlg' +import AllSkDlg from './AllSkDlg' function InfoDlg() { const infoDlg = useSelector(getInfoDlg); const dispatch = useDispatch(); @@ -152,6 +153,8 @@ function InfoDlg() { return }else if (layerId === 'editFaLayer') { return + }else if (layerId === 'allSkFaLayer') { + return } diff --git a/src/views/Home/InfoPops/RealSkPop/index.js b/src/views/Home/InfoPops/RealSkPop/index.js index fe60e86..35ff6d7 100644 --- a/src/views/Home/InfoPops/RealSkPop/index.js +++ b/src/views/Home/InfoPops/RealSkPop/index.js @@ -184,11 +184,11 @@ function RealSkTip({ record, dispatch,view }) {
{record.stnm} {record.stnm == '浮桥河水库' ? - record?.setView&&view===200? + record?.setView&&view===207? { dispatch.map.setView(203) sessionStorage.setItem('lastCenter',JSON.stringify(record)) - }}> 进入水库模块 + }}> 进入此水库 : null : record.stnm == '小玉潭水库' ? diff --git a/src/views/Home/components/Title/index.js b/src/views/Home/components/Title/index.js index 9b97a99..c6ce5c9 100644 --- a/src/views/Home/components/Title/index.js +++ b/src/views/Home/components/Title/index.js @@ -155,7 +155,7 @@ export default function Title() {
:null } - { + {/* { (view===203||view===205||view===206)?
{ @@ -198,7 +198,7 @@ export default function Title() { ) }
:null - } + } */} ) } diff --git a/src/views/Home/panels/Cxsk/index.js b/src/views/Home/panels/Cxsk/index.js index c9925eb..dbd01a0 100644 --- a/src/views/Home/panels/Cxsk/index.js +++ b/src/views/Home/panels/Cxsk/index.js @@ -2,14 +2,25 @@ import clsx from 'clsx'; import React from 'react'; import PanelBox from '../../components/PanelBox'; import ARzSk from './ARzSk'; +import { useDispatch, useSelector } from 'react-redux'; + export default function Warn({ style }) { + const dispatch = useDispatch(); return ( +
{ + dispatch?.runtime.setInfoDlg({ layerId: 'allSkFaLayer', properties: {} }) + }}>详情
+ + } >
diff --git a/src/views/Home/panels/Jcgjz/index.js b/src/views/Home/panels/Jcgjz/index.js index 8c52d09..7eb7b03 100644 --- a/src/views/Home/panels/Jcgjz/index.js +++ b/src/views/Home/panels/Jcgjz/index.js @@ -61,16 +61,16 @@ function HDReal({ style }) {
- -
- -
-
-
+
+ +
+ +
+