diff --git a/public/assets/111.pdf b/public/assets/111.pdf new file mode 100644 index 0000000..62b9ce9 Binary files /dev/null and b/public/assets/111.pdf differ diff --git a/public/mapbox/sprite@2x.json b/public/mapbox/sprite@2x.json index 6f2e2b5..e471476 100644 --- a/public/mapbox/sprite@2x.json +++ b/public/mapbox/sprite@2x.json @@ -290,81 +290,81 @@ "变形监测": { "width": 32, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 0, + "y": 288, + "pixelRatio": 0.8, "visible": true }, "渗压监测": { - "width": 32, - "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "width": 26, + "height": 26, + "x": 28, + "y": 290, + "pixelRatio": 0.6, "visible": true }, "渗流监测": { - "width": 32, - "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "width": 22, + "height": 22, + "x": 52, + "y": 290, + "pixelRatio": 0.5, "visible": true }, "白蚁监测": { - "width": 32, + "width": 20, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 74, + "y": 290, + "pixelRatio": 0.5, "visible": true }, "水闸2": { - "width": 32, + "width": 24, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 94, + "y": 290, + "pixelRatio": 0.5, "visible": true }, "泵站2": { - "width": 32, + "width": 15, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 118, + "y": 290, + "pixelRatio": 0.5, "visible": true }, "水表": { - "width": 32, + "width": 20, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 133, + "y": 290, + "pixelRatio": 0.5, "visible": true }, "渠道": { - "width": 32, + "width": 14, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 153, + "y": 290, + "pixelRatio": 0.6, "visible": true }, "水质": { - "width": 32, + "width": 16, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 167, + "y": 290, + "pixelRatio": 0.5, "visible": true }, "土壤墒情": { - "width": 32, + "width": 24, "height": 32, - "x": 64, - "y": 256, - "pixelRatio": 1, + "x": 183, + "y": 290, + "pixelRatio": 0.5, "visible": true } } \ No newline at end of file diff --git a/public/mapbox/sprite@2x.png b/public/mapbox/sprite@2x.png index 570a999..c4faabe 100644 Binary files a/public/mapbox/sprite@2x.png and b/public/mapbox/sprite@2x.png differ diff --git a/src/models/map/index.js b/src/models/map/index.js index 125e14d..22db764 100644 --- a/src/models/map/index.js +++ b/src/models/map/index.js @@ -227,7 +227,7 @@ const map = { } else if (id === 201) { layerVisible = { RealDrpLayer: true, - RealHDLayer: true, + RealHDLayer: false, RealSkLayer: false, BxSkLayer: false, FzdxLayer: false, diff --git a/src/models/map/layout.js b/src/models/map/layout.js index 4e5d3b3..6ab7a8d 100644 --- a/src/models/map/layout.js +++ b/src/models/map/layout.js @@ -78,7 +78,9 @@ export default function calcLayout(view, rightStack, hidePanels) { } else if (view === 205) { left = [ { key: '天气' }, - { key: '水库监测', style: { height: '40rem', flexGrow: 1 } }, + { key: '天气预报', style: { flexShink: 0 } }, + { key: '预警', style: { height: '20rem', flexGrow: 1 } }, + { key: '防汛调度', style: { height: '20rem', flexGrow: 1 } }, ]; leftFullHeight = true; } else if (view === 206) { @@ -195,8 +197,6 @@ export default function calcLayout(view, rightStack, hidePanels) { } else if (view === 205) { right = [ { key: '警报' }, - { key: '防汛调度', style: { height: '20rem', flexGrow: 1 } }, - { key: '预警', style: { height: '20rem', flexGrow: 1 } }, ]; } else if (view === 206) { right = [ diff --git a/src/views/Home/InfoDlg/BxjcBlg/descstyle.js b/src/views/Home/InfoDlg/BxjcBlg/descstyle.js new file mode 100644 index 0000000..36e42b1 --- /dev/null +++ b/src/views/Home/InfoDlg/BxjcBlg/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/BxjcBlg/index.js b/src/views/Home/InfoDlg/BxjcBlg/index.js new file mode 100644 index 0000000..c3b47e1 --- /dev/null +++ b/src/views/Home/InfoDlg/BxjcBlg/index.js @@ -0,0 +1,54 @@ +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 DpTabs from '../../../../layouts/mui/DpTabs'; +import DpTab from '../../../../layouts/mui/DpTab'; +import RzSearch from '../../components/RzSearch'; +import DpAppBar from '../../../../layouts/mui/DpAppBar'; +import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop'; +import DpCloseButton from '../../../../layouts/mui/DpCloseButton'; +import DrpSearch from '../../components/DrpSearch'; +import DrpStAround from '../../components/DrpStAround'; +import GqJcsj from '../../components/Hdjcsj' +import GqJbxx from './jbxx'; +import Gqspxx from '../GqbzDlg/spxx' + +function HDStDlg({ record, onClose }) { + const [value, setValue] = React.useState(0); + + return ( + +
+ + + setValue(v)}> + + {/* */} + {/* */} + + + + +
+ {value === 0 && } + {/* {value === 1 && } */} + {/* {value === 2 && } */} + +
+ +
+
+
+ ) +} + +export default React.memo(HDStDlg); diff --git a/src/views/Home/InfoDlg/BxjcBlg/jbxx.js b/src/views/Home/InfoDlg/BxjcBlg/jbxx.js new file mode 100644 index 0000000..4b09e13 --- /dev/null +++ b/src/views/Home/InfoDlg/BxjcBlg/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/LayersDlg/index.js b/src/views/Home/InfoDlg/LayersDlg/index.js index be82f16..f06dfa9 100644 --- a/src/views/Home/InfoDlg/LayersDlg/index.js +++ b/src/views/Home/InfoDlg/LayersDlg/index.js @@ -113,34 +113,34 @@ function LayersDlg({ onClose }) {
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/src/views/Home/InfoDlg/PdfDlg/index.js b/src/views/Home/InfoDlg/PdfDlg/index.js new file mode 100644 index 0000000..452df35 --- /dev/null +++ b/src/views/Home/InfoDlg/PdfDlg/index.js @@ -0,0 +1,42 @@ +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 DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop'; +import DpCloseButton from '../../../../layouts/mui/DpCloseButton'; + +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/index.js b/src/views/Home/InfoDlg/index.js index 2cf843a..f6525d2 100644 --- a/src/views/Home/InfoDlg/index.js +++ b/src/views/Home/InfoDlg/index.js @@ -26,6 +26,8 @@ import GqbzDlg from './GqbzDlg'; import SqDlg from './SqDlg'; import LlqdDlg from './LlqdDlg'; import LlsbDlg from './LlsbDlg'; +import BxjcDlg from './BxjcBlg' +import PdfDlg from './PdfDlg' function InfoDlg() { const infoDlg = useSelector(getInfoDlg); @@ -88,7 +90,17 @@ function InfoDlg() { return }else if (layerId === 'llsbLayer') { return - } + }else if (layerId === 'BxjcLayer') { + return + }else if (layerId === 'SyjcLayer') { + return + }else if (layerId === 'SljcLayer') { + return + }else if (layerId === 'ByjcLayer') { + return + }else if (layerId === 'PdfLayer') { + return + } return null; diff --git a/src/views/Home/InfoPops/_/layericons.js b/src/views/Home/InfoPops/_/layericons.js index 11c87d1..5f8ff12 100644 --- a/src/views/Home/InfoPops/_/layericons.js +++ b/src/views/Home/InfoPops/_/layericons.js @@ -70,6 +70,32 @@ export const iconstyles = { 泵站: { backgroundPosition: '-1100% 0' }, 病险水库: { backgroundPosition: '0 -800%' }, + + 变形监测: { backgroundPosition: '0% -40%',backgroundSize: '1890% 1650%' }, + 渗压监测: { backgroundPosition: '5.5% -40%',backgroundSize: '1990% 1650%' }, + 渗流监测: { backgroundPosition: '10.5% -40%',backgroundSize: '2394% 1650%' }, + 白蚁监测: { backgroundPosition: '14.8% -40%',backgroundSize: '2394% 1650%' }, + 水闸: { backgroundPosition: '18.9% -40%',backgroundSize: '2194% 1650%' }, + 泵站: { backgroundPosition: '23.3% -40%',backgroundSize: '2794% 1650%' }, + 水表: { backgroundPosition: '26.7% -40%',backgroundSize: '2394% 1650%' }, + 渠道: { backgroundPosition: '30.5% -40%',backgroundSize: '3295% 1650%' }, + 水质: { backgroundPosition: '33.5% -40%',backgroundSize: '3295% 1650%' }, + 土壤墒情: { backgroundPosition: '37.5% -40%',backgroundSize: '1895% 1650%' }, + + + + + + + + + + + + + + + } export const iconbase = { diff --git a/src/views/Home/MapCtrl/mapstyle/bxjclayer.js b/src/views/Home/MapCtrl/mapstyle/bxjclayer.js index 7ff160f..51a60e1 100644 --- a/src/views/Home/MapCtrl/mapstyle/bxjclayer.js +++ b/src/views/Home/MapCtrl/mapstyle/bxjclayer.js @@ -4257,11 +4257,12 @@ export default class BxjcLayer extends BaseLayer { } featureClicked(properties, dispatch) { - dispatch.runtime.setFeaturePop({ - type: InfoPopNames.PicStPop, - properties, - coordinates: [properties.lgtd, properties.lttd], - offsetPop: true, - }); + dispatch?.runtime.setInfoDlg({ layerId: 'BxjcLayer', properties: properties }) + // dispatch.runtime.setFeaturePop({ + // type: InfoPopNames.PicStPop, + // properties, + // coordinates: [properties.lgtd, properties.lttd], + // offsetPop: true, + // }); } } diff --git a/src/views/Home/MapCtrl/mapstyle/byjclayer.js b/src/views/Home/MapCtrl/mapstyle/byjclayer.js index f46d89b..8f3eaca 100644 --- a/src/views/Home/MapCtrl/mapstyle/byjclayer.js +++ b/src/views/Home/MapCtrl/mapstyle/byjclayer.js @@ -217,11 +217,12 @@ export default class ByjcLayer extends BaseLayer { } featureClicked(properties, dispatch) { - dispatch.runtime.setFeaturePop({ - type: InfoPopNames.PicStPop, - properties, - coordinates: [properties.lgtd, properties.lttd], - offsetPop: true, - }); + dispatch?.runtime.setInfoDlg({ layerId: 'ByjcLayer', properties: properties }) + // dispatch.runtime.setFeaturePop({ + // type: InfoPopNames.PicStPop, + // properties, + // coordinates: [properties.lgtd, properties.lttd], + // offsetPop: true, + // }); } } diff --git a/src/views/Home/MapCtrl/mapstyle/sljclayer.js b/src/views/Home/MapCtrl/mapstyle/sljclayer.js index 3faa6bc..0485d52 100644 --- a/src/views/Home/MapCtrl/mapstyle/sljclayer.js +++ b/src/views/Home/MapCtrl/mapstyle/sljclayer.js @@ -113,11 +113,12 @@ export default class SljcLayer extends BaseLayer { } featureClicked(properties, dispatch) { - dispatch.runtime.setFeaturePop({ - type: InfoPopNames.PicStPop, - properties, - coordinates: [properties.lgtd, properties.lttd], - offsetPop: true, - }); + dispatch?.runtime.setInfoDlg({ layerId: 'SljcLayer', properties: properties }) + // dispatch.runtime.setFeaturePop({ + // type: InfoPopNames.PicStPop, + // properties, + // coordinates: [properties.lgtd, properties.lttd], + // offsetPop: true, + // }); } } diff --git a/src/views/Home/MapCtrl/mapstyle/syjclayer.js b/src/views/Home/MapCtrl/mapstyle/syjclayer.js index 79025fd..c1bd55c 100644 --- a/src/views/Home/MapCtrl/mapstyle/syjclayer.js +++ b/src/views/Home/MapCtrl/mapstyle/syjclayer.js @@ -772,11 +772,12 @@ export default class SyjcLayer extends BaseLayer { } featureClicked(properties, dispatch) { - dispatch.runtime.setFeaturePop({ - type: InfoPopNames.PicStPop, - properties, - coordinates: [properties.lgtd, properties.lttd], - offsetPop: true, - }); + dispatch?.runtime.setInfoDlg({ layerId: 'SyjcLayer', properties: properties }) + // dispatch.runtime.setFeaturePop({ + // type: InfoPopNames.PicStPop, + // properties, + // coordinates: [properties.lgtd, properties.lttd], + // offsetPop: true, + // }); } } diff --git a/src/views/Home/panels/Aqjc/index.js b/src/views/Home/panels/Aqjc/index.js index 2f57d60..4eebe61 100644 --- a/src/views/Home/panels/Aqjc/index.js +++ b/src/views/Home/panels/Aqjc/index.js @@ -1499,27 +1499,46 @@ function DrpReal({ style }) { } > + { tab==='1'? - 序号 - 水库名称 - 行政区 - 测点 - 垂直位移 + 序号 + 水库名称 + 行政区 + 测点 + 垂直位移(mm) + 上下游(mm) + 左右岸(mm) + 监测时间 {data1.map((row,index) => ( {index+1} - {row.res_nm} + +
{ + const { res_lon:lgtd, res_lat:lttd } = row; + if (lgtd && lttd) { + dispatch.runtime.setCameraTarget({ + center: [lgtd, lttd], + zoom: 15, + pitch: 60, + bearing: 0 + }); + } + }}>{row.res_nm}
+
{row.town_nm} {row.cd_nm} {row.du_value} + {row.de_value} + {row.dn_value} + {row.dt}
))}
@@ -1530,21 +1549,37 @@ function DrpReal({ style }) {
- 序号 - 水库名称 - 行政区 - 测点 - 渗压水位 + 序号 + 水库名称 + 行政区 + 测点 + 渗压水位 + 监测时间 + {data2.map((row,index) => ( {index+1} - {row.res_nm} + +
{ + const { res_lon:lgtd, res_lat:lttd } = row; + if (lgtd && lttd) { + dispatch.runtime.setCameraTarget({ + center: [lgtd, lttd], + zoom: 15, + pitch: 60, + bearing: 0 + }); + } + }}>{row.res_nm}
+
{row.town_nm} {row.cd_nm} {row.value} + {row.dt} +
))}
@@ -1555,21 +1590,35 @@ function DrpReal({ style }) {
- 序号 - 水库名称 - 行政区 - 测点 - 渗流量 + 序号 + 水库名称 + 行政区 + 测点 + 渗流量 + 监测时间 {data3.map((row,index) => ( {index+1} - {row.res_nm} + +
{ + const { res_lon:lgtd, res_lat:lttd } = row; + if (lgtd && lttd) { + dispatch.runtime.setCameraTarget({ + center: [lgtd, lttd], + zoom: 15, + pitch: 60, + bearing: 0 + }); + } + }}>{row.res_nm}
+
{row.town_nm} {row.cd_nm} {row.value} + {row.dt}
))}
@@ -1580,21 +1629,35 @@ function DrpReal({ style }) {
- 序号 - 水库名称 - 行政区 - 测点 - 状态 + 序号 + 水库名称 + 行政区 + 测点 + 状态 + {/* 监测时间 */} {data4.map((row,index) => ( {index+1} - {row.res_nm} + +
{ + const { res_lon:lgtd, res_lat:lttd } = row; + if (lgtd && lttd) { + dispatch.runtime.setCameraTarget({ + center: [lgtd, lttd], + zoom: 15, + pitch: 60, + bearing: 0 + }); + } + }}>{row.res_nm}
+
{row.town_nm} {row.res_nm} - {row?.children?.[0]?.termite_status==='y'?'有白蚁':'无白蚁'} + {row?.children?.[0]?.termite_status==='y'?
有白蚁
:
无白蚁
}
+ {/* {row.dt} */}
))}
diff --git a/src/views/Home/panels/Fxdd/index.js b/src/views/Home/panels/Fxdd/index.js index 1546b2c..f4e2b8a 100644 --- a/src/views/Home/panels/Fxdd/index.js +++ b/src/views/Home/panels/Fxdd/index.js @@ -1467,7 +1467,7 @@ function DrpReal({ style }) { setTab('1')}>物资仓库 setTab('2')}>应急队伍 - setTab('3')}>闸门 + {/* setTab('3')}>闸门 */} setTab('4')}>安置点 } diff --git a/src/views/Home/panels/Skgl/index.js b/src/views/Home/panels/Skgl/index.js index 86401f3..eccc141 100644 --- a/src/views/Home/panels/Skgl/index.js +++ b/src/views/Home/panels/Skgl/index.js @@ -1,5 +1,6 @@ import React, { useMemo, useState } from 'react'; import useRequest from '../../../../utils/useRequest'; +import { useDispatch, useSelector } from 'react-redux'; import PanelBox from '../../components/PanelBox'; import Table from '@material-ui/core/Table'; @@ -1938,6 +1939,7 @@ const data4 = [ function DrpReal({ style }) { const [tab,setTab] = useState('1') + const dispatch = useDispatch(); return ( ( {index+1} - {row.planName} + +
{ + dispatch?.runtime.setInfoDlg({ layerId: 'PdfLayer', properties: row }) + }}>{row.planName}
+
{row.updateTime.slice(0,10)}
))} diff --git a/src/views/Home/panels/Spjc/index.js b/src/views/Home/panels/Spjc/index.js index 966360b..042e7b6 100644 --- a/src/views/Home/panels/Spjc/index.js +++ b/src/views/Home/panels/Spjc/index.js @@ -200,7 +200,10 @@ function DrpReal({ style }) { {index+1} {row.res_nm} {row.town_nm} - {row.online==='1'?'在线':'离线'} + {row.online==='1'? +
在线
+ :
离线
+ }
))}