+
-
+ /> */}
{/* */}
diff --git a/src/views/Home/InfoDlg/HistoryYyDlg/index.less b/src/views/Home/InfoDlg/HistoryYyDlg/index.less
index 1821544..86d032a 100644
--- a/src/views/Home/InfoDlg/HistoryYyDlg/index.less
+++ b/src/views/Home/InfoDlg/HistoryYyDlg/index.less
@@ -1,6 +1,12 @@
.yy-left,.yy-right{
- width:450px
+ width:450px;
+ background: rgba(6, 34, 56, .8);
}
.yy-middle{
width: 1000px;
+}
+.yy-contents{
+ display: flex;
+ background:url(../../../../assets/yybg.png) no-repeat;
+ background-size: 100% 100%;
}
\ No newline at end of file
diff --git a/src/views/Home/InfoDlg/HistoryYyDlg/rightYy.js b/src/views/Home/InfoDlg/HistoryYyDlg/rightYy.js
index 33259fa..1f3c089 100644
--- a/src/views/Home/InfoDlg/HistoryYyDlg/rightYy.js
+++ b/src/views/Home/InfoDlg/HistoryYyDlg/rightYy.js
@@ -153,7 +153,7 @@ const RainfallMonitor = () => {
-
+
{
tabValue == 0 ? <>
@@ -213,10 +213,6 @@ const RainfallMonitor = () => {
:
}
-
-
-
-
);
};
diff --git a/src/views/Home/InfoDlg/SkSmtp/index.js b/src/views/Home/InfoDlg/SkSmtp/index.js
index 939f7ed..055fc05 100644
--- a/src/views/Home/InfoDlg/SkSmtp/index.js
+++ b/src/views/Home/InfoDlg/SkSmtp/index.js
@@ -24,7 +24,7 @@ function SkSmtp({ record, onClose }) {
- {record.stnm}
+ {record.stnm}
diff --git a/src/views/Home/panels/Jcgjz/index.js b/src/views/Home/panels/Jcgjz/index.js
index 82eec50..b287821 100644
--- a/src/views/Home/panels/Jcgjz/index.js
+++ b/src/views/Home/panels/Jcgjz/index.js
@@ -50,7 +50,7 @@ function HDReal({ style }) {
return (
diff --git a/src/views/Home/panels/Skzl/countPage.js b/src/views/Home/panels/Skzl/countPage.js
index 7dac542..32330b5 100644
--- a/src/views/Home/panels/Skzl/countPage.js
+++ b/src/views/Home/panels/Skzl/countPage.js
@@ -12,17 +12,17 @@ function Page({ style }) {
中型水库
-
3 座
+
7 座
小(1)型水库
-
3 座
+
44 座
小(2)型水库
-
3 座
+
207 座
diff --git a/src/views/Home/panels/Skzl/index.js b/src/views/Home/panels/Skzl/index.js
index ee1ced2..e8681f2 100644
--- a/src/views/Home/panels/Skzl/index.js
+++ b/src/views/Home/panels/Skzl/index.js
@@ -1,5 +1,5 @@
import React, { useEffect, useMemo, useState } from 'react';
-import { Switch, Collapse,Table, TableContainer, TableBody,TableHead, TableRow, TableSortLabel } from '@material-ui/core/index'
+import { Switch, Collapse, Table, TableContainer, TableBody, TableHead, TableRow, TableSortLabel } from '@material-ui/core/index'
import DpTableCell from '../../../../layouts/mui/DpTableCell';
import DpTableRow from '../../../../layouts/mui/DpTableRow';
import PanelBox from '../../components/PanelBox';
@@ -12,35 +12,40 @@ import CollapsePage from './collapsePage'
function DrpReal({ style }) {
- const [dimension, setDimension] =useState('ft');
- const [skData,setSkData] = useState([])
- const [skType,setSkType] = useState('')
- const [sort,setSort] = useState(true)
+ const [dimension, setDimension] = useState('ft');
+ const [skData, setSkData] = useState([])
+ const [skType, setSkType] = useState('')
+ const [sort, setSort] = useState(true)
+ const [sort1, setSort1] = useState(true)
const dispatch = useDispatch();
- const tableData = useMemo(()=>{
- if(skType==='1'){
- return (skData.filter(o=>o.w>10000)||[]).sort((a,b)=>sort?(b.w-a.w):(a.w-b.w))
+ const tableData = useMemo(() => {
+ if (skType === '1') {
+ return (skData.filter(o => o.w > 10000) || []).sort((a, b) => sort ? (b.w - a.w) : (a.w - b.w))
}
- if(skType==='2'){
- return (skData.filter(o=>o.w>100 && o.w<=10000)||[]).sort((a,b)=>sort?(b.w-a.w):(a.w-b.w))
+ if (skType === '2') {
+ return (skData.filter(o => o.w > 100 && o.w <= 10000) || []).sort((a, b) => sort ? (b.w - a.w) : (a.w - b.w))
}
- if(skType==='3'){
- return (skData.filter(o=>o.w>0.375 && o.w<=100)||[]).sort((a,b)=>sort?(b.w-a.w):(a.w-b.w))
+ if (skType === '3') {
+ const filterSkData = skData.filter(o => o.w > 0.375 && o.w <= 100) || [];
+ const newFilterData = filterSkData.map(item => ({ ...item, xs: (item.w * 0.6).toFixed(2) }))
+ return newFilterData.sort((a, b) => sort ? (b.w - a.w) : (a.w - b.w))
}
- if(skType==='4'){
- return (skData.filter(o=>o.w>=0 && o.w<=0.375)||[]).sort((a,b)=>sort?(b.w-a.w):(a.w-b.w))
+ if (skType === '4') {
+ const filterSkData = skData.filter(o => o.w >= 0 && o.w <= 0.375) || [];
+ const newFilterData = filterSkData.map(item => ({ ...item, xs: (item.w * 0.6).toFixed(2) }))
+ return newFilterData.sort((a, b) => sort ? (b.w - a.w) : (a.w - b.w))
}
return []
- },[skData,skType,sort])
+ }, [skData, skType, sort, sort1])
const skTypeObj = [
- {type:'1',name:'大型水库',num1:3,num2:7.9316},//8.735
- {type:'2',name:'中型水库',num1:7,num2:1.627},
- {type:'3',name:'小(1)型水库',num1:43,num2:1.627},
- {type:'4',name:'小(2)型水库',num1:207,num2:8.735},
+ { type: '1', name: '大型水库', num1: 3, num2: 7.9316 },//8.735
+ { type: '2', name: '中型水库', num1: 7, num2: 1.627 },
+ { type: '3', name: '小(1)型水库', num1: 44, num2: 1.627 },
+ { type: '4', name: '小(2)型水库', num1: 207, num2: 8.735 },
]
- useEffect(()=>{
+ useEffect(() => {
getSkData()
// return ()=>{
@@ -51,132 +56,142 @@ function DrpReal({ style }) {
// map.removeSource('临时水库tz');
// }
// }
- },[])
+ }, [])
- const getSkData = async()=>{
+ const getSkData = async () => {
const data = await SkRealPromise.get();
setSkData(data)
}
- const flyTo = (row)=>{
+ const flyTo = (row) => {
const { lgtd, lttd } = row;
if (lgtd && lttd) {
- // dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] });
- dispatch.runtime.setCameraTarget({
- center: [lgtd, lttd+0.005],
+ // dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] });
+ dispatch.runtime.setCameraTarget({
+ center: [lgtd, lttd + 0.005],
zoom: 15,
pitch: 50,
bearing: 0
- });
+ });
}
}
- const setSkLayer = (data=[])=>{
+ const setSkLayer = (data = []) => {
const map = window.__mapref;
const layer = map.getLayer('临时水库tz')
- if(layer){
+ if (layer) {
map.removeLayer('临时水库tz');
map.removeSource('临时水库tz');
}
- if(data.length===0){return}
+ if (data.length === 0) { return }
map.addLayer({
- 'id': '临时水库tz',//+new Date().getTime(),
- 'type': 'symbol',
- 'source': {
- 'type': 'geojson',
- 'data': {
- 'type': 'FeatureCollection',
- 'features': [],
- },
+ 'id': '临时水库tz',//+new Date().getTime(),
+ 'type': 'symbol',
+ 'source': {
+ 'type': 'geojson',
+ 'data': {
+ 'type': 'FeatureCollection',
+ 'features': [],
},
- 'layout': {
- // 'icon-allow-overlap': true,
- // 'text-allow-overlap': true,
- 'icon-image': '水库', // 从properties中动态读取icon字段
- 'icon-size': [
- 'interpolate', ['linear'], ['zoom'],
- 10, 0.8,
- 14, 0.8,
- ],
- 'text-size': [
- 'interpolate', ['linear'], ['zoom'],
- 5, 10,
- 14, 14,
- ],
- 'text-font': ['Roboto Black'],
- 'text-field': [
- 'step',
- ['zoom'],
- '',
- 8, ['get', 'stnm']
- ],
- 'text-anchor': 'top',
- 'text-offset': [0, 1],
- },
- 'paint': {
- 'text-color': '#fff'
- },
- 'visibility': 'visible',
+ },
+ 'layout': {
+ // 'icon-allow-overlap': true,
+ // 'text-allow-overlap': true,
+ 'icon-image': '水库', // 从properties中动态读取icon字段
+ 'icon-size': [
+ 'interpolate', ['linear'], ['zoom'],
+ 10, 0.8,
+ 14, 0.8,
+ ],
+ 'text-size': [
+ 'interpolate', ['linear'], ['zoom'],
+ 5, 10,
+ 14, 14,
+ ],
+ 'text-font': ['Roboto Black'],
+ 'text-field': [
+ 'step',
+ ['zoom'],
+ '',
+ 8, ['get', 'stnm']
+ ],
+ 'text-anchor': 'top',
+ 'text-offset': [0, 1],
+ },
+ 'paint': {
+ 'text-color': '#fff'
+ },
+ 'visibility': 'visible',
});
map.getSource('临时水库tz').setData(parseGeoJSON(data))
}
- return (
+ return (
-
+
{
- skTypeObj.map((item)=>
- (<>
-
-
-
-
-
-
- 序号
- 水库名称
- 类型
-
- setSort(!sort)}
+ skTypeObj.map((item) =>
+ (<>
+
+
+
+
+
+
+ 序号
+ 水库名称
+ 类型
+
+ {/* setSort1(!sort1)}
active={true}
- direction={sort?'desc':'asc'}>
- {'库容(万m³)'}
-
-
-
-
- {
- tableData.map((tableRow,index)=>
+ direction={sort1?'desc':'asc'}>
+ {'蓄水量(万m³)'}
+ */}
+ 蓄水量(万m³)
+
+
+ setSort(!sort)}
+ active={true}
+ direction={sort ? 'desc' : 'asc'}>
+ {'库容(万m³)'}
+
+
+
+
+ {
+ tableData.map((tableRow, index) =>
- {index+1}
+ {index + 1}
- {
- flyTo(tableRow)
- setSkLayer([tableRow])
- }}>
- {tableRow.stnm}
-
+ {
+ flyTo(tableRow)
+ setSkLayer([tableRow])
+ }}>
+ {tableRow.stnm}
+
{item.name}
+ {tableRow.xs}
{tableRow.w}
- )
- }
-
-
-
- )
+ )
+ }
+
+
+
+ )
)
}
)
-}
-
+}
+
export default DrpReal;
diff --git a/src/views/Home/panels/Xczl/index.js b/src/views/Home/panels/Xczl/index.js
index 8f63c01..a176a3e 100644
--- a/src/views/Home/panels/Xczl/index.js
+++ b/src/views/Home/panels/Xczl/index.js
@@ -104,7 +104,7 @@ function DrpReal({ style }) {
},
'paint': {
'line-color': 'red',
- 'line-width': 10
+ 'line-width': 6
// [
// 'case',
// ['==', ['get', 'LEVEL'], 1], 2.2,