lishenfeng
/
mcfxkh-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lishenfeng:28d9e50f80bc3ac40f4177cbf66487d9c1ea19c5
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:lsf-dev
...
compare: lishenfeng:d865b08d666905f77786aa6be1b6f808366f21dd
Branches Tags
lishenfeng:master
lishenfeng:qzc-dev
lishenfeng:lsf-dev

2 Commits
28d9e50f80 ... d865b08d66

Author SHA1 Message Date
秦子超 d865b08d66 合并代码 2025-06-12 14:12:14 +08:00
李神峰 31a4d43314 fix(): 水库数据修改 2025-06-12 14:10:02 +08:00
7 changed files with 1262 additions and 1233 deletions
Show Stats Expand all files Collapse all files

13
src/views/Home/InfoPops/RealSkPop/index.js
View File

@ -174,19 +174,26 @@ function RealSkTip({ record, dispatch,view }) {
const changePic = () => { const changePic = () => {
setpicidx([picidx[0] === 1 ? 2 : 1, picidx[1] === 1 ? 2 : 1]) setpicidx([picidx[0] === 1 ? 2 : 1, picidx[1] === 1 ? 2 : 1])
} }
const openSw = () => {
window.open("http://local.gunshiiot.com:18083/zhtmp/#/mgr/home")
}
return ( return (
<> <>
<div className="boxhead"></div> <div className="boxhead"></div>
<div className="featuretip-title"> <div className="featuretip-title">
<div className="name">{record.stnm} <div className="name">{record.stnm}
{ {record.stnm == '浮桥河水库' ?
record?.setView&&view===200? record?.setView&&view===200?
<span style={{cursor:'pointer',color:'#50b1f9'}} onClick={()=>{ <span style={{cursor:'pointer',color:'#50b1f9',marginLeft:20}} onClick={()=>{
dispatch.map.setView(203) dispatch.map.setView(203)
sessionStorage.setItem('lastCenter',JSON.stringify(record)) sessionStorage.setItem('lastCenter',JSON.stringify(record))
}}> 进入水库模块</span> }}> 进入水库模块</span>
:null : null :
record.stnm == '小玉潭水库' ?
<span style={{ cursor: 'pointer', color: '#50b1f9',marginLeft:20 }} onClick={openSw}>
进入三维模块
</span>:null
} }
</div> </div>
<div className="extra cursor-pointer" onClick={viewInfo}>详细</div> <div className="extra cursor-pointer" onClick={viewInfo}>详细</div>

2
src/views/Home/MapCtrl/index.js
View File

@ -143,7 +143,7 @@ export default function MapCtrl({ initParams, onLoad }) {
dispatch?.runtime.setInfoDlg({ layerId: 'SyjcLayer', properties: record }) dispatch?.runtime.setInfoDlg({ layerId: 'SyjcLayer', properties: record })
}else if (record.cd_nm == 'WE1') { }else if (record.cd_nm == 'WE1') {
dispatch?.runtime.setInfoDlg({ layerId: 'SljcLayer', properties: record }) dispatch?.runtime.setInfoDlg({ layerId: 'SljcLayer', properties: record })
}else if (record.cd_nm == '0EA5DE') { }else if (record.cd == '0AB3ED') {
dispatch?.runtime.setInfoDlg({ layerId: 'ByjcLayer', properties: record }) dispatch?.runtime.setInfoDlg({ layerId: 'ByjcLayer', properties: record })
}else if (record.stnm == '浮桥河水库') { }else if (record.stnm == '浮桥河水库') {
dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: record }) dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: record })

234
src/views/Home/panels/Byjc/index.js
View File

@ -1,4 +1,4 @@
import React, { useMemo, useState,useEffect } from 'react'; import React, { useMemo, useState, useEffect } from 'react';
import useRequest from '../../../../utils/useRequest'; import useRequest from '../../../../utils/useRequest';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector } from 'react-redux';
import PanelBox from '../../components/PanelBox'; import PanelBox from '../../components/PanelBox';
@ -19,7 +19,7 @@ import { parseGeoJSON } from "../../../../utils/tools";
function DrpReal({ style }) { function DrpReal({ style }) {
const [tab,setTab] = useState('1') const [tab, setTab] = useState('1')
const dispatch = useDispatch(); const dispatch = useDispatch();
const [dimension, setDimension] = useState('浮桥河水库'); const [dimension, setDimension] = useState('浮桥河水库');
const onChange = (event) => { const onChange = (event) => {
@ -28,14 +28,14 @@ function DrpReal({ style }) {
} }
const data1 = [ const data1 = [
{ {
"res_cd": "42118140035", "res_cd": "42118140035",
"lgtd": 114.88089, "lgtd": 114.88089,
"lttd": 31.171467, "lttd": 31.171467,
"cd": "01", "cd": "01",
"cd_nm": "GN1", "cd_nm": "GN1",
'stnm':'GN1', 'stnm': 'GN1',
dm:"0+60", dm: "0+60",
"res_reg_cd": "42118140006-A4", "res_reg_cd": "42118140006-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -69,8 +69,8 @@ function DrpReal({ style }) {
"lttd": 31.55095, "lttd": 31.55095,
"cd": "02", "cd": "02",
"cd_nm": "GN2", "cd_nm": "GN2",
'stnm':'GN2', 'stnm': 'GN2',
dm:"0+60", dm: "0+60",
"res_reg_cd": "42118140006-A4", "res_reg_cd": "42118140006-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -104,7 +104,7 @@ function DrpReal({ style }) {
"lttd": 31.55095, "lttd": 31.55095,
"cd": "04", "cd": "04",
"cd_nm": "GN3", "cd_nm": "GN3",
dm:"0+60", dm: "0+60",
"res_reg_cd": "42118140006-A4", "res_reg_cd": "42118140006-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -138,7 +138,7 @@ function DrpReal({ style }) {
"lttd": 30.88904, "lttd": 30.88904,
"cd": "01", "cd": "01",
"cd_nm": "GN1", "cd_nm": "GN1",
dm:"0+120", dm: "0+120",
"res_reg_cd": "42118140019-A4", "res_reg_cd": "42118140019-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -172,7 +172,7 @@ function DrpReal({ style }) {
"lttd": 30.88904, "lttd": 30.88904,
"cd": "02", "cd": "02",
"cd_nm": "GN2", "cd_nm": "GN2",
dm:"0+120", dm: "0+120",
"res_reg_cd": "42118140019-A4", "res_reg_cd": "42118140019-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -206,7 +206,7 @@ function DrpReal({ style }) {
"lttd": 30.95398, "lttd": 30.95398,
"cd": "03", "cd": "03",
"cd_nm": "GN3", "cd_nm": "GN3",
dm:"0+120", dm: "0+120",
"res_reg_cd": "42118140031-A4", "res_reg_cd": "42118140031-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -240,7 +240,7 @@ function DrpReal({ style }) {
"lttd": 30.88904, "lttd": 30.88904,
"cd": "03", "cd": "03",
"cd_nm": "GN1", "cd_nm": "GN1",
dm:"0+180", dm: "0+180",
"res_reg_cd": "42118140019-A4", "res_reg_cd": "42118140019-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -274,7 +274,7 @@ function DrpReal({ style }) {
"lttd": 31.1526, "lttd": 31.1526,
"cd": "02", "cd": "02",
"cd_nm": "GN2", "cd_nm": "GN2",
dm:"0+180", dm: "0+180",
"res_reg_cd": "42118140014-A4", "res_reg_cd": "42118140014-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -308,7 +308,7 @@ function DrpReal({ style }) {
"lttd": 30.88904, "lttd": 30.88904,
"cd": "04", "cd": "04",
"cd_nm": "GN3", "cd_nm": "GN3",
dm:"0+180", dm: "0+180",
"res_reg_cd": "42118140019-A4", "res_reg_cd": "42118140019-A4",
"ch": "0+000", "ch": "0+000",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -341,12 +341,12 @@ function DrpReal({ style }) {
{ {
"cd": "1", "cd": "1",
"cd_nm": "UPD1", "cd_nm": "UPD1",
stnm:'UPD1', stnm: 'UPD1',
"ch": "0+060", "ch": "0+060",
dm:"0+70", dm: "0+70",
"res_reg_cd": "42118140011-A4", "res_reg_cd": "42118140011-A4",
"res_cd": "42118140038", "res_cd": "42118140038",
"lgtd": 114.87929+ 0.0019, "lgtd": 114.87929 + 0.0019,
"lttd": 31.171467, "lttd": 31.171467,
"res_nm": "浮桥河水库", "res_nm": "浮桥河水库",
"province_cd": "420000000000", "province_cd": "420000000000",
@ -382,7 +382,7 @@ function DrpReal({ style }) {
"cd": "1", "cd": "1",
"cd_nm": "UPD2", "cd_nm": "UPD2",
"ch": "0+027", "ch": "0+027",
dm:"0+70", dm: "0+70",
"res_reg_cd": "42118140006-A4", "res_reg_cd": "42118140006-A4",
"res_cd": "42118140035", "res_cd": "42118140035",
"lgtd": 115.14137, "lgtd": 115.14137,
@ -421,7 +421,7 @@ function DrpReal({ style }) {
"cd": "3", "cd": "3",
"cd_nm": "UPD3", "cd_nm": "UPD3",
"ch": "0+070", "ch": "0+070",
dm:"0+70", dm: "0+70",
"res_reg_cd": "42118140011-A4", "res_reg_cd": "42118140011-A4",
"res_cd": "42118140038", "res_cd": "42118140038",
"lgtd": 115.01664, "lgtd": 115.01664,
@ -460,7 +460,7 @@ function DrpReal({ style }) {
"cd": "1", "cd": "1",
"cd_nm": "UPD1", "cd_nm": "UPD1",
"ch": "0+038", "ch": "0+038",
dm:"0+140", dm: "0+140",
"res_reg_cd": "42118140014-A4", "res_reg_cd": "42118140014-A4",
"res_cd": "42118140022", "res_cd": "42118140022",
"lgtd": 115.39612, "lgtd": 115.39612,
@ -500,7 +500,7 @@ function DrpReal({ style }) {
"cd": "4", "cd": "4",
"cd_nm": "UPD2", "cd_nm": "UPD2",
"ch": "0+085", "ch": "0+085",
dm:"0+140", dm: "0+140",
"res_reg_cd": "42118140020-A4", "res_reg_cd": "42118140020-A4",
"res_cd": "42118140032", "res_cd": "42118140032",
"lgtd": 115.13073, "lgtd": 115.13073,
@ -539,7 +539,7 @@ function DrpReal({ style }) {
"cd": "1", "cd": "1",
"cd_nm": "UPD3", "cd_nm": "UPD3",
"ch": "0+51.6", "ch": "0+51.6",
dm:"0+140", dm: "0+140",
"res_reg_cd": "42118140042-A4", "res_reg_cd": "42118140042-A4",
"res_cd": "42118140004", "res_cd": "42118140004",
@ -582,11 +582,11 @@ function DrpReal({ style }) {
"cd": "1", "cd": "1",
"cd_nm": "WE1", "cd_nm": "WE1",
"ch": "1", "ch": "1",
'stnm':'WE1', 'stnm': 'WE1',
"res_reg_cd": "42118140042-A4", "res_reg_cd": "42118140042-A4",
"res_cd": "42118140004", "res_cd": "42118140004",
"res_nm": "浮桥河水库", "res_nm": "浮桥河水库",
"lgtd": 114.88429- 0.0029, "lgtd": 114.88429 - 0.0029,
"lttd": 31.172700, "lttd": 31.172700,
"province_cd": "420000000000", "province_cd": "420000000000",
"province_nm": "湖北省", "province_nm": "湖北省",
@ -609,10 +609,42 @@ function DrpReal({ style }) {
}, },
] ]
const data4 = [ const data4 = [
{
"res_cd": "42118140015",
"res_nm": "麻城坳水库",
"cd": '0AB3ED',
"stnm": "0AB3ED",
"province_cd": "420000000000",
"province_nm": "湖北省",
"city_cd": "421100000000",
"city_nm": "黄冈市",
"county_cd": "421181000000",
"county_nm": "麻城市",
"town_cd": "421181107000",
"town_nm": "盐田河镇",
"rv_name": "举水",
"bas_guid": "鄂东五河片区",
"lgtd": 114.88299 - 0.0019,
"lttd": 31.172700 - 0.0001,
"res_reg_cd": "42118140025-A4",
"eng_scal": "小（1）型",
"eng_g": "IV",
"children": [
{
"res_cd": "42118140015",
"res_nm": "麻城坳水库",
"cd": "0AB3ED",
"cd_nm": "麻城坳水库",
"termite_status": "y",
"tm": "2025-05-21 04:27:18",
"is_main_cd": "y"
}
]
},
{ {
"res_cd": "42118140035", "res_cd": "42118140035",
"lgtd": 114.88299- 0.0019, "lgtd": 114.88299 - 0.0019,
"lttd": 31.172700- 0.0001, "lttd": 31.172700 - 0.0001,
"cd": "01", "cd": "01",
"cd_nm": "0EA5DE", "cd_nm": "0EA5DE",
"stnm": "0EA5DE", "stnm": "0EA5DE",
@ -747,36 +779,7 @@ function DrpReal({ style }) {
} }
] ]
}, },
{
"res_cd": "42118140015",
"res_nm": "麻城坳水库",
"province_cd": "420000000000",
"province_nm": "湖北省",
"city_cd": "421100000000",
"city_nm": "黄冈市",
"county_cd": "421181000000",
"county_nm": "麻城市",
"town_cd": "421181107000",
"town_nm": "盐田河镇",
"rv_name": "举水",
"bas_guid": "鄂东五河片区",
"lgtd": 115.22541,
"lttd": 30.98156,
"res_reg_cd": "42118140025-A4",
"eng_scal": "小（1）型",
"eng_g": "IV",
"children": [
{
"res_cd": "42118140015",
"res_nm": "麻城坳水库",
"cd": "0AB3ED",
"cd_nm": "麻城坳水库",
"termite_status": "y",
"tm": "2025-05-21 04:27:18",
"is_main_cd": "y"
}
]
},
] ]
const skdata = [ const skdata = [
{ {
@ -911,50 +914,50 @@ function DrpReal({ style }) {
"rzState": 2, "rzState": 2,
"aRz": -17.4 "aRz": -17.4
} }
] ]
const [showbx, setShowdbx] = useState(0) const [showbx, setShowdbx] = useState(0)
const [showsy, setShowdsy] = useState(0) const [showsy, setShowdsy] = useState(0)
const [showsl, setShowdsl] = useState(0) const [showsl, setShowdsl] = useState(0)
const [showby, setShowdby] = useState(0) const [showby, setShowdby] = useState(0)
useEffect(()=>{ useEffect(() => {
const map = window.__mapref; const map = window.__mapref;
if (map) { if (map) {
if(tab==='1'&&data1 && showbx){ if (tab === '1' && data1 && showbx) {
setLayer(data1,'变形') setLayer(data1, '变形')
} }
if (tab === '2' && data2 && showsy) { if (tab === '2' && data2 && showsy) {
setLayer(data2,'渗压') setLayer(data2, '渗压')
} }
if(tab==='3'&&data3 && showsl){ if (tab === '3' && data3 && showsl) {
setLayer(data3,'渗流') setLayer(data3, '渗流')
} }
if(tab==='4'&&data4&& showby){ if (tab === '4' && data4 && showby) {
setLayer(data4,'白蚁') setLayer(data4, '白蚁')
} }
} }
else { else {
const dsq = setInterval(() => { const dsq = setInterval(() => {
const map = window.__mapref; const map = window.__mapref;
if(map && skdata.length>0){ if (map && skdata.length > 0) {
clearInterval(dsq) clearInterval(dsq)
setLayer(skdata,'sk') setLayer(skdata, 'sk')
} }
}, 500); }, 500);
} }
},[data1,data2,data3,data4,tab,showbx,showsy,showsl,showby]) }, [data1, data2, data3, data4, tab, showbx, showsy, showsl, showby])
const setLayer = (data=[],type)=>{ const setLayer = (data = [], type) => {
const map = window.__mapref; const map = window.__mapref;
const layer = map.getLayer('关联站点') const layer = map.getLayer('关联站点')
if(layer){ if (layer) {
map.removeLayer('关联站点'); map.removeLayer('关联站点');
map.removeSource('关联站点'); map.removeSource('关联站点');
} }
if(data.length===0){return} if (data.length === 0) { return }
if(type==='变形'){ if (type === '变形') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -997,7 +1000,7 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='渗压'){ if (type === '渗压') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -1040,7 +1043,7 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='渗流'){ if (type === '渗流') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -1127,7 +1130,7 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='sk'){ if (type === 'sk') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -1174,13 +1177,13 @@ function DrpReal({ style }) {
map.getSource('关联站点').setData(parseGeoJSON(data)) map.getSource('关联站点').setData(parseGeoJSON(data))
} }
useEffect(() => { useEffect(() => {
setShowdbx(0) setShowdbx(0)
setShowdsy(0) setShowdsy(0)
setShowdsl(0) setShowdsl(0)
setShowdby(0) setShowdby(0)
}, [tab]) }, [tab])
return ( return (
<PanelBox <PanelBox
style={style} style={style}
@ -1189,16 +1192,16 @@ useEffect(() => {
extra={ extra={
<> <>
<span className="button-group"> <span className="button-group">
<span className={clsx({ active: tab==='1' })} onClick={() => { <span className={clsx({ active: tab === '1' })} onClick={() => {
setTab('1') setTab('1')
}}>变形</span> }}>变形</span>
<span className={clsx({ active: tab === '2' })} onClick={() => { <span className={clsx({ active: tab === '2' })} onClick={() => {
setTab('2') setTab('2')
}}>渗压</span> }}>渗压</span>
<span className={clsx({ active: tab==='3' })} onClick={() => { <span className={clsx({ active: tab === '3' })} onClick={() => {
setTab('3') setTab('3')
}}>渗流</span> }}>渗流</span>
<span className={clsx({ active: tab==='4' })} onClick={() => { <span className={clsx({ active: tab === '4' })} onClick={() => {
setTab('4') setTab('4')
}}>白蚁</span> }}>白蚁</span>
@ -1221,11 +1224,11 @@ useEffect(() => {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{data1.map((row,index) => ( {data1.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow
<DpTableCell align="center"> key={row.stcd}
<div className="table-ellipsis cursor-pointer" onClick={() => { onClick={() => {
const {lgtd, lttd,res_nm:stnm } = row; const { lgtd, lttd, res_nm: stnm } = row;
if (stnm == '浮桥河水库') { if (stnm == '浮桥河水库') {
setShowdbx(1) setShowdbx(1)
if (lgtd && lttd) { if (lgtd && lttd) {
@ -1237,7 +1240,11 @@ useEffect(() => {
}); });
} }
} }
}}>{row.dm}</div> }}
>
<DpTableCell align="center">
<div className="table-ellipsis cursor-pointer"
>{row.dm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{row.cd_nm}</DpTableCell> <DpTableCell align="center">{row.cd_nm}</DpTableCell>
<DpTableCell align="center">{row.du_value}</DpTableCell> <DpTableCell align="center">{row.du_value}</DpTableCell>
@ -1262,11 +1269,11 @@ useEffect(() => {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{data2.map((row,index) => ( {data2.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow
<DpTableCell align="center"> key={row.stcd}
<div className="table-ellipsis cursor-pointer" onClick={() => { onClick={() => {
const { lgtd, lttd,res_nm:stnm } = row; const { lgtd, lttd, res_nm: stnm } = row;
if (stnm == '浮桥河水库') { if (stnm == '浮桥河水库') {
setShowdsy(1) setShowdsy(1)
if (lgtd && lttd) { if (lgtd && lttd) {
@ -1278,7 +1285,11 @@ useEffect(() => {
}); });
} }
} }
}}>{row.dm}</div> }}
>
<DpTableCell align="center">
<div className="table-ellipsis cursor-pointer"
>{row.dm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{row.cd_nm}</DpTableCell> <DpTableCell align="center">{row.cd_nm}</DpTableCell>
<DpTableCell align="center">{row.value}</DpTableCell> <DpTableCell align="center">{row.value}</DpTableCell>
@ -1287,7 +1298,7 @@ useEffect(() => {
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
{ {
tab == '3' ? <Table size="small" stickyHeader> tab == '3' ? <Table size="small" stickyHeader>
@ -1299,10 +1310,10 @@ useEffect(() => {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{data3.map((row,index) => ( {data3.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow
<DpTableCell align="center"> key={row.stcd}
<div className="table-ellipsis cursor-pointer" onClick={() => { onClick={() => {
const { lgtd, lttd } = row; const { lgtd, lttd } = row;
setShowdsl(1) setShowdsl(1)
if (row.cd == 1) { if (row.cd == 1) {
@ -1316,7 +1327,11 @@ useEffect(() => {
} }
} }
}}>{row.cd_nm}</div> }}
>
<DpTableCell align="center">
<div className="table-ellipsis cursor-pointer"
>{row.cd_nm}</div>
</DpTableCell> </DpTableCell>
{/* <DpTableCell align="center">{row.cd_nm}</DpTableCell> */} {/* <DpTableCell align="center">{row.cd_nm}</DpTableCell> */}
<DpTableCell align="center">{row.value}</DpTableCell> <DpTableCell align="center">{row.value}</DpTableCell>
@ -1324,7 +1339,7 @@ useEffect(() => {
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
{ {
tab == '4' ? <Table size="small" stickyHeader> tab == '4' ? <Table size="small" stickyHeader>
@ -1337,14 +1352,13 @@ useEffect(() => {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{data4.map((row,index) => ( {data4.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow
<DpTableCell align="center"> key={row.stcd}
<div className="table-ellipsis cursor-pointer" onClick={() => { onClick={() => {
const { lgtd, lttd } = row; const { lgtd, lttd } = row;
setShowdby(1) setShowdby(1)
if (row.cd == '0EA5DE') { if (row.cd == '0AB3ED') {
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setCameraTarget({ dispatch.runtime.setCameraTarget({
center: [lgtd, lttd], center: [lgtd, lttd],
@ -1354,15 +1368,19 @@ useEffect(() => {
}); });
} }
} }
}}>{row?.children?.[0]?.cd}</div> }}
>
<DpTableCell align="center">
<div className="table-ellipsis cursor-pointer"
>{row?.children?.[0]?.cd}</div>
</DpTableCell> </DpTableCell>
{/* <DpTableCell align="center">{row?.children?.[0]?.cd}</DpTableCell> */} {/* <DpTableCell align="center">{row?.children?.[0]?.cd}</DpTableCell> */}
<DpTableCell align="center">{row?.children?.[0]?.termite_status==='y'?<span style={{color:'#ff4d4f',display:'flex',alignItems:'center'}}><div style={{width:'10px',height:'10px',borderRadius:'10px',marginRight:'7px',background:'#ff4d4f'}}></div>有白蚁</span>:<span style={{color:'#3af6cd',display:'flex',alignItems:'center'}}><div style={{width:'10px',height:'10px',borderRadius:'10px',marginRight:'7px',background:'#3af6cd'}}></div>无白蚁</span>}</DpTableCell> <DpTableCell align="center">{row?.children?.[0]?.termite_status === 'y' ? <span style={{ color: '#ff4d4f', display: 'flex', alignItems: 'center' }}><div style={{ width: '10px', height: '10px', borderRadius: '10px', marginRight: '7px', background: '#ff4d4f' }}></div>有白蚁</span> : <span style={{ color: '#3af6cd', display: 'flex', alignItems: 'center' }}><div style={{ width: '10px', height: '10px', borderRadius: '10px', marginRight: '7px', background: '#3af6cd' }}></div>无白蚁</span>}</DpTableCell>
<DpTableCell align="center"> <div className="table-ellipsis cursor-pointer">{row?.children?.[0]?.tm}</div></DpTableCell> <DpTableCell align="center"> <div className="table-ellipsis cursor-pointer">{row?.children?.[0]?.tm}</div></DpTableCell>
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
</TableContainer> </TableContainer>

6
src/views/Home/panels/Cxsk/ARzSk.js
View File

@ -194,12 +194,12 @@ function ARzSk({data}) {
{ {
data.map((tableRow,index)=> data.map((tableRow,index)=>
<TableBody> <TableBody>
<DpTableRow key={tableRow.stcd}> <DpTableRow key={tableRow.stcd} onClick={()=>{
<DpTableCell align="center" >
<div className="table-ellipsis cursor-pointer" onClick={()=>{
flyTo(tableRow) flyTo(tableRow)
setSkLayer([tableRow]) setSkLayer([tableRow])
}}> }}>
<DpTableCell align="center" >
<div className="table-ellipsis cursor-pointer" >
{tableRow.stnm} {tableRow.stnm}
</div> </div>
</DpTableCell> </DpTableCell>

238
src/views/Home/panels/Glzd/index.js
View File

@ -47,8 +47,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61612910", "stcd": "61612910",
"stnm": "桃林河(阎河)", "stnm": "桃林河(阎河)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -69,8 +69,8 @@ const data1 = [
"tm": "2025-06-03T02:10:00.000Z", "tm": "2025-06-03T02:10:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61613700", "stcd": "61613700",
"stnm": "四角门(宋铁二桥)", "stnm": "四角门(宋铁二桥)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -91,8 +91,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61614460", "stcd": "61614460",
"stnm": "项生(宋埠)", "stnm": "项生(宋埠)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -113,8 +113,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61615110", "stcd": "61615110",
"stnm": "杨梅河(木子店)", "stnm": "杨梅河(木子店)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -135,8 +135,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61640390", "stcd": "61640390",
"stnm": "两路口(福田河)", "stnm": "两路口(福田河)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -157,8 +157,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61640700", "stcd": "61640700",
"stnm": "新屋河(黄土岗)", "stnm": "新屋河(黄土岗)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -179,8 +179,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61640850", "stcd": "61640850",
"stnm": "喻家垸(黄土岗)", "stnm": "喻家垸(黄土岗)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -201,8 +201,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61640900", "stcd": "61640900",
"stnm": "得胜寨(乘马岗)", "stnm": "得胜寨(乘马岗)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -223,8 +223,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61640960", "stcd": "61640960",
"stnm": "桐枧冲(黄土岗)", "stnm": "桐枧冲(黄土岗)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -245,8 +245,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61640970", "stcd": "61640970",
"stnm": "闵家畈(黄土岗)", "stnm": "闵家畈(黄土岗)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -267,8 +267,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61640980", "stcd": "61640980",
"stnm": "飞龙山(乘马岗)", "stnm": "飞龙山(乘马岗)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -289,8 +289,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61641500", "stcd": "61641500",
"stnm": "黄金桥(开发区)", "stnm": "黄金桥(开发区)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -311,8 +311,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61641610", "stcd": "61641610",
"stnm": "张广河(三河口)", "stnm": "张广河(三河口)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -333,8 +333,8 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
{ {
"stcd": "61641700", "stcd": "61641700",
"stnm": "前畈(三河口)", "stnm": "前畈(三河口)",
"adcd": "421181000000000", "adcd": "421181000000000",
@ -355,7 +355,7 @@ const data1 = [
"tm": "2025-06-03T02:00:00.000Z", "tm": "2025-06-03T02:00:00.000Z",
"state": 1, "state": 1,
"warning": 0 "warning": 0
}, },
] ]
const data2 = [ const data2 = [
{ {
@ -585,22 +585,23 @@ const data3 = [
time: '2025-05-26 10:00', time: '2025-05-26 10:00',
stcd: 42000002, stcd: 42000002,
stnm: '汉通闸流量站', stnm: '汉通闸流量站',
water:30, water: 30,
flow: 0.222, flow: 0.222,
"lttd": 30.973775 + 0.2002, "lttd": 30.973775 + 0.2002,
"lgtd": 112.17597 +2.9619, "lgtd": 112.17597 + 2.9619,
}, },
{ water:12, {
water: 12,
type: '工业', type: '工业',
stcd: 42000001, stcd: 42000001,
time: '2025-05-26 10:00', time: '2025-05-26 10:00',
stnm: '福耀玻璃', stnm: '福耀玻璃',
flow: 0.355, flow: 0.355,
"lttd": 30.93926+0.2002, "lttd": 30.93926 + 0.2002,
"lgtd": 112.191703+ 2.9619, "lgtd": 112.191703 + 2.9619,
}, { }, {
water:21, water: 21,
type: '工业', type: '工业',
time: '2025-05-26 10:00', time: '2025-05-26 10:00',
stnm: '格林美', stnm: '格林美',
@ -866,120 +867,120 @@ const data5 = [
] ]
function DrpReal({ style }) { function DrpReal({ style }) {
const [tab,setTab] = useState('1') const [tab, setTab] = useState('1')
const [drpData,setDrpData] = useState([]) const [drpData, setDrpData] = useState([])
const [hdData,setHdData] = useState([]) const [hdData, setHdData] = useState([])
const dispatch = useDispatch(); const dispatch = useDispatch();
const skObj = useSelector(s => s.runtime.skObj); const skObj = useSelector(s => s.runtime.skObj);
useEffect(()=>{ useEffect(() => {
getDrp(skObj) getDrp(skObj)
getHd(skObj) getHd(skObj)
return ()=>{ return () => {
const map = window.__mapref; const map = window.__mapref;
const layer = map.getLayer('关联站点') const layer = map.getLayer('关联站点')
if(layer){ if (layer) {
map.removeLayer('关联站点'); map.removeLayer('关联站点');
map.removeSource('关联站点'); map.removeSource('关联站点');
} }
} }
},[skObj]) }, [skObj])
const [showDrp, setShowdDrp] = useState(0) const [showDrp, setShowdDrp] = useState(0)
const [showHd, setShowdHd] = useState(0) const [showHd, setShowdHd] = useState(0)
useEffect(()=>{ useEffect(() => {
const map = window.__mapref; const map = window.__mapref;
if(map){ if (map) {
if(tab==='1'&&drpData && showDrp){ if (tab === '1' && drpData && showDrp) {
setLayer(drpData,'drp') setLayer(drpData, 'drp')
} }
if(tab==='2'&&hdData && showHd){ if (tab === '2' && hdData && showHd) {
setLayer(hdData,'hd') setLayer(hdData, 'hd')
} }
if(tab==='3'&&data3){ if (tab === '3' && data3) {
setLayer(data3,'ll') setLayer(data3, 'll')
} }
if(tab==='4'&&data4){ if (tab === '4' && data4) {
setLayer(data4,'tx') setLayer(data4, 'tx')
} }
if(tab==='5'&&data5){ if (tab === '5' && data5) {
setLayer(data5,'sk') setLayer(data5, 'sk')
} }
}else{ } else {
const dsq = setInterval(() => { const dsq = setInterval(() => {
const map = window.__mapref; const map = window.__mapref;
if(map && drpData.length>0){ if (map && drpData.length > 0) {
clearInterval(dsq) clearInterval(dsq)
setLayer(drpData,'drp') setLayer(drpData, 'drp')
} }
}, 500); }, 500);
} }
},[drpData,hdData,skObj,tab,showDrp,showHd]) }, [drpData, hdData, skObj, tab, showDrp, showHd])
const getDrp = async(skObj)=>{ const getDrp = async (skObj) => {
const { lgtd, lttd } = skObj const { lgtd, lttd } = skObj
const step = 0.05 const step = 0.05
let data = await DrpRealPromise.get(); let data = await DrpRealPromise.get();
if (Array.isArray(data)) { if (Array.isArray(data)) {
data = data.filter(o => { data = data.filter(o => {
if(o.type !== 'sk'){ if (o.type !== 'sk') {
if( if (
lgtd-step<o.lgtd && o.lgtd<lgtd+step && lgtd - step < o.lgtd && o.lgtd < lgtd + step &&
lttd-step<o.lttd && o.lttd<lttd+step lttd - step < o.lttd && o.lttd < lttd + step
){return true} ) { return true }
else{ else {
return false return false
} }
}else{ } else {
return false return false
} }
}); });
} }
const newData = [data[1],data[0]] const newData = [data[1], data[0]]
setDrpData(newData) setDrpData(newData)
} }
const getHd = async(skObj)=>{ const getHd = async (skObj) => {
const { lgtd, lttd } = skObj const { lgtd, lttd } = skObj
const step = 0.1 const step = 0.1
let data = await HDRealPromise.get(); let data = await HDRealPromise.get();
if (Array.isArray(data)) { if (Array.isArray(data)) {
data = data.filter(o => { data = data.filter(o => {
if(o.type !== 'sk'){ if (o.type !== 'sk') {
if( if (
lgtd-step<o.lgtd && o.lgtd<lgtd+step && lgtd - step < o.lgtd && o.lgtd < lgtd + step &&
lttd-step<o.lttd && o.lttd<lttd+step lttd - step < o.lttd && o.lttd < lttd + step
){return true} ) { return true }
else{ else {
return false return false
} }
}else{ } else {
return false return false
} }
}); });
} }
const newData = [data[1],data[0]] const newData = [data[1], data[0]]
setHdData(newData) setHdData(newData)
} }
const setLayer = (data=[],type)=>{ const setLayer = (data = [], type) => {
const map = window.__mapref; const map = window.__mapref;
const layer = map.getLayer('关联站点') const layer = map.getLayer('关联站点')
if(layer){ if (layer) {
map.removeLayer('关联站点'); map.removeLayer('关联站点');
map.removeSource('关联站点'); map.removeSource('关联站点');
} }
if(data.length===0){return} if (data.length === 0) { return }
if(type==='drp'){ if (type === 'drp') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'circle', 'type': 'circle',
@ -1038,7 +1039,7 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='hd'){ if (type === 'hd') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -1079,7 +1080,7 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='ll'){ if (type === 'll') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -1122,7 +1123,7 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='tx'){ if (type === 'tx') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -1166,7 +1167,7 @@ function DrpReal({ style }) {
'visibility': 'visible', 'visibility': 'visible',
}); });
} }
if(type==='sk'){ if (type === 'sk') {
map.addLayer({ map.addLayer({
'id': '关联站点',//+new Date().getTime(), 'id': '关联站点',//+new Date().getTime(),
'type': 'symbol', 'type': 'symbol',
@ -1231,11 +1232,11 @@ function DrpReal({ style }) {
color="green" color="green"
tabs={ tabs={
<span className="button-group"> <span className="button-group">
<span className={clsx({ active: tab==='1' })} onClick={() => { <span className={clsx({ active: tab === '1' })} onClick={() => {
setTab('1') setTab('1')
}}>雨量站</span> }}>雨量站</span>
<span className={clsx({ active: tab==='2' })} onClick={() => { <span className={clsx({ active: tab === '2' })} onClick={() => {
setTab('2') setTab('2')
}}>水位站</span> }}>水位站</span>
{/* <span className={clsx({ active: tab==='3' })} onClick={() => { {/* <span className={clsx({ active: tab==='3' })} onClick={() => {
@ -1253,7 +1254,7 @@ function DrpReal({ style }) {
<TableContainer style={{ height: '100%' }}> <TableContainer style={{ height: '100%' }}>
{ {
tab==='1'? tab === '1' ?
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
<TableRow> <TableRow>
@ -1264,11 +1265,10 @@ function DrpReal({ style }) {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{drpData.map((row,index) => ( {drpData.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow
{/* <DpTableCell align="center">{index+1}</DpTableCell> */} key={row.stcd}
<DpTableCell component="th" scope="row"> onClick={() => {
<div className="table-ellipsis cursor-pointer" onClick={() => {
const { lgtd, lttd } = row; const { lgtd, lttd } = row;
if (row.stnm == '浮桥河') { if (row.stnm == '浮桥河') {
setShowdDrp(1) setShowdDrp(1)
@ -1282,17 +1282,21 @@ function DrpReal({ style }) {
}); });
} }
} }
}}>{row.stnm}</div> }}
>
{/* <DpTableCell align="center">{index+1}</DpTableCell> */}
<DpTableCell component="th" scope="row">
<div className="table-ellipsis cursor-pointer">{row.stnm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{(row.h1).toFixed(2)}</DpTableCell> <DpTableCell align="center">{(row.h1).toFixed(2)}</DpTableCell>
<DpTableCell align="center">{row.tm.slice(0,10)}</DpTableCell> <DpTableCell align="center">{row.tm.slice(0, 10)}</DpTableCell>
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
{ {
tab==='2'? tab === '2' ?
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
<TableRow> <TableRow>
@ -1303,7 +1307,7 @@ function DrpReal({ style }) {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{hdData.map((row,index) => ( {hdData.map((row, index) => (
<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={() => {
@ -1323,15 +1327,15 @@ function DrpReal({ style }) {
}}>{row.stnm}</div> }}>{row.stnm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{row.rz}</DpTableCell> <DpTableCell align="center">{row.rz}</DpTableCell>
<DpTableCell align="center">{row.rz+5.5}</DpTableCell> <DpTableCell align="center">{row.rz + 5.5}</DpTableCell>
<DpTableCell align="center">{row.rz+4}</DpTableCell> <DpTableCell align="center">{row.rz + 4}</DpTableCell>
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
{ {
tab==='3'? tab === '3' ?
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
<TableRow> <TableRow>
@ -1343,7 +1347,7 @@ function DrpReal({ style }) {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{data3.map((row,index) => ( {data3.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow key={row.stcd}>
{/* <DpTableCell align="center">{index+1}</DpTableCell> */} {/* <DpTableCell align="center">{index+1}</DpTableCell> */}
<DpTableCell component="th" scope="row"> <DpTableCell component="th" scope="row">
@ -1366,10 +1370,10 @@ function DrpReal({ style }) {
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
{ {
tab==='4'? tab === '4' ?
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
<TableRow> <TableRow>
@ -1379,11 +1383,11 @@ function DrpReal({ style }) {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{data4.map((row,index) => ( {data4.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow key={row.stcd}>
<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 { lgtd, lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'PicStPop', properties: row, coordinates: [row.lgtd, row.lttd] }); dispatch.runtime.setFeaturePop({ type: 'PicStPop', properties: row, coordinates: [row.lgtd, row.lttd] });
@ -1396,14 +1400,14 @@ function DrpReal({ style }) {
} }
}}>{row.stnm}</div> }}>{row.stnm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{<span style={{color:'#3af6cd',display:'flex',alignItems:'center',marginLeft:'30px'}}><div style={{width:'10px',height:'10px',borderRadius:'10px',marginRight:'7px',background:'#3af6cd'}}></div>在线</span>}</DpTableCell> <DpTableCell align="center">{<span style={{ color: '#3af6cd', display: 'flex', alignItems: 'center', marginLeft: '30px' }}><div style={{ width: '10px', height: '10px', borderRadius: '10px', marginRight: '7px', background: '#3af6cd' }}></div>在线</span>}</DpTableCell>
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
{ {
tab==='5'? tab === '5' ?
<Table size="small" stickyHeader> <Table size="small" stickyHeader>
<TableHead> <TableHead>
<TableRow> <TableRow>
@ -1414,11 +1418,11 @@ function DrpReal({ style }) {
</TableRow> </TableRow>
</TableHead> </TableHead>
<TableBody> <TableBody>
{data5.map((row,index) => ( {data5.map((row, index) => (
<DpTableRow key={row.stcd}> <DpTableRow key={row.stcd}>
<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 { lgtd, lttd } = row;
if (lgtd && lttd) { if (lgtd && lttd) {
dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] }); dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] });
@ -1432,14 +1436,14 @@ function DrpReal({ style }) {
}}>{row.res_nm}</div> }}>{row.res_nm}</div>
</DpTableCell> </DpTableCell>
<DpTableCell align="center">{row.town_nm}</DpTableCell> <DpTableCell align="center">{row.town_nm}</DpTableCell>
<DpTableCell align="center">{row.online==='1'? <DpTableCell align="center">{row.online === '1' ?
<span style={{color:'#3af6cd',display:'flex',alignItems:'center',justifyContent:'center'}}><div style={{width:'10px',height:'10px',borderRadius:'10px',marginRight:'7px',background:'#3af6cd'}}></div>在线</span> <span style={{ color: '#3af6cd', display: 'flex', alignItems: 'center', justifyContent: 'center' }}><div style={{ width: '10px', height: '10px', borderRadius: '10px', marginRight: '7px', background: '#3af6cd' }}></div>在线</span>
:<span style={{color:'#eeeeee',display:'flex',alignItems:'center',justifyContent:'center'}}><div style={{width:'10px',height:'10px',borderRadius:'10px',marginRight:'7px',background:'#eeeeee'}}></div>离线</span> : <span style={{ color: '#eeeeee', display: 'flex', alignItems: 'center', justifyContent: 'center' }}><div style={{ width: '10px', height: '10px', borderRadius: '10px', marginRight: '7px', background: '#eeeeee' }}></div>离线</span>
}</DpTableCell> }</DpTableCell>
</DpTableRow> </DpTableRow>
))} ))}
</TableBody> </TableBody>
</Table>:null </Table> : null
} }
</TableContainer> </TableContainer>
</PanelBox> </PanelBox>

2
src/views/Home/panels/Skzl/collapsePage.js
View File

@ -8,7 +8,7 @@ function Page({ type,name,num1,num2,skType,setSkType,icon }) {
<img src={`${process.env.PUBLIC_URL}/assets/icon/${icon}`} width={15} height={15} alt=""/> <img src={`${process.env.PUBLIC_URL}/assets/icon/${icon}`} width={15} height={15} alt=""/>
<div style={{flex:1,paddingLeft:'0.8rem',marginBottom:'-0.1rem'}}>{name}</div> <div style={{flex:1,paddingLeft:'0.8rem',marginBottom:'-0.1rem'}}>{name}</div>
<div style={{marginBottom:'-0.1rem'}}>{num1}座</div> <div style={{marginBottom:'-0.1rem'}}>{num1}座</div>
<div style={{margin:'0 1rem -0.1rem 1rem'}}>{num2}亿m³</div> <div style={{ margin: '0 1rem -0.1rem 1rem' }}>{num2}{(type !=1 && type != 2) ?"万m³":"亿m³"}</div>
<img src={`${process.env.PUBLIC_URL}/assets/icon/${skType===type?'收起':'展开'}.png`} style={{cursor:'pointer'}} width={20} alt="" /> <img src={`${process.env.PUBLIC_URL}/assets/icon/${skType===type?'收起':'展开'}.png`} style={{cursor:'pointer'}} width={20} alt="" />
</div> </div>
) )

2
src/views/Home/panels/Skzl/index.js
View File

@ -136,7 +136,7 @@ function DrpReal({ style }) {
{ {
skTypeObj.map((item) => skTypeObj.map((item) =>
(<> (<>
<CollapsePage type={item.type} icon={item.icon} name={item.name} num1={item.num1} num2={item.num2} skType={skType} setSkType={setSkType} /> <CollapsePage type={item.type} name={item.name} num1={item.num1} num2={`${item.num2}/${item.num3}`} skType={skType} setSkType={setSkType} />
<Collapse in={skType === item.type} timeout="auto" unmountOnExit> <Collapse in={skType === item.type} timeout="auto" unmountOnExit>
<TableContainer style={{ maxHeight: 'calc( 100vh - 28.2rem )' }}> <TableContainer style={{ maxHeight: 'calc( 100vh - 28.2rem )' }}>
<Table size="small" stickyHeader> <Table size="small" stickyHeader>