水库洪水演进
diff --git a/src/views/Home/panels/Duibifx/index.js b/src/views/Home/panels/Duibifx/index.js
index 65d405d..55377b2 100644
--- a/src/views/Home/panels/Duibifx/index.js
+++ b/src/views/Home/panels/Duibifx/index.js
@@ -40,58 +40,7 @@ function HDReal({ style }) {
// let { data } = useRequest(HDRealPromise.get, t);
const [setting, showSetting] = useState(false);
- // const showData = useMemo(() => {
- // if (!data) {
- // return [];
- // }
- // let ret = [];
- // data.forEach(o => {
- // if (!tableRzFilter[o.type]) {
- // return;
- // }
- // o.status = Math.floor(Math.random() * (4 - 0 + 1)) + 0
- // o.kd = (Math.random() * 100).toFixed(2);
- // o.ll = (Math.random() * 100).toFixed(1);
- // ret.push(o);
- // });
- // return ret;
- // }, [data, tableRzFilter]);
- const randomMinutes = Math.floor(Math.random() * 60) + 1;
- const format = 'YYYY-MM-DD HH:mm';
-
- const showData = [
- {
- stnm: '尼尔基坝上',
- rz: '215.74',
- maxF: '7170',
- cxTime: '08-17 08时',
- ffTime: '08-23 20时'
- },
- {
- stnm: '同盟',
- rz: '170.30',
- maxF: '10300',
- cxTime: '08-20 20时',
- ffTime: '08-20 20时'
- }
- ]
- const resData = [
- {
- stnm: '福田河镇',
- area: "200",
- rz: '215.74',
- maxF: '7170',
- cxTime: '08-17 08时',
- ffTime: '08-23 20时'
- },
- {
- stnm: '顺河镇',
- area: '300',
- maxF: '10300',
- cxTime: '08-20 20时',
- ffTime: '08-20 20时'
- }
- ]
+
const flyTo = (record) => {
const { lgtd, lttd } = record;
if (lgtd && lttd) {
@@ -118,7 +67,7 @@ function HDReal({ style }) {
return (
diff --git a/src/views/Home/panels/WeatherForcast/WF.js b/src/views/Home/panels/WeatherForcast/WF.js
index 5004df2..3f45b66 100644
--- a/src/views/Home/panels/WeatherForcast/WF.js
+++ b/src/views/Home/panels/WeatherForcast/WF.js
@@ -50,7 +50,8 @@ function WF() {
const genWeatherContour24H = () => {
dispatch.runtime.setYyfa({ yy: '' })
- dispatch.runtime.setXiayouxh(false)
+ dispatch.runtime.setXiayouxh(false)
+ dispatch.runtime.setDuibifx([])
dispatch.shyjview.showWeather24h();
const map = window.__mapref
if (map) {
@@ -60,7 +61,8 @@ function WF() {
const genWeatherContourRadar = () => {
dispatch.runtime.setYyfa({ yy: '' })
- dispatch.runtime.setXiayouxh(false)
+ dispatch.runtime.setXiayouxh(false)
+ dispatch.runtime.setDuibifx([])
dispatch.shyjview.showWeatherRadar();
const map = window.__mapref
map.setLayoutProperty('热力图', 'visibility', 'none');
diff --git a/src/views/Home/panels/Yuanyfa/ddfa.js b/src/views/Home/panels/Yuanyfa/ddfa.js
index 7eab408..7b8f260 100644
--- a/src/views/Home/panels/Yuanyfa/ddfa.js
+++ b/src/views/Home/panels/Yuanyfa/ddfa.js
@@ -11,7 +11,7 @@ const useStyles = makeStyles({
backgroundColor: 'transparent',
color: '#fff',
borderRadius: 8,
- border: '1px solid #2a2b2f',
+ border: '2px solid #d7d7d7',
cursor: 'pointer',
transition: 'all 0.3s ease',
'&:hover': {
@@ -55,13 +55,13 @@ const ScheduleCard = ({ data, selected, onClick }) => {
>
- 调度方案-{data.date}
+ 调度方案-{data.date}
{/*
✎
*/}
-
+
初始水位为{data.initialLevel}m，通过开启工作闸门进行提前泄洪，开度最大为
{data.maxOpening}m，最大下泄流量为{data.maxFlow}m³/s，共持续调控
{data.duration}小时，期间最高水位为{data.maxLevel}m，未超过校核洪水位
@@ -108,12 +108,18 @@ const [compareList, setCompareList] = useState([])
setCompareList([...compareList,findItem])
}
const dispatch = useDispatch();
-
+ const num = useSelector(s => s.runtime.duibifxNum)
useEffect(() => {
const redList = Array.from(new Set(compareList.map(item => item.id)))
dispatch.runtime.setDuibifx(redList)
}, [compareList])
+ useEffect(() => {
+ if (!num.length) {
+ setSelectedCard(undefined)
+ }
+ }, [num])
+
return (
{schedules.map((schedule) => (
diff --git a/src/views/Home/panels/Yuanyfa/index.js b/src/views/Home/panels/Yuanyfa/index.js
index 422ecb2..ccc8629 100644
--- a/src/views/Home/panels/Yuanyfa/index.js
+++ b/src/views/Home/panels/Yuanyfa/index.js
@@ -112,7 +112,7 @@ export default function Warn({ style }) {
setYyValue(true)
dispatch.runtime.setYyfa({ yy: true })
dispatch.runtime.setXiayouxh(true)
-
+closeLayer()
// if (value) {
// }
}
@@ -154,10 +154,18 @@ export default function Warn({ style }) {
dispatch.runtime.setDuibifx(selectedSchemes)
}, [selectedSchemes])
+ const closeLayer = () => {
+ dispatch.runtime.setLayerSetting({ contour: null, dem: undefined });
+ dispatch.map.setLayerVisible({ ContourLayer: false });
+ const map = window.__mapref
+ map.setLayoutProperty('热力图', 'visibility', 'none');
+ }
+
const productFa = () => {
dispatch?.runtime.setInfoDlg({ layerId: 'YuananLayer', properties: {} })
dispatch.runtime.setYyfa({})
dispatch.runtime.setXiayouxh(false)
+ closeLayer()
}
const changeYY = (e) => {
setValue(e.target.value)