diff --git a/public/assets/13211750650214_.pic.jpg b/public/assets/13211750650214_.pic.jpg new file mode 100644 index 0000000..e6c272c Binary files /dev/null and b/public/assets/13211750650214_.pic.jpg differ diff --git a/public/assets/13221750650287_.pic.jpg b/public/assets/13221750650287_.pic.jpg new file mode 100644 index 0000000..63bc8eb Binary files /dev/null and b/public/assets/13221750650287_.pic.jpg differ diff --git a/public/assets/13231750650433_.pic.jpg b/public/assets/13231750650433_.pic.jpg new file mode 100644 index 0000000..269ffe5 Binary files /dev/null and b/public/assets/13231750650433_.pic.jpg differ 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/public/assets/logo.mp4 b/public/assets/logo.mp4 index 9e4d7c3..959ae08 100644 Binary files a/public/assets/logo.mp4 and b/public/assets/logo.mp4 differ diff --git a/public/assets/库容蓄水量统计.jpg b/public/assets/库容蓄水量统计.jpg new file mode 100644 index 0000000..877d9d3 Binary files /dev/null and b/public/assets/库容蓄水量统计.jpg differ diff --git a/src/models/map/index.js b/src/models/map/index.js index 3880c50..7e8e4e0 100644 --- a/src/models/map/index.js +++ b/src/models/map/index.js @@ -400,7 +400,7 @@ const map = { Object.keys(DCPJ_TYPES).forEach(key => { layerVisible['Dcpj_' + key + 'Layer'] = false; }); - } else if (id === 200) { + } else if (id === 207) { layerVisible = { RealDrpLayer: false, RealHDLayer: false, @@ -626,7 +626,7 @@ const map = { || id === 203 || id === 205 || id === 206 - || id === 200 + || id === 207 ) { dispatch.map.setLayerSetting({ dom: true }); // if(map){ @@ -640,7 +640,7 @@ const map = { // // } // } - if(id!==200&&id!==203&&id!==205&&id!==206){ + if(id!==207&&id!==203&&id!==205&&id!==206){ if(map){ const layer = map.getLayer('临时水库tz') if(layer){ diff --git a/src/models/map/layout.js b/src/models/map/layout.js index 7c253bd..ca49387 100644 --- a/src/models/map/layout.js +++ b/src/models/map/layout.js @@ -114,7 +114,7 @@ export default function calcLayout(view, rightStack, hidePanels) { { key: '巡查任务总览', style: { height: '40rem', flexGrow: 1 } }, ]; leftFullHeight = true; - } else if (view === 200) { + } else if (view === 207) { left = [ { key: '天气' }, { key: '水库总览', style: { height: '30rem', flexGrow: 1 } }, @@ -333,12 +333,13 @@ export default function calcLayout(view, rightStack, hidePanels) { { key: '巡查问题看板', style: { height: '70%', flexGrow: 1 } }, { key: '水库管护', style: { height: '10rem', flexGrow: 1 } }, ]; - } else if (view === 200) { + } else if (view === 207) { right = [ - { key: '警报' }, - { key: '超汛水库', style: { height: '15rem'} }, - { key: '站点统计', style: { height: '17rem'} }, - { key: '监测告警总', style: { height: '21rem'} }, + // { key: '警报' }, + { key: '库容蓄水量统计', style: { height: '17rem'} }, + { key: '超汛限水库', style: { height: '16rem'} }, + // { key: '站点统计', style: { height: '17rem'} }, + { key: '监测告警总', style: { height: '22rem'} }, // { key: '关联站点',style: { height: '15rem', flexGrow: 1 } }, // { key: '水库水量统计',style: { height: '22rem' } }, // { key: '洪水防御',style: { height: '18rem', flexGrow: 1 } }, 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/PanelIndex.js b/src/views/Home/PanelIndex.js index 3c7a344..faa4880 100644 --- a/src/views/Home/PanelIndex.js +++ b/src/views/Home/PanelIndex.js @@ -119,6 +119,7 @@ import JbqkLeft from './panels/JbqkLeft' import FhxsYq2 from './panels/FhxsYq2' import Zdgzsq from './panels/Zdgzsq' import Czdbl from './panels/Czdbl' +import Krxsltj from './panels/Krxsltj' import Skyb from './panels/Skyb' @@ -410,7 +411,7 @@ export default function PanelIndex({ name, style, ...params }) { return } else if (name === '供水负荷曲线') { return - } else if (name === '超汛水库') { + } else if (name === '超汛限水库') { return } else if (name === '站点统计') { return @@ -426,9 +427,13 @@ export default function PanelIndex({ name, style, ...params }) { return } else if (name === '测站到报率') { return - } else if (name === '单个预案') { + } else if (name === '单个预案') { return + } else if (name === '库容蓄水量统计') { + return } + + return (

not impl

diff --git a/src/views/Home/components/ActionDock/index.js b/src/views/Home/components/ActionDock/index.js index 93494a8..cbc9312 100644 --- a/src/views/Home/components/ActionDock/index.js +++ b/src/views/Home/components/ActionDock/index.js @@ -20,16 +20,16 @@ const VIEWS = [ // { id: 7, title: '调度', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' }, ] }, - // { id: 200, title: '水库', img: process.env.PUBLIC_URL+'/assets/menu/水库专题.png',children:[ - // { id: 207, title: '水库总览', img: process.env.PUBLIC_URL+'/assets/menu/水库管理.png' }, - // // { id: 201, title: '雨情监测', img: process.env.PUBLIC_URL+'/assets/menu/雨情监测.png' }, - // // { id: 202, title: '水情监测', img: process.env.PUBLIC_URL+'/assets/menu/水情监测.png' }, - // { id: 203, title: '水库监测', img: process.env.PUBLIC_URL+'/assets/menu/安全监测.png' }, - // // { id: 204, title: '视频监视', img: process.env.PUBLIC_URL+'/assets/menu/视频监视.png' }, - // { id: 205, title: '防汛调度', img: process.env.PUBLIC_URL+'/assets/menu/防汛调度.png' }, - // { id: 206, title: '巡查维养', img: process.env.PUBLIC_URL+'/assets/menu/水库管理.png' }, - // ] }, - { id: 200, title: '水库', img: process.env.PUBLIC_URL+'/assets/menu/水库专题.png'}, + { id: 200, title: '水库', img: process.env.PUBLIC_URL+'/assets/menu/水库专题.png',children:[ + { id: 207, title: '水库总览', img: process.env.PUBLIC_URL+'/assets/menu/水库管理.png' }, + // { id: 201, title: '雨情监测', img: process.env.PUBLIC_URL+'/assets/menu/雨情监测.png' }, + // { id: 202, title: '水情监测', img: process.env.PUBLIC_URL+'/assets/menu/水情监测.png' }, + { id: 203, title: '水库监测', img: process.env.PUBLIC_URL+'/assets/menu/安全监测.png' }, + // { id: 204, title: '视频监视', img: process.env.PUBLIC_URL+'/assets/menu/视频监视.png' }, + { id: 205, title: '防汛调度', img: process.env.PUBLIC_URL+'/assets/menu/防汛调度.png' }, + { id: 206, title: '巡查维养', img: process.env.PUBLIC_URL+'/assets/menu/水库管理.png' }, + ] }, + // { id: 200, title: '水库', img: process.env.PUBLIC_URL+'/assets/menu/水库专题.png'}, { id: 300, title: '水厂', img: process.env.PUBLIC_URL+'/assets/menu/水利设施.png', children: [ { id: 301, title: '供水态势', img: process.env.PUBLIC_URL+'/assets/menu/降雨中心.png' }, @@ -147,7 +147,8 @@ export default function ActionDock({ }) { removePoint() } }}> -
+ {/*
*/} +
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/ARzSk.js b/src/views/Home/panels/Cxsk/ARzSk.js index 946828e..eeb4bcf 100644 --- a/src/views/Home/panels/Cxsk/ARzSk.js +++ b/src/views/Home/panels/Cxsk/ARzSk.js @@ -187,7 +187,7 @@ function ARzSk({data}) { 水库名称 类型 - 水位(m) + 当前水位(m) 监测时间 @@ -204,8 +204,11 @@ function ARzSk({data}) { 小(2)型 - {tableRow.rz} - {moment(tableRow.tm).format('YYYY-MM-DD HH:mm:ss')} + + {tableRow.rz} + +{(tableRow.rz-tableRow.fsltdz).toFixed(2)} + + {moment(tableRow.tm).format('MM-DD mm:ss')} ) diff --git a/src/views/Home/panels/Cxsk/index.js b/src/views/Home/panels/Cxsk/index.js index 323e743..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 }) {
- -
- -
-
-
+
+ +
+ +
+
diff --git a/src/views/Home/panels/Krxsltj/index.js b/src/views/Home/panels/Krxsltj/index.js new file mode 100644 index 0000000..128ebe8 --- /dev/null +++ b/src/views/Home/panels/Krxsltj/index.js @@ -0,0 +1,20 @@ +import React, { useMemo, useState } from 'react'; +import PanelBox from '../../components/PanelBox'; + + + +function DrpReal({ style }) { + + return ( + + { + }}/> + + ) +} + +export default DrpReal; diff --git a/src/views/Home/panels/Skzl/countPage.js b/src/views/Home/panels/Skzl/countPage.js index 3db4fbe..dbc2678 100644 --- a/src/views/Home/panels/Skzl/countPage.js +++ b/src/views/Home/panels/Skzl/countPage.js @@ -4,22 +4,22 @@ function Page({ style }) { return (
-
+
大型水库
3 座
-
+
中型水库
7 座
-
+
小(1)型水库
44 座
-
+
小(2)型水库
207 座
diff --git a/src/views/Home/panels/Skzl/index.js b/src/views/Home/panels/Skzl/index.js index e949564..629343c 100644 --- a/src/views/Home/panels/Skzl/index.js +++ b/src/views/Home/panels/Skzl/index.js @@ -126,6 +126,14 @@ function DrpReal({ style }) { map.getSource('临时水库tz').setData(parseGeoJSON(data)) } + const getBxx = (a,b)=>{ + if(typeof a === 'number' && typeof b === 'number' ){ + return (a-b).toFixed(2) + }else{ + return '-' + } + } + return ( (<> - + @@ -144,15 +152,15 @@ function DrpReal({ style }) { 序号 水库名称 - 类型 - + {/* 类型 */} + {/* setSort1(!sort1)} active={true} direction={sort1?'desc':'asc'}> {'蓄水量(万m³)'} */} - 蓄水量(万m³) + 当前水位 (m) - {item.name} - {tableRow.xs} + {/* {item.name} */} + {`${tableRow.rz} (${getBxx(tableRow.rz,tableRow.fsltdz)})`} {tableRow.w}