Compare commits

..

No commits in common. "3fabf984a62556494c7514b506bc046a814d76cd" and "0be79dd7c364dcc155cd7a0cde247d08035c97cb" have entirely different histories.

16 changed files with 284 additions and 519 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 KiB

After

Width:  |  Height:  |  Size: 616 KiB

View File

@ -417,6 +417,7 @@ const map = {
ShuiyuandiQLayer:true, ShuiyuandiQLayer:true,
ShuizhiLayer:true, ShuizhiLayer:true,
ShuiyuandiLayer: true, ShuiyuandiLayer: true,
}; };
Object.keys(DCPJ_TYPES).forEach(key => { Object.keys(DCPJ_TYPES).forEach(key => {
layerVisible['Dcpj_' + key + 'Layer'] = false; layerVisible['Dcpj_' + key + 'Layer'] = false;
@ -433,7 +434,6 @@ const map = {
RoadLayer: true, RoadLayer: true,
RivlLayer: true, RivlLayer: true,
ShuichangLayer:true, ShuichangLayer:true,
ShuichangQLayer: true,
}; };
Object.keys(DCPJ_TYPES).forEach(key => { Object.keys(DCPJ_TYPES).forEach(key => {
layerVisible['Dcpj_' + key + 'Layer'] = false; layerVisible['Dcpj_' + key + 'Layer'] = false;

View File

@ -132,7 +132,7 @@ export default function calcLayout(view, rightStack, hidePanels) {
left = [ left = [
{ key: '天气' }, { key: '天气' },
{ key: '水厂总览', style: { height: '26rem' } }, { key: '水厂总览', style: { height: '26rem' } },
{ key: '设备统计', style: { height: '23rem' } }, { key: '设备统计', style: { height: '16rem' } },
// { key: '水厂监控',style: { height: '16rem'} }, // { key: '水厂监控',style: { height: '16rem'} },
// { key: '设备数量统计',style: { height: '18rem'} }, // { key: '设备数量统计',style: { height: '18rem'} },
// { key: '设备故障统计',style: { height: '18rem'} }, // { key: '设备故障统计',style: { height: '18rem'} },
@ -331,8 +331,8 @@ export default function calcLayout(view, rightStack, hidePanels) {
} else if (view === 301) { } else if (view === 301) {
right = [ right = [
// { key: '警报' }, // { key: '警报' },
// { key: '水厂生产情况',style: { height: '15rem', flexGrow: 1 } }, { key: '水厂生产情况',style: { height: '15rem', flexGrow: 1 } },
// { key: '对比分析', style: { height: '19rem' } }, { key: '对比分析', style: { height: '19rem' } },
{ key: '报警统计',style: { height: '19rem',flexGrow: 1 } }, { key: '报警统计',style: { height: '19rem',flexGrow: 1 } },
]; ];
} else if (view === 302) { } else if (view === 302) {

View File

@ -35,7 +35,7 @@ function HDStDlg({ record, onClose }) {
BackdropComponent={DpBackgroundDrop} BackdropComponent={DpBackgroundDrop}
> >
<div className="boxhead"></div> <div className="boxhead"></div>
<DialogContent style={{ padding: 0, width: '60rem', overflowX: 'hidden' }}> <DialogContent style={{ padding: 0, width: '60rem', overflowX: 'hidden',height:'35rem' }}>
<DpAppBar position="sticky"> <DpAppBar position="sticky">
<DpTabs value={value} indicatorColor="primary" onChange={(_, v) => setValue(v)}> <DpTabs value={value} indicatorColor="primary" onChange={(_, v) => setValue(v)}>
<DpTab label="资产详情" /> <DpTab label="资产详情" />
@ -46,13 +46,12 @@ function HDStDlg({ record, onClose }) {
{ {
value===0? value===0?
<div style={{padding:0}}> <div style={{padding:10}}>
<img src={`${process.env.PUBLIC_URL}/assets/资产详情.jpg`} style={{width:'100%'}}></img> <img src={`${process.env.PUBLIC_URL}/assets/资产详情.jpg`} style={{width:'100%'}}></img>
</div>:null </div>:null
} }
{ {
value===1? value===1?
<div style={{height:'35rem'}}>
<TableContainer > <TableContainer >
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
@ -84,7 +83,6 @@ function HDStDlg({ record, onClose }) {
</TableBody> </TableBody>
</Table> </Table>
</TableContainer> </TableContainer>
</div>
:null :null
} }
</DialogContent> </DialogContent>

View File

@ -130,10 +130,6 @@ export default function MapCtrl({ initParams, onLoad }) {
const record = feature.properties const record = feature.properties
dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [record.lgtd, record.lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [record.lgtd, record.lttd] });
} }
if(feature.layer.id==='关联站点'){
const record = feature.properties
// dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [record.lgtd, record.lttd] });
}
} }
}); });

View File

@ -85,7 +85,7 @@ const data = [
const AreaDrpChart = ({rz}) => { const AreaDrpChart = () => {
@ -121,7 +121,7 @@ const AreaDrpChart = ({rz}) => {
xAxis: [ xAxis: [
{ {
type: 'category', type: 'category',
data: data.map((o)=>o[0]), // data: x,
splitLine: { splitLine: {
show: true, //隐藏X轴轴线 show: true, //隐藏X轴轴线
lineStyle: { lineStyle: {
@ -182,7 +182,7 @@ const AreaDrpChart = ({rz}) => {
axisTick: { axisTick: {
show: false, show: false,
}, },
// min: 133, min: 133,
// max: 135, // max: 135,
} }
], ],
@ -191,7 +191,7 @@ const AreaDrpChart = ({rz}) => {
name: '水位', name: '水位',
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
data: data.map(o=>rz), data: data,
showSymbol: false, showSymbol: false,
itemStyle: { itemStyle: {
normal: { normal: {
@ -212,7 +212,7 @@ const AreaDrpChart = ({rz}) => {
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
showSymbol: false, showSymbol: false,
data: data.map(o=>rz+34.5), data: data.map((item)=>134.5),
itemStyle: { itemStyle: {
normal: { normal: {
color: '#f19932' color: '#f19932'
@ -232,7 +232,7 @@ const AreaDrpChart = ({rz}) => {
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
showSymbol: false, showSymbol: false,
data: data.map(o=>rz+45.2), data: data.map((item)=>134.8),
itemStyle: { itemStyle: {
normal: { normal: {
color: '#e1554e' color: '#e1554e'

View File

@ -9,7 +9,6 @@ import config from '../../../../config';
function DrpReal({ style }) { function DrpReal({ style }) {
const [dimension, setDimension] =useState('61614460'); const [dimension, setDimension] =useState('61614460');
const [rz,setRz] = useState(21.91)
const dispatch = useDispatch(); const dispatch = useDispatch();
const data = [ const data = [
{ {
@ -158,7 +157,6 @@ function DrpReal({ style }) {
const value = event.target.value; const value = event.target.value;
setDimension(value); setDimension(value);
const record = data.filter(o=>o.stcd===value)[0] const record = data.filter(o=>o.stcd===value)[0]
setRz(record.rz)
const { lgtd, lttd } = record; const { lgtd, lttd } = record;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: record, coordinates: [lgtd, lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: record, coordinates: [lgtd, lttd] });
@ -169,6 +167,18 @@ function DrpReal({ style }) {
}); });
} }
}} }}
// sx={{
// color: '#fff',
// '.MuiOutlinedInput-notchedOutline': {
// borderColor: 'rgba(255, 255, 255, 0.3)',
// },
// '&:hover .MuiOutlinedInput-notchedOutline': {
// borderColor: 'rgba(255, 255, 255, 0.6)',
// },
// '&.Mui-focused .MuiOutlinedInput-notchedOutline': {
// borderColor: '#fff',
// }
// }}
> >
{ {
data.map((item)=> data.map((item)=>
@ -180,7 +190,7 @@ function DrpReal({ style }) {
</> </>
} }
> >
<AreaDrpChart data={[]} rz={rz}/> <AreaDrpChart data={[]} />
</PanelBox> </PanelBox>
) )
} }

View File

@ -711,8 +711,8 @@ const data5 = [
"town_nm": "阎家河镇", "town_nm": "阎家河镇",
"res_cd": "42118140028", "res_cd": "42118140028",
"res_nm": "红心水库", "res_nm": "红心水库",
"lgtd": 115.18962, "res_lon": 115.18962,
"lttd": 31.23425, "res_lat": 31.23425,
"video_guid": "00032e3e6d984f0eb32c807e5769ec3a", "video_guid": "00032e3e6d984f0eb32c807e5769ec3a",
"video_name": "红心水库坝脚球机", "video_name": "红心水库坝脚球机",
"online": "1", "online": "1",
@ -727,8 +727,8 @@ const data5 = [
"town_nm": "龙池办事处", "town_nm": "龙池办事处",
"res_cd": "42118150152", "res_cd": "42118150152",
"res_nm": "戴家冲水库", "res_nm": "戴家冲水库",
"lgtd": 115.0241, "res_lon": 115.0241,
"lttd": 31.23237, "res_lat": 31.23237,
"video_guid": "0037a5cb2caf44e49c012e3fdfa01238", "video_guid": "0037a5cb2caf44e49c012e3fdfa01238",
"video_name": "戴家冲水库_坝顶_枪机_龙池", "video_name": "戴家冲水库_坝顶_枪机_龙池",
"online": "1", "online": "1",
@ -743,8 +743,8 @@ const data5 = [
"town_nm": "宋埠镇", "town_nm": "宋埠镇",
"res_cd": "42118140008", "res_cd": "42118140008",
"res_nm": "管山水库", "res_nm": "管山水库",
"lgtd": 114.78397, "res_lon": 114.78397,
"lttd": 31.19451, "res_lat": 31.19451,
"video_guid": "0243e9726e244b728618741f248e0577", "video_guid": "0243e9726e244b728618741f248e0577",
"video_name": "管山水库坝脚球机", "video_name": "管山水库坝脚球机",
"online": "1", "online": "1",
@ -759,8 +759,8 @@ const data5 = [
"town_nm": "中馆驿镇", "town_nm": "中馆驿镇",
"res_cd": "42118140005", "res_cd": "42118140005",
"res_nm": "响鼓墩水库", "res_nm": "响鼓墩水库",
"lgtd": 114.91971, "res_lon": 114.91971,
"lttd": 31.17985, "res_lat": 31.17985,
"video_guid": "024eaf5578464d9192559ad2288ba764", "video_guid": "024eaf5578464d9192559ad2288ba764",
"video_name": "响鼓墩水库", "video_name": "响鼓墩水库",
"online": "1", "online": "1",
@ -775,8 +775,8 @@ const data5 = [
"town_nm": "福田河镇", "town_nm": "福田河镇",
"res_cd": "42118150147", "res_cd": "42118150147",
"res_nm": "张家河水库", "res_nm": "张家河水库",
"lgtd": 115.17869, "res_lon": 115.17869,
"lttd": 31.48587, "res_lat": 31.48587,
"video_guid": "02d77364354a4f8982ad3d949e0d32ab", "video_guid": "02d77364354a4f8982ad3d949e0d32ab",
"video_name": "张家河水库_坝脚_球机", "video_name": "张家河水库_坝脚_球机",
"online": "1", "online": "1",
@ -791,8 +791,8 @@ const data5 = [
"town_nm": "顺河镇", "town_nm": "顺河镇",
"res_cd": "42118150048", "res_cd": "42118150048",
"res_nm": "孙家榜水库", "res_nm": "孙家榜水库",
"lgtd": 114.91758, "res_lon": 114.91758,
"lttd": 31.26933, "res_lat": 31.26933,
"video_guid": "03059577c270432bb7338e7f714b9a01", "video_guid": "03059577c270432bb7338e7f714b9a01",
"video_name": "孙家塝水库", "video_name": "孙家塝水库",
"online": "1", "online": "1",
@ -807,8 +807,8 @@ const data5 = [
"town_nm": "三河口镇", "town_nm": "三河口镇",
"res_cd": "42118150145", "res_cd": "42118150145",
"res_nm": "袁家冲水库", "res_nm": "袁家冲水库",
"lgtd": 115.28076, "res_lon": 115.28076,
"lttd": 31.28639, "res_lat": 31.28639,
"video_guid": "031ac395df964414a17f9dc996e13d57", "video_guid": "031ac395df964414a17f9dc996e13d57",
"video_name": "袁家冲水库视频站", "video_name": "袁家冲水库视频站",
"online": "1", "online": "1",
@ -823,8 +823,8 @@ const data5 = [
"town_nm": "南湖办事处", "town_nm": "南湖办事处",
"res_cd": "42118140003", "res_cd": "42118140003",
"res_nm": "毛家冲水库", "res_nm": "毛家冲水库",
"lgtd": 114.98531, "res_lon": 114.98531,
"lttd": 31.20469, "res_lat": 31.20469,
"video_guid": "036b290ac8e547a79f5835754e02772c", "video_guid": "036b290ac8e547a79f5835754e02772c",
"video_name": "毛家冲水库溢洪道", "video_name": "毛家冲水库溢洪道",
"online": "1", "online": "1",
@ -839,8 +839,8 @@ const data5 = [
"town_nm": "歧亭镇", "town_nm": "歧亭镇",
"res_cd": "42118150224", "res_cd": "42118150224",
"res_nm": "兴隆寺水库", "res_nm": "兴隆寺水库",
"lgtd": 114.69534, "res_lon": 114.69534,
"lttd": 31.01031, "res_lat": 31.01031,
"video_guid": "0385335df9c64c1f8972cf3ed17b4854", "video_guid": "0385335df9c64c1f8972cf3ed17b4854",
"video_name": "兴隆寺水库_坝脚_球机", "video_name": "兴隆寺水库_坝脚_球机",
"online": "1", "online": "1",
@ -855,8 +855,8 @@ const data5 = [
"town_nm": "中馆驿镇", "town_nm": "中馆驿镇",
"res_cd": "42118150094", "res_cd": "42118150094",
"res_nm": "西冲水库", "res_nm": "西冲水库",
"lgtd": 114.94118, "res_lon": 114.94118,
"lttd": 31.06765, "res_lat": 31.06765,
"video_guid": "046336873b8a4eefbc321bd2e6e4359c", "video_guid": "046336873b8a4eefbc321bd2e6e4359c",
"video_name": "西冲水库", "video_name": "西冲水库",
"online": "1", "online": "1",
@ -897,15 +897,6 @@ function DrpReal({ style }) {
if(tab==='2'&&hdData){ if(tab==='2'&&hdData){
setLayer(hdData,'hd') setLayer(hdData,'hd')
} }
if(tab==='3'&&data3){
setLayer(data3,'ll')
}
if(tab==='4'&&data4){
setLayer(data4,'tx')
}
if(tab==='5'&&data5){
setLayer(data5,'sk')
}
}else{ }else{
const dsq = setInterval(() => { const dsq = setInterval(() => {
const map = window.__mapref; const map = window.__mapref;
@ -1074,137 +1065,6 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='ll'){
map.addLayer({
'id': '关联站点',//+new Date().getTime(),
'type': 'symbol',
'source': {
'type': 'geojson',
'data': {
'type': 'FeatureCollection',
'features': [],
},
},
'layout': {
'icon-allow-overlap': true,
'text-allow-overlap': true,
'icon-image': '水表',
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.4,
14, 0.8,
],
'text-allow-overlap': true,
'text-size': [
'interpolate', ['linear'], ['zoom'],
10, 10,
14, 14,
],
'text-font': ['Roboto Black'],
'text-field': [
'step',
['zoom'],
'',
12, ['get', 'stnm']
],
'text-anchor': 'top',
'text-offset': [0, 1],
},
'paint': {
'text-color': '#fff'
},
'visibility': 'visible',
});
}
if(type==='tx'){
map.addLayer({
'id': '关联站点',//+new Date().getTime(),
'type': 'symbol',
'source': {
'type': 'geojson',
'data': {
'type': 'FeatureCollection',
'features': [],
},
},
'layout': {
'icon-allow-overlap': true,
'text-allow-overlap': true,
'icon-image': '图像站',
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.4,
14, 0.8,
],
'text-allow-overlap': true,
'text-size': [
'interpolate', ['linear'], ['zoom'],
10, 10,
14, 14,
],
'text-font': ['Roboto Black'],
'text-field': [
'step',
['zoom'],
'',
12, ['get', 'stnm']
],
'text-anchor': 'top',
'text-offset': [0, 1],
},
'paint': {
'text-color': '#fff'
},
'visibility': 'visible',
});
}
if(type==='sk'){
map.addLayer({
'id': '关联站点',//+new Date().getTime(),
'type': 'symbol',
'source': {
'type': 'geojson',
'data': {
'type': 'FeatureCollection',
'features': [],
},
},
'layout': {
'icon-allow-overlap': true,
'text-allow-overlap': true,
'icon-image': '水库-离线',
'icon-size': [
'interpolate', ['linear'], ['zoom'],
10, 0.4,
14, 0.8,
],
'text-allow-overlap': true,
'text-size': [
'interpolate', ['linear'], ['zoom'],
10, 10,
14, 14,
],
'text-font': ['Roboto Black'],
'text-field': [
'step',
['zoom'],
'',
12, ['get', 'stnm']
],
'text-anchor': 'top',
'text-offset': [0, 1],
},
'paint': {
'text-color': '#fff'
},
'visibility': 'visible',
});
}
map.getSource('关联站点').setData(parseGeoJSON(data)) map.getSource('关联站点').setData(parseGeoJSON(data))
} }
@ -1326,9 +1186,8 @@ function DrpReal({ style }) {
{/* <DpTableCell align="center">{index+1}</DpTableCell> */} {/* <DpTableCell align="center">{index+1}</DpTableCell> */}
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" onClick={() => { <div className="table-ellipsis cursor-pointer" onClick={() => {
const { lgtd, lttd } = row; const { res_lon:lgtd, res_lat:lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: '流量水表站', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 15,
@ -1362,9 +1221,8 @@ function DrpReal({ style }) {
<DpTableCell align="center">{index+1}</DpTableCell> <DpTableCell align="center">{index+1}</DpTableCell>
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => { <div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => {
const { lgtd, lttd } = row; const { res_lon:lgtd, res_lat:lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'PicStPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 15,
@ -1397,9 +1255,8 @@ function DrpReal({ style }) {
<DpTableCell align="center">{index+1}</DpTableCell> <DpTableCell align="center">{index+1}</DpTableCell>
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => { <div className="table-ellipsis cursor-pointer" style={{marginLeft:'20px'}} onClick={() => {
const { lgtd, lttd } = row; const { res_lon:lgtd, res_lat:lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 15,

View File

@ -157,7 +157,7 @@ const AreaDrpChart = ({index}) => {
name: '实际产水', name: '实际产水',
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
data: y.map((item)=>item*index), data: y.map((item)=>item*(index+1)*1.1),
showSymbol: false, showSymbol: false,
itemStyle: { itemStyle: {
normal: { normal: {

View File

@ -8,171 +8,136 @@ import config from '../../../../config';
function DrpReal({ style }) { function DrpReal({ style }) {
const [dimension, setDimension] =useState(1); const [dimension, setDimension] =useState('61614460');
const [index,setIndex ] = useState(1) const [index,setIndex ] = useState(0)
const dispatch = useDispatch(); const dispatch = useDispatch();
const data = [ const data = [
{ {
"stcd": "61614200", "stcd": "61614460",
"type": "sk", "stnm": "项生(宋埠)",
"hasRz": true, "adcd": "421181000000000",
"stnm": "浮桥河水厂",
zb: '浊度',
index:1,
yjvalue: 0.6,
status:1,
"adcd": "421181100000",
"wscd": null, "wscd": null,
"importancy": 0, "importancy": 0,
"lgtd": 114.875, "lgtd": 114.798056,
"lttd": 31.166667, "lttd": 31.058611,
"elev": 0, "elev": null,
"damel": 71.33,
"dsflz": 68.04,
"fsltdz": 64.89,
"ddz": 51.78,
"zcxsw": 64.89,
"drpTm": "2025-06-03T02:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 16.5,
"drpState": 1,
"rz": 60.71,
"w": 162.8,
"a_fsltdz": -4.18,
"rzTm": "2025-06-03T02:00:00.000Z",
"rzWarning": 0,
"rzState": 1,
"aRz": -4.18,
percent: 98.20
},
{
"stcd": "61612610",
index:1.1,
"type": "sk",
"hasRz": true, "hasRz": true,
"stnm": "三河口水厂", "wrz": null,
zb: '余氯', "wrq": null,
yjvalue: 0.25, "grz": null,
"adcd": "421181109000", "grq": null,
"wscd": null, "sfz": null,
percent: 94.29, "sfq": null,
"importancy": 0, "type": "sh",
"lgtd": 115.166667, "tm": "2025-06-03T02:00:00.000Z",
"lttd": 31.333333, "rz": 21.91,
"elev": 0, "trend": 1,
"damel": 156.8, "state": 1,
"dsflz": 154.99, "warning": 0,
"fsltdz": 149, "maxRz": 21.91,
"ddz": 124, "maxDate": "2025-06-03T02:00:00.000Z",
"zcxsw": 149, "warndes": null
"drpTm": "2025-06-03T02:00:00.000Z", },{
"today": 0, "stcd": "61613700",
"h1": 0, "stnm": "四角门(宋铁二桥)",
"h3": 0, "adcd": "421181000000000",
"h6": 0, "wscd": null,
"h12": 0, "importancy": 0,
"h24": 0, "lgtd": 114.8291,
"h48": 12.5, "lttd": 31.0754,
"drpState": 1, "elev": null,
"rz": 141.45, "hasRz": true,
"w": 77.8, "wrz": null,
"a_fsltdz": -7.550000000000011, "wrq": null,
"rzTm": "2025-06-03T01:00:00.000Z", "grz": null,
"rzWarning": 0, "grq": null,
"rzState": 1, "sfz": null,
"aRz": -7.55 "sfq": null,
}, "type": "sh",
{ "tm": "2025-06-03T02:00:00.000Z",
"stcd": "7CS000231", "rz": 27.57,
"type": "sk", "trend": 0,
index:1.2, "state": 1,
"hasRz": true, "warning": 0,
"stnm": "刘集水厂", "maxRz": 27.57,
zb: 'PH值', "maxDate": "2025-06-03T01:00:00.000Z",
yjvalue: 7.4, "warndes": null,
percent: 56.98, },{
"adcd": "421181100000", "stcd": "61612910",
"wscd": null, "stnm": "桃林河(阎河)",
"importancy": 0, "adcd": "421181000000000",
"lgtd": 115.048056, "wscd": null,
"lttd": 31.335556, "importancy": 0,
"elev": 0, "lgtd": 115.087777777,
"damel": 79.6, "lttd": 31.164444444,
"dsflz": 78.65, "elev": null,
"fsltdz": 72.05, "hasRz": true,
"ddz": 69.55, "wrz": null,
"zcxsw": 72.05, "wrq": null,
"drpTm": "2023-11-20T01:00:00.000Z", "grz": null,
"today": 0, "grq": null,
"h1": 0, "sfz": null,
"h3": 0, "sfq": null,
"h6": 0, "type": "sh",
"h12": 0, "tm": "2025-06-03T02:35:00.000Z",
"h24": 0, "rz": 55.67,
"h48": 0, "trend": 0,
"drpState": 2, "state": 1,
"rz": 76.49, "warning": 0,
"w": 0.049, "maxRz": 55.67,
"a_fsltdz": 4.439999999999998, "maxDate": "2025-06-03T02:00:00.000Z",
"rzTm": "2025-04-11T06:00:00.000Z", "warndes": null
"rzWarning": 1, },{
"rzState": 2, "stcd": "61615110",
"pic": [ "stnm": "杨梅河(木子店)",
{ "adcd": "421181000000000",
"stcd": "7CS000231", "wscd": null,
"tm": "2023-11-20T01:04:18.000Z", "importancy": 0,
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000231/20231120090418.jpg" "lgtd": 115.339667,
}, "lttd": 31.1595,
{ "elev": null,
"stcd": "7CS000231", "hasRz": true,
"tm": "2023-11-20T01:07:54.000Z", "wrz": null,
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000232/20231120090754.jpg" "wrq": null,
} "grz": null,
], "grq": null,
"aRz": 4.44 "sfz": null,
}, "sfq": null,
{ "type": "sh",
"stcd": "716460001", "tm": "2025-06-03T02:00:00.000Z",
"type": "sk", "rz": 112.71,
"hasRz": true, "trend": 0,
"stnm": "杉林河水厂", "state": 1,
index:1.3, "warning": 0,
zb: 'PH值', "maxRz": 112.71,
yjvalue: 6.3, "maxDate": "2025-06-02T22:00:00.000Z",
"adcd": "421181107000", "warndes": null
"wscd": null, },{
percent: 42.14, "stcd": "61612150",
"importancy": 0, "stnm": "鹰山畈(黄土岗)",
"lgtd": 115.433056, "adcd": "421181000000000",
"lttd": 31.304444, "wscd": null,
"elev": 0, "importancy": 0,
"damel": 236.2, "lgtd": 115.073611,
"dsflz": 233.92, "lttd": 31.386667,
"fsltdz": 231, "elev": null,
"ddz": 204, "hasRz": true,
"zcxsw": 231, "wrz": null,
"drpTm": "2025-04-11T05:00:00.000Z", "wrq": null,
"today": 0, "grz": null,
"h1": 0, "grq": null,
"h3": 0, "sfz": null,
"h6": 0, "sfq": null,
"h12": 0, "type": "sh",
"h24": 0, "tm": "2025-06-03T02:00:00.000Z",
"h48": 0, "rz": 77.12,
"drpState": 2, "trend": 0,
"rz": 224.31, "state": 1,
"w": 0, "warning": 0,
"a_fsltdz": -6.689999999999998, "maxRz": 77.25,
"rzTm": "2025-04-11T05:00:00.000Z", "maxDate": "2025-06-02T16:00:00.000Z",
"rzWarning": 0, "warndes": null
"rzState": 2, },
"aRz": -6.69
},
] ]
@ -190,8 +155,8 @@ function DrpReal({ style }) {
value={dimension} value={dimension}
label="" label=""
onChange={(event,b) => { onChange={(event,b) => {
const value = event.target.value; setIndex(b)
setIndex(value) // const value = event.target.value;
// setDimension(value); // setDimension(value);
// const record = data.filter(o=>o.stcd===value)[0] // const record = data.filter(o=>o.stcd===value)[0]
// const { lgtd, lttd } = record; // const { lgtd, lttd } = record;
@ -207,7 +172,7 @@ function DrpReal({ style }) {
> >
{ {
data.map((item)=> data.map((item)=>
<MenuItem value={item.index}>{item.stnm}</MenuItem> <MenuItem value={item.stcd}>{item.stnm}</MenuItem>
) )
} }
</Select> </Select>

View File

@ -81,8 +81,8 @@ export default function OverallContent({ data }) {
dispatch.runtime.setFeaturePop({ type: poptype, properties: record, coordinates: [lgtd, lttd] }); dispatch.runtime.setFeaturePop({ type: poptype, properties: record, coordinates: [lgtd, lttd] });
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
zoom: 13, zoom: 15,
pitch: 30,//config.poiPitch, pitch: config.poiPitch,
}); });
} }
} }

View File

@ -13,7 +13,7 @@ function DrpReal({ style }) {
</> </>
} }
> >
<img src='/assets/设备统计1.jpg' style={{width:'11.5rem', height:'16rem',marginLeft:'6.5rem',marginTop:'2rem'}}/> <img src='/assets/设备统计.jpg' style={{width:'27.5rem', height:'11rem',marginLeft:'-8px'}}/>
</PanelBox> </PanelBox>
) )
} }

View File

@ -18,162 +18,104 @@ const { RangePicker } = DatePicker;
const data1 = [ const data1 = [
{ {
"stcd": "61614200", "res_cd": "42118140035",
"type": "sk", "res_lon": 115.14137,
"hasRz": true, "res_lat": 31.55095,
"stnm": "浮桥河水厂", "cd": "01",
zb: '浊度', "cd_nm": "GN1",
yjvalue: 0.6, "res_reg_cd": "42118140006-A4",
status:1, "ch": "0+000",
"adcd": "421181100000", "province_cd": "420000000000",
"wscd": null, "province_nm": "湖北省",
"importancy": 0, "city_cd": "421100000000",
"lgtd": 114.875, "city_nm": "黄冈市",
"lttd": 31.166667, "county_cd": "421181000000",
"elev": 0, "county_nm": "麻城市",
"damel": 71.33, "town_cd": "421181112000",
"dsflz": 68.04, "town_nm": "福田河镇",
"fsltdz": 64.89, "bas_guid": "鄂东五河片区",
"ddz": 51.78, "eng_scal": "小1型",
"zcxsw": 64.89, "danger_stat": "非病险水库",
"drpTm": "2025-06-03T02:00:00.000Z", "label": "2023高标准",
"today": 0, "res_nm": "大堰口水库",
"h1": 0, "de_value": -4.2885,
"h3": 0, "dn_value": -13.5384,
"h6": 0, "du_value": 132.4892,
"h12": 0, "de_trend": null,
"h24": 0, "dn_trend": null,
"h48": 16.5, "du_trend": null,
"drpState": 1, "max_de": 1.0981,
"rz": 60.71, "max_dn": -2.3255,
"w": 162.8, "max_du": 132.4892,
"a_fsltdz": -4.18, "dt": "2025-05-20",
"rzTm": "2025-06-03T02:00:00.000Z", "is_has_data": "y"
"rzWarning": 0,
"rzState": 1,
"aRz": -4.18,
percent: 98.20
}, },
{ {
"stcd": "61612610", "res_cd": "42118140035",
"type": "sk", "res_lon": 115.14137,
"hasRz": true, "res_lat": 31.55095,
"stnm": "三河口水厂", "cd": "03",
zb: '余氯', "cd_nm": "GN3",
yjvalue: 0.25, "res_reg_cd": "42118140006-A4",
"adcd": "421181109000", "ch": "0+000",
"wscd": null, "province_cd": "420000000000",
percent: 94.29, "province_nm": "湖北省",
"importancy": 0, "city_cd": "421100000000",
"lgtd": 115.166667, "city_nm": "黄冈市",
"lttd": 31.333333, "county_cd": "421181000000",
"elev": 0, "county_nm": "麻城市",
"damel": 156.8, "town_cd": "421181112000",
"dsflz": 154.99, "town_nm": "福田河镇",
"fsltdz": 149, "bas_guid": "鄂东五河片区",
"ddz": 124, "eng_scal": "小1型",
"zcxsw": 149, "danger_stat": "非病险水库",
"drpTm": "2025-06-03T02:00:00.000Z", "label": "2023高标准",
"today": 0, "res_nm": "大堰口水库",
"h1": 0, "de_value": -10.73,
"h3": 0, "dn_value": -9.8975,
"h6": 0, "du_value": 121.3495,
"h12": 0, "de_trend": null,
"h24": 0, "dn_trend": null,
"h48": 12.5, "du_trend": null,
"drpState": 1, "max_de": 1.0981,
"rz": 141.45, "max_dn": -2.3255,
"w": 77.8, "max_du": 132.4892,
"a_fsltdz": -7.550000000000011, "dt": "2025-05-20",
"rzTm": "2025-06-03T01:00:00.000Z", "is_has_data": "y"
"rzWarning": 0,
"rzState": 1,
"aRz": -7.55
}, },
{ {
"stcd": "7CS000231", "res_cd": "42118140035",
"type": "sk", "res_lon": 115.14137,
"hasRz": true, "res_lat": 31.55095,
"stnm": "刘集水厂", "cd": "02",
zb: 'PH值', "cd_nm": "GN2",
yjvalue: 7.4, "res_reg_cd": "42118140006-A4",
percent: 56.98, "ch": "0+000",
"adcd": "421181100000", "province_cd": "420000000000",
"wscd": null, "province_nm": "湖北省",
"importancy": 0, "city_cd": "421100000000",
"lgtd": 115.048056, "city_nm": "黄冈市",
"lttd": 31.335556, "county_cd": "421181000000",
"elev": 0, "county_nm": "麻城市",
"damel": 79.6, "town_cd": "421181112000",
"dsflz": 78.65, "town_nm": "福田河镇",
"fsltdz": 72.05, "bas_guid": "鄂东五河片区",
"ddz": 69.55, "eng_scal": "小1型",
"zcxsw": 72.05, "danger_stat": "非病险水库",
"drpTm": "2023-11-20T01:00:00.000Z", "label": "2023高标准",
"today": 0, "res_nm": "大堰口水库",
"h1": 0, "de_value": 1.0981,
"h3": 0, "dn_value": -7.0736,
"h6": 0, "du_value": 75.4661,
"h12": 0, "de_trend": null,
"h24": 0, "dn_trend": null,
"h48": 0, "du_trend": null,
"drpState": 2, "max_de": 1.0981,
"rz": 76.49, "max_dn": -2.3255,
"w": 0.049, "max_du": 132.4892,
"a_fsltdz": 4.439999999999998, "dt": "2025-05-20",
"rzTm": "2025-04-11T06:00:00.000Z", "is_has_data": "y"
"rzWarning": 1, }
"rzState": 2,
"pic": [
{
"stcd": "7CS000231",
"tm": "2023-11-20T01:04:18.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000231/20231120090418.jpg"
},
{
"stcd": "7CS000231",
"tm": "2023-11-20T01:07:54.000Z",
"url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000232/20231120090754.jpg"
}
],
"aRz": 4.44
},
{
"stcd": "716460001",
"type": "sk",
"hasRz": true,
"stnm": "杉林河水厂",
zb: 'PH值',
yjvalue: 6.3,
"adcd": "421181107000",
"wscd": null,
percent: 42.14,
"importancy": 0,
"lgtd": 115.433056,
"lttd": 31.304444,
"elev": 0,
"damel": 236.2,
"dsflz": 233.92,
"fsltdz": 231,
"ddz": 204,
"zcxsw": 231,
"drpTm": "2025-04-11T05:00:00.000Z",
"today": 0,
"h1": 0,
"h3": 0,
"h6": 0,
"h12": 0,
"h24": 0,
"h48": 0,
"drpState": 2,
"rz": 224.31,
"w": 0,
"a_fsltdz": -6.689999999999998,
"rzTm": "2025-04-11T05:00:00.000Z",
"rzWarning": 0,
"rzState": 2,
"aRz": -6.69
},
] ]
@ -229,7 +171,7 @@ function DrpReal({ style }) {
<TableContainer style={{ height: '10rem' }}> <TableContainer style={{ height: '10rem' }}>
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
<TableRow> <TableRow>
<DpTableCell style={{ minWidth: '8rem' }} align="center">水厂名称</DpTableCell> <DpTableCell style={{ minWidth: '8rem' }} align="center">水厂名称</DpTableCell>
<DpTableCell style={{ minWidth: '3rem' }} align="center">进水量</DpTableCell> <DpTableCell style={{ minWidth: '3rem' }} align="center">进水量</DpTableCell>
<DpTableCell style={{ minWidth: '8rem' }} align="center">供水量</DpTableCell> <DpTableCell style={{ minWidth: '8rem' }} align="center">供水量</DpTableCell>
@ -240,20 +182,19 @@ function DrpReal({ style }) {
<DpTableRow key={row.stcd}> <DpTableRow key={row.stcd}>
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer" onClick={() => { <div className="table-ellipsis cursor-pointer" onClick={() => {
const { lgtd, lttd } = row; const { res_lon:lgtd, res_lat:lttd } = row;
const newLgtd = lgtd - 0.00122;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [newLgtd, lttd], center: [lgtd, lttd],
zoom: 15, zoom: 15,
pitch: 60, pitch: 60,
bearing: 0 bearing: 0
}); });
} }
}}>{row.stnm}</div> }}>{row.res_nm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{row.ddz}</DpTableCell> <DpTableCell align="center">{row.cd_nm}</DpTableCell>
<DpTableCell align="center">{row.zcxsw}</DpTableCell> <DpTableCell align="center">{row.du_value}</DpTableCell>
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>

View File

@ -19,7 +19,7 @@ const palleteLen = pallete.length;
const AreaDrpChart = ({rz}) => { const AreaDrpChart = () => {
const x = [ const x = [
"2025-06-02 15:00:00", "2025-06-02 15:00:00",
"2025-06-02 16:00:00", "2025-06-02 16:00:00",
@ -189,7 +189,7 @@ const AreaDrpChart = ({rz}) => {
axisTick: { axisTick: {
show: false, show: false,
}, },
// min: 133, min: 133,
// max: 135, // max: 135,
}, },
{ {
@ -232,7 +232,7 @@ const AreaDrpChart = ({rz}) => {
name: '水位', name: '水位',
type: 'line', type: 'line',
barWidth: 10, barWidth: 10,
data: y.map(o=>rz), data: y,
showSymbol: false, showSymbol: false,
itemStyle: { itemStyle: {
normal: { normal: {

View File

@ -9,7 +9,6 @@ import AreaDrpChart from './chart';
function DrpReal({ style }) { function DrpReal({ style }) {
const [dimension, setDimension] =useState('61614200'); const [dimension, setDimension] =useState('61614200');
const [rz,setRz] = useState(60.71)
const dispatch = useDispatch(); const dispatch = useDispatch();
const data = [ const data = [
{ {
@ -216,7 +215,6 @@ function DrpReal({ style }) {
const value = event.target.value; const value = event.target.value;
setDimension(value); setDimension(value);
const record = data.filter(o=>o.stcd===value)[0] const record = data.filter(o=>o.stcd===value)[0]
setRz(record.rz)
const { lgtd, lttd } = record; const { lgtd, lttd } = record;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [lgtd, lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [lgtd, lttd] });
@ -238,7 +236,7 @@ function DrpReal({ style }) {
</> </>
} }
> >
<AreaDrpChart data={[]} rz={rz}/> <AreaDrpChart data={[]} />
</PanelBox> </PanelBox>
) )
} }