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 ( + + ) +} + +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 ( +