diff --git a/public/assets/calendar.png b/public/assets/calendar.png
index e309940..b5fa1d5 100644
Binary files a/public/assets/calendar.png and b/public/assets/calendar.png differ
diff --git a/src/views/Home/InfoDlg/BxjcBlg/drpOption.js b/src/views/Home/InfoDlg/BxjcBlg/drpOption.js
index d001c67..3680882 100644
--- a/src/views/Home/InfoDlg/BxjcBlg/drpOption.js
+++ b/src/views/Home/InfoDlg/BxjcBlg/drpOption.js
@@ -20,7 +20,7 @@ export default function drpOption(data) {
color: '#fff',
},
// 图例的位置
- data: ['垂直位移', '库水位'],
+ data: ['左右岸水平位移', '库水位'],
},
xAxis: [
{
@@ -50,7 +50,7 @@ export default function drpOption(data) {
inverse: false,
type: 'value',
position: 'left',
- name: "垂直位移",
+ name: "左右岸水平位移",
nameTextStyle: {
color: '#fff'
},
@@ -109,7 +109,7 @@ export default function drpOption(data) {
series: [
{
yAxisIndex: 0,
- name: '垂直位移(mm)',
+ name: '左右岸水平位移(mm)',
type: 'line',
symbol: 'none',
color: "#0AE0B5",
diff --git a/src/views/Home/InfoDlg/BxjcBlg/table.js b/src/views/Home/InfoDlg/BxjcBlg/table.js
index bbbce56..765362b 100644
--- a/src/views/Home/InfoDlg/BxjcBlg/table.js
+++ b/src/views/Home/InfoDlg/BxjcBlg/table.js
@@ -73,206 +73,244 @@ const DpTableCell = withStyles({
-const data = [
+
+function DrpStAround({ record }) {
+ const data = [
{
"res_cd": "42118140022",
- "rz": -1.95,
- "du_value":-8.29,
+ "rz": 59.38,
+ "du_value": -2.29,
+ y_value:-1.51,
"dt": "2025-04-28"
},
{
"res_cd": "42118140022",
- "du_value":-8.80,
- "rz": -1.95,
+ "du_value":-3.80,
+ "rz": 59.38,
+ y_value:-1.71,
"dt": "2025-04-29"
},
{
"res_cd": "42118140022",
- "du_value":-9.13,
- "rz": -1.94,
+ "du_value":-2.13,
+ "rz": 59.38,
+ y_value:-1.21,
"dt": "2025-04-30"
},
{
"res_cd": "42118140022",
- "du_value":-10.19,
- "rz": -1.95,
+ "du_value": -1.19,
+ y_value:-1.51,
+ "rz": 59.38,
"dt": "2025-05-01"
},
{
"res_cd": "42118140022",
- "du_value":-10.29,
- "rz": -1.95,
+ "du_value":-3.29,
+ "rz": 59.38,
+ y_value:-2.11,
"dt": "2025-05-02"
},
{
"res_cd": "42118140022",
- "du_value":-10.26,
- "rz": -1.94,
+ "du_value": -2.26,
+ y_value:-3.11,
+ "rz": 59.38,
"dt": "2025-05-03"
},
{
"res_cd": "42118140022",
- "du_value":-9.31,
- "rz": -1.92,
+ "du_value": -3.31,
+ y_value:-4.31,
+ "rz": 59.38,
"dt": "2025-05-04"
},
{
"res_cd": "42118140022",
- "du_value":-9.20,
- "rz": -2.03,
+ "du_value": -4.20,
+ y_value:-1.81,
+ "rz": 59.38,
"dt": "2025-05-05"
},
{
"res_cd": "42118140022",
- "du_value":-9.66,
- "rz": -2.03,
+ "du_value": -1.66,
+ y_value:-1.61,
+ "rz": 59.38,
"dt": "2025-05-06"
},
{
"res_cd": "42118140022",
- "du_value":-9.52,
- "rz": -2.03,
+ "du_value": -4.52,
+ y_value:-1.11,
+ "rz": 59.38,
"dt": "2025-05-07"
},
{
"res_cd": "42118140022",
- "du_value":-10.40,
- "rz": -2.01,
+ "du_value": -2.40,
+ y_value:-2.11,
+ "rz": 59.38,
"dt": "2025-05-08"
},
{
"res_cd": "42118140022",
- "du_value":-9.75,
- "rz": -2.22,
+ "du_value": -1.75,
+ y_value:-4.21,
+ "rz": 59.38,
"dt": "2025-05-09"
},
{
"res_cd": "42118140022",
- "du_value":-10.25,
- "rz": -2.23,
+ "du_value": -2.25,
+ y_value:-2.16,
+ "rz": 59.38,
"dt": "2025-05-10"
},
{
"res_cd": "42118140022",
- "du_value":-10.59,
- "rz": -2.27,
+ "du_value": -1.59,
+ y_value:-4.11,
+ "rz": 59.38,
"dt": "2025-05-11"
},
{
"res_cd": "42118140022",
- "du_value":-10.98,
- "rz": -2.28,
+ "du_value": -3.98,
+ y_value:-3.11,
+ "rz": 59.38,
"dt": "2025-05-12"
},
{
"res_cd": "42118140022",
- "du_value":-10.82,
- "rz": -2.28,
+ "du_value": -4.82,
+ y_value:-1.31,
+ "rz": 59.38,
"dt": "2025-05-13"
},
{
"res_cd": "42118140022",
- "du_value":-10.72,
- "rz": -2.3,
+ "du_value": -1.72,
+ y_value:-2.31,
+ "rz": 59.38,
"dt": "2025-05-14"
},
{
"res_cd": "42118140022",
- "du_value":-11.26,
- "rz": -2.28,
+ "du_value": -2.26,
+ y_value:-4.11,
+ "rz": 59.38,
"dt": "2025-05-15"
},
{
"res_cd": "42118140022",
- "du_value":-12.16,
- "rz": -2.33,
+ "du_value": -2.16,
+ y_value:2.11,
+ "rz": 59.38,
"dt": "2025-05-16"
},
{
"res_cd": "42118140022",
- "du_value":-11.82,
- "rz": -2.33,
+ "du_value": -4.82,
+ y_value:-3.11,
+ "rz": 59.38,
"dt": "2025-05-17"
},
{
"res_cd": "42118140022",
- "du_value":-10.92,
- "rz": -2.32,
+ "du_value": -1.92,
+ y_value:-2.11,
+ "rz": 59.38,
"dt": "2025-05-18"
},
{
"res_cd": "42118140022",
- "du_value":-10.15,
- "rz": -2.36,
+ "du_value": -3.15,
+ y_value:-4.18,
+ "rz": 59.38,
"dt": "2025-05-19"
},
{
"res_cd": "42118140022",
- "du_value":-10.09,
- "rz": -2.33,
+ "du_value": -4.09,
+ y_value:-3.10,
+ "rz": 59.38,
"dt": "2025-05-20"
},
{
"res_cd": "42118140022",
- "du_value":-10.21,
- "rz": -2.33,
+ "du_value": -2.21,
+ y_value:-1.56,
+ "rz": 59.38,
"dt": "2025-05-21"
},
{
"res_cd": "42118140022",
- "du_value":-11.62,
- "rz": -2.31,
+ "du_value": -1.62,
+ y_value:-2.71,
+ "rz": 59.38,
"dt": "2025-05-22"
},
{
"res_cd": "42118140022",
- "du_value":-11.42,
- "rz": -2.41,
+ "du_value": -1.42,
+ y_value:-2.45,
+ "rz": 59.38,
"dt": "2025-05-23"
},
{
"res_cd": "42118140022",
- "du_value":-9.74,
- "rz": -2.45,
+ "du_value": -4.74,
+ y_value:-3.01,
+ "rz": 59.38,
"dt": "2025-05-24"
},
{
"res_cd": "42118140022",
- "du_value":-9.02,
- "rz": -2.45,
+ "du_value": -1.02,
+ y_value:-2.11,
+ "rz":59.38,
"dt": "2025-05-25"
},
{
"res_cd": "42118140022",
- "du_value":-8.37,
- "rz": -2.44,
+ "du_value": -3.37,
+ y_value:-1.11,
+ "rz": 59.38,
"dt": "2025-05-26"
},
{
"res_cd": "42118140022",
- "du_value":-8.79,
- "rz": -2.45,
+ "du_value": -1.79,
+ y_value:1.23,
+ "rz": 59.38,
"dt": "2025-05-27"
},
{
"res_cd": "42118140022",
- "du_value":-8.29,
- "rz": -2.4,
+ "du_value": 2.01,
+ y_value:1.33,
+ "rz": 59.38,
"dt": "2025-05-28"
}
-]
-
-function DrpStAround({ record }) {
+ ]
+ const list = useMemo(() => {
+ data.sort((a, b) => b.dt < a.dt ? -1 : 1)
+ return data
+ },[])
const classes = useStyles();
const option = useMemo(() => {
return drpOption(data);
}, [])
- const [activeType, setActiveType] = useState('all');
+ const [activeType, setActiveType] = useState('flood');
const handleTypeChange = (type) => {
setActiveType(type);
};
-
+ const [activeType1, setActiveType1] = useState('special');
+ const handleTypeChange1 = (type) => {
+ setActiveType1(type);
+ };
return (
@@ -313,10 +351,10 @@ function DrpStAround({ record }) {
{
- data.map((row) => (
+ list.map((row) => (
{row.dt}
- {row.rz?? "-"}
+ {row.y_value?? "-"}
{row.du_value?? "-"}
))}
@@ -341,14 +379,14 @@ function DrpStAround({ record }) {
@@ -366,10 +404,10 @@ function DrpStAround({ record }) {
- X方向:最大值(m) -1.92,最小值(m) -2.45,日期 2025-05-04,变幅(mm) 0.53
+ X方向:最大值(m) 2.11,最小值(m) -4.31,日期 2025-05-16,变幅(mm) 6.42
- Y方向:最大值(m) -8.29,最小值(m) -12.16,日期 2025-05-16,变幅(mm) 3.97
+ Y方向:最大值(m) 2.01,最小值(m) -4.74,日期 2025-05-28,变幅(mm) 6.75
{/*
-8.29
diff --git a/src/views/Home/InfoDlg/SljcDlg/drpOption.js b/src/views/Home/InfoDlg/SljcDlg/drpOption.js
index 67be3db..bcbc396 100644
--- a/src/views/Home/InfoDlg/SljcDlg/drpOption.js
+++ b/src/views/Home/InfoDlg/SljcDlg/drpOption.js
@@ -116,7 +116,7 @@ export default function drpOption(data) {
label: {
show: false,
},
- data:data.map(o => o.low_z),
+ data:data.map(o => 0.3),
},
{
yAxisIndex: 1,
@@ -128,7 +128,7 @@ export default function drpOption(data) {
label: {
show: false,
},
- data: data.map(o => o.rz),
+ data: data.map(o => 59.38),
}
]
};
diff --git a/src/views/Home/InfoDlg/SljcDlg/table.js b/src/views/Home/InfoDlg/SljcDlg/table.js
index 2ebca16..9ff753e 100644
--- a/src/views/Home/InfoDlg/SljcDlg/table.js
+++ b/src/views/Home/InfoDlg/SljcDlg/table.js
@@ -278,8 +278,8 @@ function DrpStAround({ record }) {
data.map((row) => (
{row.dt}
- {row.rz?? "-"}
- {row.low_z?? "-"}
+ {59.38?? "-"}
+ {0.3?? "-"}
))}
@@ -297,11 +297,11 @@ function DrpStAround({ record }) {
- 209.55
+ 0.3
2025-04-28
- 209.40
+ 0.3
2025-05-20
- 3.97
+ 0
diff --git a/src/views/Home/InfoDlg/SyjcDlg/drpOption.js b/src/views/Home/InfoDlg/SyjcDlg/drpOption.js
index bd8d6bc..614d487 100644
--- a/src/views/Home/InfoDlg/SyjcDlg/drpOption.js
+++ b/src/views/Home/InfoDlg/SyjcDlg/drpOption.js
@@ -116,7 +116,7 @@ export default function drpOption(data) {
label: {
show: false,
},
- data:data.map(o => o.du_value),
+ data:data.map(o => 59.1),
},
{
yAxisIndex: 1,
@@ -128,7 +128,7 @@ export default function drpOption(data) {
label: {
show: false,
},
- data: data.map(o => o.rz),
+ data: data.map(o => 59.38),
}
]
};
diff --git a/src/views/Home/InfoDlg/SyjcDlg/table.js b/src/views/Home/InfoDlg/SyjcDlg/table.js
index 9ecdfcc..8263279 100644
--- a/src/views/Home/InfoDlg/SyjcDlg/table.js
+++ b/src/views/Home/InfoDlg/SyjcDlg/table.js
@@ -271,8 +271,8 @@ function DrpStAround({ record }) {
data.map((row) => (
{row.dt}
- {211.94?? "-"}
- {row.du_value?? "-"}
+ {59.38?? "-"}
+ {59.1?? "-"}
))}
@@ -290,11 +290,11 @@ function DrpStAround({ record }) {
- 209.55
+ 59.1
2025-04-28
- 209.40
+ 59.1
2025-05-20
- 3.97
+ 0
diff --git a/src/views/Home/InfoDlg/YascDlg/zdscya.js b/src/views/Home/InfoDlg/YascDlg/zdscya.js
index cf81bc2..afeac57 100644
--- a/src/views/Home/InfoDlg/YascDlg/zdscya.js
+++ b/src/views/Home/InfoDlg/YascDlg/zdscya.js
@@ -60,7 +60,7 @@ const SchemeOptimization = ({loadFa}) => {
const classes = useStyles();
const [reservoirs, setReservoirs] = useState([
{ name: '浮标河水库', safeLevel: 64.80, storage: 16110, maxOutflow: 20.00 },
- { name: '明山水库', safeLevel: 93.00, storage: 5116, maxOutflow: 20.00 },
+ // { name: '明山水库', safeLevel: 93.00, storage: 5116, maxOutflow: 20.00 },
]);
const [schemes, setSchemes] = useState([
@@ -132,7 +132,7 @@ const SchemeOptimization = ({loadFa}) => {
安全水位(m)
防洪库容(万m³)
最大泄量(m³/s)
- 操作
+ {/* 操作 */}
@@ -142,13 +142,13 @@ const SchemeOptimization = ({loadFa}) => {
{reservoir.safeLevel}
{reservoir.storage}
{reservoir.maxOutflow}
- ×
+ {/* × */}
))}
-
+ {/* */}
优化目标设置及权重分配
diff --git a/src/views/Home/MapCtrl/index.js b/src/views/Home/MapCtrl/index.js
index a87f9e9..8e80964 100644
--- a/src/views/Home/MapCtrl/index.js
+++ b/src/views/Home/MapCtrl/index.js
@@ -137,7 +137,6 @@ export default function MapCtrl({ initParams, onLoad }) {
if (feature.layer.id === '关联站点') {
const record = feature.properties
- // debugger
if (record.cd_nm == 'GN1') {
dispatch?.runtime.setInfoDlg({ layerId: 'BxjcLayer', properties: record })
}else if (record.cd_nm == 'UPD1') {
@@ -149,7 +148,9 @@ export default function MapCtrl({ initParams, onLoad }) {
}else if (record.stnm == '浮桥河水库') {
dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: record })
} else if (record.type == 'sw') {
- dispatch?.runtime.setFeaturePop({ layerId: 'RealHDPop', properties: record,coordinates: [record.lgtd, record.lttd] })
+ dispatch?.runtime.setFeaturePop({ type: 'RealHDPop', properties: record,coordinates: [record.lgtd, record.lttd] })
+ } else if (record.type == 'qx') {
+ dispatch?.runtime.setFeaturePop({ type: 'RealDrpPop', properties: record,coordinates: [record.lgtd, record.lttd] })
} else if (record.flow == 1) {
dispatch?.runtime.setInfoDlg({ layerId: 'flowjcLayer', properties: record })
}
diff --git a/src/views/Home/panels/Byjc/index.js b/src/views/Home/panels/Byjc/index.js
index bbae704..f049fca 100644
--- a/src/views/Home/panels/Byjc/index.js
+++ b/src/views/Home/panels/Byjc/index.js
@@ -51,15 +51,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "浮桥河水库",
- "de_value": -11.5381,
- "dn_value": -11.2248,
- "du_value": 113.8833,
+ "de_value": 1.33,
+ "dn_value": 2.01,
+ "du_value": 1.23,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": 2.9303,
"max_dn": -2.1648,
- "max_du": 113.8833,
+ "max_du": 2.53,
"dt": "2025-05-25",
"is_has_data": "y"
},
@@ -86,15 +86,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "大堰口水库",
- "de_value": 1.0981,
- "dn_value": -7.0736,
- "du_value": 75.4661,
+ "de_value": 1.09,
+ "dn_value": 1.11,
+ "du_value": 2.13,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": 1.0981,
"max_dn": -2.3255,
- "max_du": 132.4892,
+ "max_du": 3.12,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -120,15 +120,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "大堰口水库",
- "de_value": -6.469,
- "dn_value": -2.3255,
- "du_value": 47.1633,
+ "de_value": -1.23,
+ "dn_value": -2.13,
+ "du_value": 2.11,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": 1.0981,
"max_dn": -2.3255,
- "max_du": 132.4892,
+ "max_du": 1.23,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -137,7 +137,7 @@ function DrpReal({ style }) {
"lgtd": 115.11878,
"lttd": 30.88904,
"cd": "01",
- "cd_nm": "GN1",
+ "cd_nm": "GN4",
dm: "0+120",
"res_reg_cd": "42118140019-A4",
"ch": "0+000",
@@ -154,15 +154,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "黄麻坳水库",
- "de_value": -5.5809,
- "dn_value": 4.6055,
- "du_value": -13.083,
+ "de_value": 1.34,
+ "dn_value": 2.44,
+ "du_value": -1.21,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": -5.1079,
"max_dn": 4.6055,
- "max_du": -11.1644,
+ "max_du": -1.34,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -171,7 +171,7 @@ function DrpReal({ style }) {
"lgtd": 115.11878,
"lttd": 30.88904,
"cd": "02",
- "cd_nm": "GN2",
+ "cd_nm": "GN5",
dm: "0+120",
"res_reg_cd": "42118140019-A4",
"ch": "0+000",
@@ -188,15 +188,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "黄麻坳水库",
- "de_value": -5.1079,
- "dn_value": 3.9064,
- "du_value": -12.2936,
+ "de_value": -1.43,
+ "dn_value": -2.21,
+ "du_value": -1.34,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": -5.1079,
"max_dn": 4.6055,
- "max_du": -11.1644,
+ "max_du": -2.45,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -205,7 +205,7 @@ function DrpReal({ style }) {
"lgtd": 115.14545,
"lttd": 30.95398,
"cd": "03",
- "cd_nm": "GN3",
+ "cd_nm": "GN6",
dm: "0+120",
"res_reg_cd": "42118140031-A4",
"ch": "0+000",
@@ -222,15 +222,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "群建水库",
- "de_value": 1.166,
- "dn_value": 2.1274,
- "du_value": 11.5948,
+ "de_value": 1.16,
+ "dn_value": 2.12,
+ "du_value": 1.45,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": 2.6901,
"max_dn": 3.7945,
- "max_du": 11.5948,
+ "max_du": 1.68,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -239,7 +239,7 @@ function DrpReal({ style }) {
"lgtd": 115.11878,
"lttd": 30.88904,
"cd": "03",
- "cd_nm": "GN1",
+ "cd_nm": "GN7",
dm: "0+180",
"res_reg_cd": "42118140019-A4",
"ch": "0+000",
@@ -256,15 +256,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "黄麻坳水库",
- "de_value": -5.1345,
- "dn_value": 3.7423,
- "du_value": -11.5382,
+ "de_value": -1.13,
+ "dn_value": 3.74,
+ "du_value": -1.67,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": -5.1079,
"max_dn": 4.6055,
- "max_du": -11.1644,
+ "max_du": -3.12,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -273,7 +273,7 @@ function DrpReal({ style }) {
"lgtd": 115.39612,
"lttd": 31.1526,
"cd": "02",
- "cd_nm": "GN2",
+ "cd_nm": "GN8",
dm: "0+180",
"res_reg_cd": "42118140014-A4",
"ch": "0+000",
@@ -290,15 +290,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "何门咀水库",
- "de_value": -0.7313,
- "dn_value": 2.702,
- "du_value": -11.493,
+ "de_value": -1.73,
+ "dn_value": 2.71,
+ "du_value": 2.34,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": -0.4931,
"max_dn": 4.3759,
- "max_du": -10.0925,
+ "max_du": -2.11,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -307,7 +307,7 @@ function DrpReal({ style }) {
"lgtd": 115.11878,
"lttd": 30.88904,
"cd": "04",
- "cd_nm": "GN3",
+ "cd_nm": "GN9",
dm: "0+180",
"res_reg_cd": "42118140019-A4",
"ch": "0+000",
@@ -324,15 +324,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "黄麻坳水库",
- "de_value": -5.7038,
- "dn_value": 3.3505,
- "du_value": -11.1644,
+ "de_value": -1.70,
+ "dn_value": 3.35,
+ "du_value": -1.55,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": -5.1079,
"max_dn": 4.6055,
- "max_du": -11.1644,
+ "max_du": 3.12,
"dt": "2025-05-20",
"is_has_data": "y"
},
@@ -361,7 +361,7 @@ function DrpReal({ style }) {
"eng_scal": "小(1)型",
"danger_stat": "非病险水库",
"label": "2023高标准",
- "value": 164.8742,
+ "value": 59.1,
"diff_value": -0.0275,
"trend": -1,
"is_has_data": "y",
@@ -370,7 +370,7 @@ function DrpReal({ style }) {
"diff_rz_cd": 5.0554,
"max_cd_value": -0.0225,
"rz": 165.57,
- "dt": "2025-05-20",
+ "dt": "2025-05-20 10:00:00",
"diff5_value": -0.0737,
"trend5": -1,
"diff10_value": -0.1204,
@@ -400,7 +400,7 @@ function DrpReal({ style }) {
"eng_scal": "小(1)型",
"danger_stat": "非病险水库",
"label": "2023高标准",
- "value": 209.4042,
+ "value": 51.1,
"diff_value": -0.0258,
"trend": -1,
"is_has_data": "y",
@@ -409,7 +409,7 @@ function DrpReal({ style }) {
"diff_rz_cd": 48.6446,
"max_cd_value": -0.01,
"rz": 211.94,
- "dt": "2025-05-20",
+ "dt": "2025-05-20 11:00:00",
"diff5_value": -0.0983,
"trend5": -1,
"diff10_value": -0.1329,
@@ -439,7 +439,7 @@ function DrpReal({ style }) {
"eng_scal": "小(1)型",
"danger_stat": "非病险水库",
"label": "2023高标准",
- "value": 162.6908,
+ "value": 43.95,
"diff_value": -0.0246,
"trend": -1,
"is_has_data": "y",
@@ -448,7 +448,7 @@ function DrpReal({ style }) {
"diff_rz_cd": 5.0554,
"max_cd_value": -0.0225,
"rz": 165.57,
- "dt": "2025-05-20",
+ "dt": "2025-05-20 12:00:00",
"diff5_value": -0.095,
"trend5": -1,
"diff10_value": -0.123,
@@ -458,7 +458,7 @@ function DrpReal({ style }) {
},
{
"cd": "1",
- "cd_nm": "UPD1",
+ "cd_nm": "UPD4",
"ch": "0+038",
dm: "0+140",
"res_reg_cd": "42118140014-A4",
@@ -478,7 +478,7 @@ function DrpReal({ style }) {
"eng_scal": "小(1)型",
"danger_stat": "非病险水库",
"label": "2023高标准",
- "value": 139.2533,
+ "value": 59.1,
"diff_value": -0.0171,
"trend": -1,
"is_has_data": "y",
@@ -487,7 +487,7 @@ function DrpReal({ style }) {
"diff_rz_cd": 24.9337,
"max_cd_value": -0.0045,
"rz": 142.33,
- "dt": "2025-05-20",
+ "dt": "2025-05-20 13:00:00",
"diff5_value": -0.0675,
"trend5": -1,
"diff10_value": -0.0627,
@@ -498,7 +498,7 @@ function DrpReal({ style }) {
{
"cd": "4",
- "cd_nm": "UPD2",
+ "cd_nm": "UPD5",
"ch": "0+085",
dm: "0+140",
"res_reg_cd": "42118140020-A4",
@@ -518,7 +518,7 @@ function DrpReal({ style }) {
"eng_scal": "小(1)型",
"danger_stat": "待除险加固",
"label": "2023高标准",
- "value": 483.1646,
+ "value": 51.1,
"diff_value": -0.0108,
"trend": -1,
"is_has_data": "y",
@@ -527,7 +527,7 @@ function DrpReal({ style }) {
"diff_rz_cd": 14.6887,
"max_cd_value": -0.0108,
"rz": 486.41,
- "dt": "2025-05-20",
+ "dt": "2025-05-20 15:00:00",
"diff5_value": -0.0742,
"trend5": -1,
"diff10_value": -0.1258,
@@ -537,7 +537,7 @@ function DrpReal({ style }) {
},
{
"cd": "1",
- "cd_nm": "UPD3",
+ "cd_nm": "UPD6",
"ch": "0+51.6",
dm: "0+140",
@@ -558,7 +558,7 @@ function DrpReal({ style }) {
"eng_scal": "小(1)型",
"danger_stat": "非病险水库",
"label": "2023高标准",
- "value": 68.1333,
+ "value": 43.95,
"diff_value": -0.0142,
"trend": -1,
"is_has_data": "y",
@@ -567,7 +567,7 @@ function DrpReal({ style }) {
"diff_rz_cd": 23.0069,
"max_cd_value": -0.0142,
"rz": 71.41,
- "dt": "2025-05-20",
+ "dt": "2025-05-20 17:00:00",
"diff5_value": -0.0109,
"trend5": -1,
"diff10_value": 0.0087,
@@ -663,15 +663,15 @@ function DrpReal({ style }) {
"danger_stat": "非病险水库",
"label": "2023高标准",
"res_nm": "浮桥河水库",
- "de_value": -11.5381,
- "dn_value": -11.2248,
+ "de_value": -1.53,
+ "dn_value": -1.22,
"du_value": 113.8833,
"de_trend": null,
"dn_trend": null,
"du_trend": null,
"max_de": 2.9303,
"max_dn": -2.1648,
- "max_du": 113.8833,
+ "max_du": 2.56,
"dt": "2025-05-25",
"is_has_data": "y",
'cd': '0EA5DE',
@@ -1273,7 +1273,7 @@ function DrpReal({ style }) {
断面
测点
-
渗压水位
+
渗压水位(m)
监测时间
diff --git a/src/views/Home/panels/Diaodujg/tableYj.js b/src/views/Home/panels/Diaodujg/tableYj.js
index 07007a1..00293d5 100644
--- a/src/views/Home/panels/Diaodujg/tableYj.js
+++ b/src/views/Home/panels/Diaodujg/tableYj.js
@@ -134,19 +134,19 @@ const ReservoirTable = ({onChange}) => {
水库名称
- 最大入库流量
(m³/s)
+ 最大入库流量(m³/s)
- 总入库水量
(万m³)
+ 总入库水量(万m³)
- 最大出库流量
(m³/s)
+ 最大出库流量(m³/s)
- 总出库水量
(万m³)
+ 总出库水量(万m³)
- 最高库水位
(m)
+ 最高库水位(m)
@@ -158,7 +158,7 @@ const ReservoirTable = ({onChange}) => {
{item.totalStorage}
{formatFlowCell(item.maxOutflow)}
16.76
-
12.32(03-23 14::32)
+
12.32(03-23 14:32)
))}
diff --git a/src/views/Home/panels/Jcgj/index.js b/src/views/Home/panels/Jcgj/index.js
index c7994d8..7635979 100644
--- a/src/views/Home/panels/Jcgj/index.js
+++ b/src/views/Home/panels/Jcgj/index.js
@@ -44,8 +44,8 @@ function HDReal({ style }) {
}
const handleBxDlg = () => {
- dispatch.runtime.setInfoDlg({ layerId: 'WyWarnLayer', properties: {}})
- }
+ dispatch.runtime.setInfoDlg({ layerId: 'WyWarnLayer', properties: {} })
+ }
return (
- {moment().subtract(6,'day').format('YYYY-MM-DD')}~{moment().format('YYYY-MM-DD')}
+ {moment().subtract(6, 'day').format('YYYY-MM-DD')}~{moment().format('YYYY-MM-DD')}
}
>
-
+
-

+
diff --git a/src/views/Home/panels/Sksltj/barCgart.js b/src/views/Home/panels/Sksltj/barCgart.js
index ba92e12..4a94b92 100644
--- a/src/views/Home/panels/Sksltj/barCgart.js
+++ b/src/views/Home/panels/Sksltj/barCgart.js
@@ -96,7 +96,7 @@ const WaterSupplyChart = ({type}) => {
return (
diff --git a/src/views/Home/panels/Sksltj/index.js b/src/views/Home/panels/Sksltj/index.js
index b521d65..cd7735c 100644
--- a/src/views/Home/panels/Sksltj/index.js
+++ b/src/views/Home/panels/Sksltj/index.js
@@ -366,7 +366,7 @@ function DrpReal({ style }) {
>
-
+
@@ -389,7 +389,7 @@ function DrpReal({ style }) {
-
+
供水统计分析

-
-
+
+
0.363 m³/s
实时流量({moment().format('YYYY-MM-DD') + ' 09:00'})
-
-
371.12 %
+
-
-
0.358 m³/s
+
+
0.358(0.038) m³/s
日平均流量({moment().format('YYYY-MM-DD')})
-
+ {/*
0.32 m³/s
生态流量目标({moment().format('YYYY-MM-DD')})
-
+
*/}
{/*
*/}
-

+

>
: null
}
{
tab == '水厂' ?
-
+
0.363 m³/s
实时流量({moment().format('YYYY-MM-DD') + ' 09:00'})
@@ -477,7 +477,7 @@ function DrpReal({ style }) {
{
tab == '灌溉' ?
-
+
0.351 m³/s
实时流量({moment().format('YYYY-MM-DD') + ' 09:00'})
@@ -497,7 +497,7 @@ function DrpReal({ style }) {
}
-
+
diff --git a/src/views/Home/panels/Sksltj/index.less b/src/views/Home/panels/Sksltj/index.less
index b859ee3..2e192cb 100644
--- a/src/views/Home/panels/Sksltj/index.less
+++ b/src/views/Home/panels/Sksltj/index.less
@@ -3,7 +3,7 @@
.source-container {
display: flex;
gap: 16px;
- padding: 2px;
+ // padding: 2px;
.source-card {
flex: 1;
@@ -21,7 +21,7 @@
.source-value {
font-size: 32px;
font-weight: bold;
- margin-bottom: 8px;
+ // margin-bottom: 8px;
}
.source-label {