diff --git a/src/views/Home/InfoPops/index.js b/src/views/Home/InfoPops/index.js
index c904a84..0820750 100644
--- a/src/views/Home/InfoPops/index.js
+++ b/src/views/Home/InfoPops/index.js
@@ -42,11 +42,10 @@ export const InfoPops = ({ type, properties, dispatch, view }) => {
return
} else if (type === InfoPopNames.RealHDPop) {
return
- }else if (type === 'qdpop') {
+ } else if (type === 'qdpop') {
return
- }
- else if (type === InfoPopNames.RealSkPop) {
- return
+ } else if (type === InfoPopNames.RealSkPop) {
+ return
} else if (type === InfoPopNames.PicStPop) {
return
} else if (type === 'bridge') {
diff --git a/src/views/Home/MapCtrl/index.js b/src/views/Home/MapCtrl/index.js
index 25b8ade..e982fb7 100644
--- a/src/views/Home/MapCtrl/index.js
+++ b/src/views/Home/MapCtrl/index.js
@@ -129,19 +129,13 @@ export default function MapCtrl({ initParams, onLoad }) {
if(feature.layer.id==='sk1111'||feature.layer.id==='sk2222'||feature.layer.id==='临时水库tz'||feature.layer.id==='临时水库'){
const record = feature.properties
if(feature.layer.id==='临时水库tz'){
- dispatch.map.setView(203)
- sessionStorage.setItem('lastCenter',JSON.stringify([record.lgtd, record.lttd]))
+ dispatch.runtime.setFeaturePop({ type: record.layerPop, properties: {...record,setView:true}, coordinates: [record.lgtd, record.lttd] });
+ }else{
+ dispatch.runtime.setFeaturePop({ type: record.layerPop, properties: record, coordinates: [record.lgtd, record.lttd] });
}
- dispatch.runtime.setFeaturePop({ type: record.layerPop, properties: record, coordinates: [record.lgtd, record.lttd] });
}
if(feature.layer.id==='临时线'){
debugger
- const record = feature.properties
- if(feature.layer.id==='临时水库tz'){
- dispatch.map.setView(203)
- sessionStorage.setItem('lastCenter',JSON.stringify([record.lgtd, record.lttd]))
- }
- dispatch.runtime.setFeaturePop({ type: record.layerPop, properties: record, coordinates: [record.lgtd, record.lttd] });
}
if (feature.layer.id === '关联站点') {
const record = feature.properties
diff --git a/src/views/Home/PanelIndex.js b/src/views/Home/PanelIndex.js
index 3f836d1..ac31f2e 100644
--- a/src/views/Home/PanelIndex.js
+++ b/src/views/Home/PanelIndex.js
@@ -114,6 +114,7 @@ import Sksltj from './panels/Sksltj'
import Hsfy from './panels/Hsfy'
import Cxsk from './panels/Cxsk'
import Zdtj from './panels/Zdtj'
+import Jcgjz from './panels/Jcgjz'
@@ -403,9 +404,9 @@ export default function PanelIndex({ name, style, ...params }) {
return
} else if (name === '站点统计') {
return
+ } else if (name === '监测告警总') {
+ return
}
-
-
return (
not impl
diff --git a/src/views/Home/components/Title/index.js b/src/views/Home/components/Title/index.js
index d376a04..521cb3d 100644
--- a/src/views/Home/components/Title/index.js
+++ b/src/views/Home/components/Title/index.js
@@ -157,29 +157,34 @@ export default function Title() {
}
{
(view===203||view===205||view===206)?
-
+
{
[
- {name:'返回',key:200},
- {name:'水库监测',key:203},
- {name:'防汛调度',key:205},
- {name:'巡查维养',key:206},
+ {name:'返回',key:200,icon:'组1.png'},
+ {name:'水库监测',key:203,icon:'组2.png'},
+ {name:'防汛调度',key:205,icon:'组3.png'},
+ {name:'巡查维养',key:206,icon:'组4.png'},
].map((item)=>
<>
-
{
+
{
dispatch.map.setView(item.key)
if(item.key===200){
- const center = JSON.parse(sessionStorage.getItem('lastCenter'))
- if(center){
+ const {lgtd,lttd} = JSON.parse(sessionStorage.getItem('lastCenter'))
+ if(lgtd&<td){
dispatch.runtime.setCameraTarget({
- center: center,
+ center: [lgtd, lttd+0.005],
zoom: 15,
pitch: 50,
bearing: 0
});
}
}
- }}>{item.name}
+ }}>
+
+
+
+ {item.name}
+
)
}
diff --git a/src/views/Home/panels/Cxsk/ARzSk.js b/src/views/Home/panels/Cxsk/ARzSk.js
index 4cd710d..2b314ca 100644
--- a/src/views/Home/panels/Cxsk/ARzSk.js
+++ b/src/views/Home/panels/Cxsk/ARzSk.js
@@ -181,7 +181,7 @@ function ARzSk({data}) {
// ))
// }
//
-
+
diff --git a/src/views/Home/panels/Jcgjz/Setting.js b/src/views/Home/panels/Jcgjz/Setting.js
new file mode 100644
index 0000000..fd1c4ef
--- /dev/null
+++ b/src/views/Home/panels/Jcgjz/Setting.js
@@ -0,0 +1,51 @@
+import React from 'react';
+
+import Dialog from '@material-ui/core/Dialog';
+import DialogContent from '@material-ui/core/DialogContent';
+import DpPaperComponent from '../../../../layouts/mui/DpPaperCompanent';
+import { FormGroup, MenuItem, Select, Switch, Typography } from '@material-ui/core';
+import DpDialogTitle from '../../../../layouts/mui/DpDialogTitle';
+import { useDispatch, useSelector } from 'react-redux';
+import { getLayerSetting, getLayerVisible } from '../../../../models/map/selectors';
+import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop';
+
+
+function Setting({ onClose }) {
+ const layerVisible = useSelector(getLayerVisible);
+ const layerSetting = useSelector(getLayerSetting);
+
+ const dispath = useDispatch();
+
+ return (
+
+ )
+}
+
+export default Setting;
diff --git a/src/views/Home/panels/Jcgjz/index.js b/src/views/Home/panels/Jcgjz/index.js
new file mode 100644
index 0000000..82eec50
--- /dev/null
+++ b/src/views/Home/panels/Jcgjz/index.js
@@ -0,0 +1,87 @@
+import React, { useMemo, useState } from 'react';
+import useRequest from '../../../../utils/useRequest';
+import PanelBox from '../../components/PanelBox';
+
+import Table from '@material-ui/core/Table';
+import TableContainer from '@material-ui/core/TableContainer';
+import TableBody from '@material-ui/core/TableBody';
+import TableHead from '@material-ui/core/TableHead';
+import TableRow from '@material-ui/core/TableRow';
+import DpTableCell from '../../../../layouts/mui/DpTableCell';
+import DpTableRow from '../../../../layouts/mui/DpTableRow';
+import { useDispatch, useSelector } from 'react-redux';
+import useRefresh from '../../../../utils/useRefresh';
+import { HDRealPromise } from '../../../../models/_/real';
+import clsx from 'clsx';
+import { renderHDRz } from '../../../../utils/renutils';
+import Setting from './Setting';
+import { InfoPopNames } from '../../InfoPops';
+import config from '../../../../config';
+import moment from 'moment';
+import { Switch, FormControlLabel, InputLabel, Select, MenuItem, FormControl } from '@material-ui/core/index'
+
+function rzRender(rz, base) {
+ return (
+ = base ? 'red' : '#fff' }}>
+ {typeof base === 'number' ? base.toFixed(2) : ''}
+
+ );
+}
+
+function HDReal({ style }) {
+ const [dimension, setDimension] = useState('ft');
+
+ const dispatch = useDispatch();
+ const tableRzFilter = useSelector(s => s.realview.tableRzFilter);
+ const hdAutoRefresh = useSelector(s => s.realview.hdAutoRefresh);
+ const t = useRefresh(hdAutoRefresh ? 60 * 1000 : 0);
+ // let { data } = useRequest(HDRealPromise.get, t);
+ const [setting, showSetting] = useState(false);
+
+
+ const toggleAutoRefresh = () => {
+ dispatch.realview.setHdAutoRefresh(!hdAutoRefresh);
+ }
+
+ const handleBxDlg = () => {
+ dispatch.runtime.setInfoDlg({ layerId: 'WyWarnLayer', properties: {}})
+ }
+
+ return (
+
+ 2025-05-26~2025-06-02
+
+ }
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{setSkLayer1()}}/>
+ {
+ // setSkLayer1()
+ }}/>
)
}