- {value === 0 &&
}
- {value === 1 &&
}
+ {value === 0 &&
}
+ {value === 1 &&
}
{value === 2 &&
}
{value === 3 &&
}
{value === 4 &&
}
diff --git a/src/views/Home/InfoPops/RealDrpPop/DrpChart.js b/src/views/Home/InfoPops/RealDrpPop/DrpChart.js
index cedc6e0..e4ac40f 100644
--- a/src/views/Home/InfoPops/RealDrpPop/DrpChart.js
+++ b/src/views/Home/InfoPops/RealDrpPop/DrpChart.js
@@ -204,7 +204,7 @@ function DrpChart({ record }) {
const classes = useStyles();
const tm = [moment().add(-24, 'hour'), moment()];
- const resultTm = ['2025-06-07 10:00:00','2025-06-08 10:00:00']//normalizeSearchTmRange(tm, 'h');
+ const resultTm = [moment(record.tm).add(-1,'days').format('YYYY-MM-DD HH:00:00'),moment(record.tm).format('YYYY-MM-DD HH:00:00')]//normalizeSearchTmRange(tm, 'h');
useEffect(() => {
drpSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => {
@@ -378,9 +378,9 @@ function DrpChart({ record }) {
option={option}
style={{ height: '15rem', width: '30rem' }}
/>
-
- {/*
上报时间: {record.tm ? moment(record.tm).format('YYYY-MM-DD HH:mm:ss') : '-'} */}
- {/*
+
+
上报时间: {record.tm ? moment(record.tm).format('YYYY-MM-DD HH:mm:ss') : '-'}
+
{
['h1', 'h3', 'h6', 'h12', 'h24'].map(key => (
@@ -389,7 +389,7 @@ function DrpChart({ record }) {
))
}
-
*/}
+
)
diff --git a/src/views/Home/InfoPops/RealDrpPop/index.js b/src/views/Home/InfoPops/RealDrpPop/index.js
index 0e7891d..9092f35 100644
--- a/src/views/Home/InfoPops/RealDrpPop/index.js
+++ b/src/views/Home/InfoPops/RealDrpPop/index.js
@@ -9,9 +9,9 @@ function RealDrpTip({ record, dispatch }) {
const [type, setType] = useState('drp');
- const changeView = () => {
- setType(type === 'drp' ? 'rz' : 'drp');
- }
+ // const changeView = () => {
+ // setType(type === 'drp' ? 'rz' : 'drp');
+ // }
const viewInfo = () => {
dispatch?.runtime.setInfoDlg({ layerId: 'RealDrpLayer', properties: record })
@@ -26,7 +26,7 @@ function RealDrpTip({ record, dispatch }) {
详细
{type === 'drp' ?
: null}
- {type === 'rz' ?
: null}
+ {/* {type === 'rz' ?
: null} */}
)
diff --git a/src/views/Home/InfoPops/RealHDPop/HDChart.js b/src/views/Home/InfoPops/RealHDPop/HDChart.js
index 37ee598..2e9ce2b 100644
--- a/src/views/Home/InfoPops/RealHDPop/HDChart.js
+++ b/src/views/Home/InfoPops/RealHDPop/HDChart.js
@@ -28,8 +28,8 @@ function HDChart({ record }) {
const [data, setData] = useState([]);
const tm = [moment().add(-24, 'hour'), moment()];
- const resultTm = normalizeSearchTmRange(tm, 'h');
-
+ // const resultTm = normalizeSearchTmRange(tm, 'h');
+ const resultTm = [moment(record.tm).add(-1,'days').format('YYYY-MM-DD HH:00:00'),moment(record.tm).format('YYYY-MM-DD HH:00:00')]//normalizeSearchTmRange(tm, 'h');
useEffect(() => {
rzSearch(record.type, record.stcd, 'h', resultTm, record.countycode).then((data) => {
setData(data || []);
@@ -196,8 +196,8 @@ function HDChart({ record }) {
style={{ height: '15rem', width: '30rem' }}
/>
-
上报时间: {rtm ? moment(rtm).format('YYYY-MM-DD HH:mm:ss') : '-'}
-
+
上报时间: {rtm ? moment(rtm).format('YYYY-MM-DD HH:mm:ss') : '-'}
+ {/*
水位
{renderHDRz(record)}
@@ -214,7 +214,7 @@ function HDChart({ record }) {
保证水位
{record.grz || '--'}
-
+
*/}
)
diff --git a/src/views/Home/MapCtrl/mapstyle/realsklayer.js b/src/views/Home/MapCtrl/mapstyle/realsklayer.js
index 02f9516..9b7835b 100644
--- a/src/views/Home/MapCtrl/mapstyle/realsklayer.js
+++ b/src/views/Home/MapCtrl/mapstyle/realsklayer.js
@@ -50,7 +50,11 @@ const Style = {
],
'icon-size': [
'interpolate', ['linear'], ['zoom'],
- 10, ['case', ['==', ['get', 'rzWarning'], 1], 0.6, 0.3],
+ 10,
+ ['case',
+ ['!=', ['get', 'rzState'], 1], 0.4,
+ ['==', ['get', 'rzWarning'], 1], 0.7,
+ 0.7],
14, 0.7,
],
'text-size': [
diff --git a/src/views/Home/components/DrpSearch/index.js b/src/views/Home/components/DrpSearch/index.js
index 88b3b8b..774948a 100644
--- a/src/views/Home/components/DrpSearch/index.js
+++ b/src/views/Home/components/DrpSearch/index.js
@@ -188,8 +188,8 @@ function DrpSearch({ record }) {
"year": "2025"
}
]
- const [stm, handleDateChange1] = useState(() => moment().add(-1, 'd'));
- const [etm, handleDateChange2] = useState(() => moment());
+ const [stm, handleDateChange1] = useState(() => moment(record.tm).add(-1, 'd'));
+ const [etm, handleDateChange2] = useState(() => moment(record.tm));
const [data, setData] = useState([]);
const searchTm = useMemo(() => {
diff --git a/src/views/Home/components/RzSearch/index.js b/src/views/Home/components/RzSearch/index.js
index 90cb7f6..ea9e28a 100644
--- a/src/views/Home/components/RzSearch/index.js
+++ b/src/views/Home/components/RzSearch/index.js
@@ -12,8 +12,8 @@ import DpAlert from '../../../../layouts/mui/DpAlert';
function RzSearch({ record }) {
console.log('r', record);
- const [selectedDate1, handleDateChange1] = useState(() => moment().add(-1, 'd'));
- const [selectedDate2, handleDateChange2] = useState(() => moment());
+ const [selectedDate1, handleDateChange1] = useState(() => moment(record.tm).add(-1, 'd'));
+ const [selectedDate2, handleDateChange2] = useState(() => moment(record.tm));
const [data, setData] = useState([]);
const searchTm = useMemo(() => {
diff --git a/src/views/Home/panels/Overall/OverallContent.js b/src/views/Home/panels/Overall/OverallContent.js
index 2d39046..cca75c5 100644
--- a/src/views/Home/panels/Overall/OverallContent.js
+++ b/src/views/Home/panels/Overall/OverallContent.js
@@ -100,28 +100,28 @@ export default function OverallContent({ data }) {
})
} else {
const obj = {
- 'Q9123':{
- "stcd": "Q9123",
- "stnm": "下白米",
+ 'Q9111':{
+ "stcd": "Q9111",
+ "stnm": "福田河",
"adcd": null,
"wscd": null,
"importancy": 0,
- "lgtd": 115.1217,
- "lttd": 30.8992,
+ "lgtd": 115.0944,
+ "lttd": 31.4747,
"elev": null,
"hasRz": false,
"type": "qx",
- "today": 17.8,
- "h1": 7.2,
- "h3": 14.3,
- "h6": 22.7,
- "h12": 24.2,
- "h24": 45.2,
- "h48": 123.5,
- "tm": "2025-06-08T03:00:00.000Z",
+ "today": 50.3,
+ "h1": 50.2,
+ "h3": 50.2,
+ "h6": 50.2,
+ "h12": 50.2,
+ "h24": 50.3,
+ "h48": 50.3,
+ "tm": "2025-06-06T22:00:00.000Z",
"state": 1,
"warning": 0
- },
+ },
}
_showRecord(obj[stcd], InfoPopNames.RealDrpPop)
diff --git a/src/views/Home/panels/SkReal/index.js b/src/views/Home/panels/SkReal/index.js
index 78c848d..c157d9e 100644
--- a/src/views/Home/panels/SkReal/index.js
+++ b/src/views/Home/panels/SkReal/index.js
@@ -90,8 +90,8 @@ function SkReal({ style }) {
extra={
<>
-
-
showSetting(true)}>
+ {/*
*/}
+ {/*
showSetting(true)}> */}
}
>
@@ -100,16 +100,16 @@ function SkReal({ style }) {
名称
- {appconsts.drpTtype[tableSkDrpField]}降雨
- 水位
- 超汛限
+ {appconsts.drpTtype[tableSkDrpField]}降雨
+ 水位
+ 超汛限
- {sortedData.map((row) => (
+ {[...sortedData.filter(o=>o.rzState===1),...sortedData.filter(o=>o.rzState!==1)].map((row) => (
- flyTo(row)}>{row.stnm}
+ flyTo(row)}>{row.rzState===1?row.stnm:row.stnm+'(离线)'}
{row['h24']}
{row?.rz}