diff --git a/public/assets/menu/安全监测.png b/public/assets/menu/安全监测.png new file mode 100644 index 0000000..7d0a51d Binary files /dev/null and b/public/assets/menu/安全监测.png differ diff --git a/public/assets/menu/工程管理.png b/public/assets/menu/工程管理.png new file mode 100644 index 0000000..15d2121 Binary files /dev/null and b/public/assets/menu/工程管理.png differ diff --git a/public/assets/menu/水库专题.png b/public/assets/menu/水库专题.png new file mode 100644 index 0000000..34df53e Binary files /dev/null and b/public/assets/menu/水库专题.png differ diff --git a/public/assets/menu/水库管理.png b/public/assets/menu/水库管理.png new file mode 100644 index 0000000..8d84f08 Binary files /dev/null and b/public/assets/menu/水库管理.png differ diff --git a/public/assets/menu/水情监测.png b/public/assets/menu/水情监测.png new file mode 100644 index 0000000..ef5ed4c Binary files /dev/null and b/public/assets/menu/水情监测.png differ diff --git a/public/assets/menu/水政管理.png b/public/assets/menu/水政管理.png new file mode 100644 index 0000000..f537918 Binary files /dev/null and b/public/assets/menu/水政管理.png differ diff --git a/public/assets/menu/水旱灾害防御.png b/public/assets/menu/水旱灾害防御.png new file mode 100644 index 0000000..dbb7e29 Binary files /dev/null and b/public/assets/menu/水旱灾害防御.png differ diff --git a/public/assets/menu/水资源调度.png b/public/assets/menu/水资源调度.png new file mode 100644 index 0000000..bc555b3 Binary files /dev/null and b/public/assets/menu/水资源调度.png differ diff --git a/public/assets/menu/灌区专题.png b/public/assets/menu/灌区专题.png new file mode 100644 index 0000000..de32cdc Binary files /dev/null and b/public/assets/menu/灌区专题.png differ diff --git a/public/assets/menu/灌区监测.png b/public/assets/menu/灌区监测.png new file mode 100644 index 0000000..3e07a0b Binary files /dev/null and b/public/assets/menu/灌区监测.png differ diff --git a/public/assets/menu/视频监视.png b/public/assets/menu/视频监视.png new file mode 100644 index 0000000..58aa15e Binary files /dev/null and b/public/assets/menu/视频监视.png differ diff --git a/public/assets/menu/量测水管理.png b/public/assets/menu/量测水管理.png new file mode 100644 index 0000000..1989149 Binary files /dev/null and b/public/assets/menu/量测水管理.png differ diff --git a/public/assets/menu/防汛调度.png b/public/assets/menu/防汛调度.png new file mode 100644 index 0000000..11068eb Binary files /dev/null and b/public/assets/menu/防汛调度.png differ diff --git a/public/assets/menu/雨情监测.png b/public/assets/menu/雨情监测.png new file mode 100644 index 0000000..7273b86 Binary files /dev/null and b/public/assets/menu/雨情监测.png differ diff --git a/public/assets/menu/预警信息管理.png b/public/assets/menu/预警信息管理.png new file mode 100644 index 0000000..9715189 Binary files /dev/null and b/public/assets/menu/预警信息管理.png differ diff --git a/public/mapbox/sprite@2x.json b/public/mapbox/sprite@2x.json index e471476..a013f71 100644 --- a/public/mapbox/sprite@2x.json +++ b/public/mapbox/sprite@2x.json @@ -288,7 +288,7 @@ "visible": true }, "变形监测": { - "width": 32, + "width": 26, "height": 32, "x": 0, "y": 288, diff --git a/src/models/map/layout.js b/src/models/map/layout.js index 6ab7a8d..2cfb1a5 100644 --- a/src/models/map/layout.js +++ b/src/models/map/layout.js @@ -196,7 +196,8 @@ export default function calcLayout(view, rightStack, hidePanels) { ]; } else if (view === 205) { right = [ - { key: '警报' }, + { key: '预演方案', style: { height: '30%', flexGrow: 1 } }, + { key: '预演结果', style: { height: '70%', flexGrow: 1 } }, ]; } else if (view === 206) { right = [ diff --git a/src/views/Home/InfoDlg/ByjcDlg/descstyle.js b/src/views/Home/InfoDlg/ByjcDlg/descstyle.js new file mode 100644 index 0000000..36e42b1 --- /dev/null +++ b/src/views/Home/InfoDlg/ByjcDlg/descstyle.js @@ -0,0 +1,104 @@ +import { makeStyles } from '@material-ui/core' +const useDescStyles = makeStyles({ + root: { flex: 'auto' }, + + tabBox: { width: '2rem' }, + tabs1: { + backgroundColor: '#122e47', + fontWeight: 'bold', + overflow: 'hidden', + marginBottom: '0.6rem', + color: '#E2EDFF' + }, + tabIndicator: { + backgroundColor: 'transparent' + }, + + active: { + border: '1px solid #02a6b5' + }, + title: { + width: '16%', + display: 'flex', + alignItems: 'center', + padding: '0.2rem 0.5rem', + textAlign: 'left', + borderBottom: '1px solid rgb(33, 53, 77)', + borderLeft: '1px solid rgb(33, 53, 77)', + borderTop: '1px solid rgb(33, 53, 77)', + overflowWrap: 'break-word' + }, + + value: { + width: '50%', + display: 'flex', + alignItems: 'center', + padding: '1rem 0.5rem', + textAlign: 'left', + border: '1px solid rgb(33, 53, 77)', + overflowWrap: 'break-word', + wordBreak: 'break-all' + }, + title1: { + width: '99.6%', + display: 'flex', + alignItems: 'center', + padding: '0.2rem 0.5rem', + textAlign: 'left', + border: '1px solid rgb(33, 53, 77)', + overflowWrap: 'break-word', + height: '2.5rem' + }, + + cont: { + display: 'flex' + }, + tabList: { + width: '100%' + }, + tableCont: { + height: '100%', + width: '99.6%', + border: '1px solid rgb(33, 53, 77)' + }, + tablebg: { + backgroundColor: 'transparent', + border: '1px solid rgb(33, 53, 77)' + }, + emit: { + border: '1px solid rgb(33, 53, 77)' + }, + title2: { + width: '83.6%', + display: 'flex', + alignItems: 'center', + padding: '0.2rem 0.5rem', + textAlign: 'left', + border: '1px solid rgb(33, 53, 77)', + overflowWrap: 'break-word' + }, + tit: { + width: '50%', + display: 'flex', + alignItems: 'center', + padding: '1rem 0.5rem', + textAlign: 'left', + borderBottom: '1px solid rgb(33, 53, 77)', + borderLeft: '1px solid rgb(33, 53, 77)', + borderTop: '1px solid rgb(33, 53, 77)', + overflowWrap: 'break-word', + backgroundColor: 'rgba(33,53,77,0.2)' + // color: '#bbb' + }, + value1: { + width: '99.6%', + display: 'flex', + alignItems: 'center', + padding: '0.2rem 0.5rem', + textAlign: 'left', + border: '1px solid rgb(33, 53, 77)', + overflowWrap: 'break-word' + } +}) + +export default useDescStyles diff --git a/src/views/Home/InfoDlg/ByjcDlg/index.js b/src/views/Home/InfoDlg/ByjcDlg/index.js new file mode 100644 index 0000000..d8a4d79 --- /dev/null +++ b/src/views/Home/InfoDlg/ByjcDlg/index.js @@ -0,0 +1,45 @@ +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 DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop'; +import DpTabs from '../../../../layouts/mui/DpTabs'; +import DpTab from '../../../../layouts/mui/DpTab'; +import DpCloseButton from '../../../../layouts/mui/DpCloseButton'; +import DpAppBar from '../../../../layouts/mui/DpAppBar'; + +import Page from './index2' + +function HDStDlg({ record, onClose }) { + const [value, setValue] = React.useState(0); + + return ( + +
+ + + setValue(v)}> + + {/* */} + {/* */} + + + + + + + +
+
+ ) +} + +export default React.memo(HDStDlg); diff --git a/src/views/Home/InfoDlg/ByjcDlg/index2.js b/src/views/Home/InfoDlg/ByjcDlg/index2.js new file mode 100644 index 0000000..8699573 --- /dev/null +++ b/src/views/Home/InfoDlg/ByjcDlg/index2.js @@ -0,0 +1,34 @@ +import { Grid } from '@material-ui/core'; +import React from 'react'; +import useRequest from '../../../../utils/useRequest'; +import { skInfo } from '../../../../models/_/search'; +import { adnmCun, adnmZhen } from '../../../../models/_/adcd'; +import { Person } from '@material-ui/icons'; +import DescriptionItem from '../../components/DescrptionItem'; + + + +function SkInfo({record}) { + return ( +
+ + {record?.res_nm} + 平原区水库 + 小(2)型 + + 0 + 25 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 未填报 + +
+ ) +} + +export default SkInfo; diff --git a/src/views/Home/InfoDlg/ByjcDlg/jbxx.js b/src/views/Home/InfoDlg/ByjcDlg/jbxx.js new file mode 100644 index 0000000..4b09e13 --- /dev/null +++ b/src/views/Home/InfoDlg/ByjcDlg/jbxx.js @@ -0,0 +1,98 @@ +import React, { useEffect, useState } from 'react' +import { Grid } from '@material-ui/core' +import useDescStyle from './descstyle' + +function Jbxx ({ record }) { + const classes = useDescStyle() + + return ( + <> +
+ + + 灌区名称 + + + {record?.chanCode_dictText} + + + 水闸类型 + + + {record?.wagaType_dictText??'--'} + + + 行政区划 + + + {record?.adCode_dictText} + + + 管理单位 + + + {record?.engManCode_dictText} + + + 渠道名称 + + + {record?.chanCode_dictText} + + + 桩号 + + + {record?.bnch} + + + 动力类型 + + + {record?.pwrTp_dictText??'--'} + + + 闸门孔数 + + + {record?.whthInWat??'--'} + + + 闸门尺寸 + + + 3*2.8m*m + + + 设计流量 + + + {record?.dsfl}m³/s + + + 进口高程 + + + {record?.actIrrA??'--'}m + + + 实达流量 + + + {record?.stfl??'--'} + + + 运行状态 + + + {record?.runStat_dictText??'--'} + + +
+ +
+ + ) +} + +export default React.memo(Jbxx) \ No newline at end of file diff --git a/src/views/Home/InfoDlg/index.js b/src/views/Home/InfoDlg/index.js index f6525d2..e9a6d6d 100644 --- a/src/views/Home/InfoDlg/index.js +++ b/src/views/Home/InfoDlg/index.js @@ -27,6 +27,7 @@ import SqDlg from './SqDlg'; import LlqdDlg from './LlqdDlg'; import LlsbDlg from './LlsbDlg'; import BxjcDlg from './BxjcBlg' +import ByjcDlg from './ByjcDlg' import PdfDlg from './PdfDlg' function InfoDlg() { @@ -97,7 +98,7 @@ function InfoDlg() { }else if (layerId === 'SljcLayer') { return }else if (layerId === 'ByjcLayer') { - return + return }else if (layerId === 'PdfLayer') { return } diff --git a/src/views/Home/components/ActionDock/index.js b/src/views/Home/components/ActionDock/index.js index 16d9f7f..80afb29 100644 --- a/src/views/Home/components/ActionDock/index.js +++ b/src/views/Home/components/ActionDock/index.js @@ -14,13 +14,13 @@ const VIEWS = [ { id: 4, title: '降雨中心', img: '/assets/menu/预警分析.png' }, { id: 5, title: '天气预报', img: '/assets/menu/降雨中心.png' }, ] }, - { id: 200, title: '水库', img: '/assets/menu/实时数据.png',children:[ - { id: 201, title: '雨情监测', img: '/assets/menu/降雨中心.png' }, - { id: 202, title: '水情监测', img: '/assets/menu/水利设施.png' }, - { id: 203, title: '安全监测', img: '/assets/menu/降雨中心.png' }, - { id: 204, title: '视频监控', img: '/assets/menu/辅助决策.png' }, - { id: 205, title: '防汛调度', img: '/assets/menu/辅助决策.png' }, - { id: 206, title: '水库管理', img: '/assets/menu/病险水库.png' }, + { id: 200, title: '水库', img: '/assets/menu/水库专题.png',children:[ + { id: 201, title: '雨情监测', img: '/assets/menu/雨情监测.png' }, + { id: 202, title: '水情监测', img: '/assets/menu/水情监测.png' }, + { id: 203, title: '安全监测', img: '/assets/menu/安全监测.png' }, + { id: 204, title: '视频监视', img: '/assets/menu/视频监视.png' }, + { id: 205, title: '防汛调度', img: '/assets/menu/防汛调度.png' }, + { id: 206, title: '水库管理', img: '/assets/menu/水库管理.png' }, ] }, { id: 300, title: '水厂', img: '/assets/menu/水利设施.png',children:[ { id: 301, title: '供水态势', img: '/assets/menu/降雨中心.png' }, @@ -33,14 +33,14 @@ const VIEWS = [ // 决策支持与报表 ] }, { - id: 400, title: '灌区', img: '/assets/menu/预警分析.png', children: [ - { id: 501, title: '灌区监测', img: '/assets/menu/防洪形势.png' }, - { id: 504, title: '水旱灾害防御', img: '/assets/menu/水利设施.png' }, - // { id: 502, title: '预警信息管理', img: '/assets/menu/实时数据.png' }, - { id: 503, title: '水资源调度', img: '/assets/menu/病险水库.png' }, - { id: 505, title: '量测水管理', img: '/assets/menu/辅助决策.png' }, - { id: 506, title: '水政管理', img: '/assets/menu/预警分析.png' }, - { id: 507, title: '工程管理', img: '/assets/menu/降雨中心.png' }, + id: 400, title: '灌区', img: '/assets/menu/灌区专题.png', children: [ + { id: 501, title: '灌区监测', img: '/assets/menu/灌区监测.png' }, + { id: 504, title: '水旱灾害防御', img: '/assets/menu/水旱灾害防御.png' }, + // { id: 502, title: '预警信息管理', img: '/assets/menu/预警信息管理.png' }, + { id: 503, title: '水资源调度', img: '/assets/menu/水资源调度.png' }, + { id: 505, title: '量测水管理', img: '/assets/menu/量测水管理.png' }, + { id: 506, title: '水政管理', img: '/assets/menu/水政管理.png' }, + { id: 507, title: '工程管理', img: '/assets/menu/工程管理.png' }, // 图层控制 // 灌区监测 // 预警信息管理 @@ -109,7 +109,7 @@ export default function ActionDock({ }) { } }}>
- +
diff --git a/src/views/Home/panels/Fxdd/index.js b/src/views/Home/panels/Fxdd/index.js index f4e2b8a..45ac336 100644 --- a/src/views/Home/panels/Fxdd/index.js +++ b/src/views/Home/panels/Fxdd/index.js @@ -1478,23 +1478,21 @@ function DrpReal({ style }) { - 序号 - 水库名称 - 行政区 - 测点 - 垂直位移 + 仓库名称 + 仓库地址 - {data1.map((row,index) => ( + {/* {data1.map((row,index) => ( {index+1} {row.res_nm} - {row.town_nm} - {row.cd_nm} - {row.du_value} - ))} + ))} */} + + 麻城市应急物资储备中心 + 麻城市京广大道与金交汇处 +
:null } @@ -1503,15 +1501,14 @@ function DrpReal({ style }) { - 序号 - 水库名称 - 行政区 - 测点 - 渗压水位 + 队伍名称 + 人员总数 + 地址 + 管理单位 - {data2.map((row,index) => ( + {/* {data2.map((row,index) => ( {index+1} {row.res_nm} @@ -1519,7 +1516,13 @@ function DrpReal({ style }) { {row.cd_nm} {row.value} - ))} + ))} */} + + 乡镇应急救援中队 + 20 + 麻城市京广大道与金交汇处 + 麻城市水利局 +
:null } @@ -1553,15 +1556,14 @@ function DrpReal({ style }) { - 序号 - 水库名称 - 行政区 - 测点 - 状态 + 安置点名称 + 容纳人数 + 地址 + 管理单位 - {data4.map((row,index) => ( + {/* {data4.map((row,index) => ( {index+1} {row.res_nm} @@ -1569,7 +1571,13 @@ function DrpReal({ style }) { {row.res_nm} {row?.children?.[0]?.termite_status==='y'?'有白蚁':'无白蚁'} - ))} + ))} */} + + 阎家河镇 + 1800 + 麻城市京广大道与金交汇处 + 麻城市水利局 +
:null } diff --git a/src/views/Home/panels/WeatherForcast/WF.js b/src/views/Home/panels/WeatherForcast/WF.js index af7c48b..d83c303 100644 --- a/src/views/Home/panels/WeatherForcast/WF.js +++ b/src/views/Home/panels/WeatherForcast/WF.js @@ -49,11 +49,17 @@ function WF() { }, [contourSetting]); const genWeatherContour24H = () => { + dispatch.runtime.setYyfa({yy:''}) dispatch.shyjview.showWeather24h(); + const map = window.__mapref + map.setLayoutProperty('热力图', 'visibility', 'none'); } const genWeatherContourRadar = () => { + dispatch.runtime.setYyfa({yy:''}) dispatch.shyjview.showWeatherRadar(); + const map = window.__mapref + map.setLayoutProperty('热力图', 'visibility', 'none'); } const setIndexH24 = (index) => { diff --git a/src/views/Home/panels/WeatherForcast/index.js b/src/views/Home/panels/WeatherForcast/index.js index 4a31cfb..9918d6c 100644 --- a/src/views/Home/panels/WeatherForcast/index.js +++ b/src/views/Home/panels/WeatherForcast/index.js @@ -10,6 +10,9 @@ export default function WeatherForcast({ style }) { const closeLayer = () => { dispatch.runtime.setLayerSetting({ contour: null, dem: undefined }); dispatch.map.setLayerVisible({ ContourLayer: false }); + dispatch.runtime.setYyfa({yy:''}) + const map = window.__mapref + map.setLayoutProperty('热力图', 'visibility', 'none'); } return (