diff --git a/public/assets/lsyy.png b/public/assets/lsyy.png index 5acdb66..72f635c 100644 Binary files a/public/assets/lsyy.png and b/public/assets/lsyy.png differ diff --git a/public/mapbox/sprite@2x.json b/public/mapbox/sprite@2x.json index 75de298..2f581bd 100644 --- a/public/mapbox/sprite@2x.json +++ b/public/mapbox/sprite@2x.json @@ -337,9 +337,9 @@ }, "白蚁监测": { "width": 20, - "height": 32, + "height": 30, "x": 74, - "y": 290, + "y": 286, "pixelRatio": 0.5, "visible": true }, diff --git a/src/models/map/index.js b/src/models/map/index.js index 2181134..f876387 100644 --- a/src/models/map/index.js +++ b/src/models/map/index.js @@ -247,13 +247,15 @@ const map = { RealHDLayer: false, RealSkLayer: false, RainDrpLayer:true, - ShuikuLayer:true, + ShuikuLayer:false, BxSkLayer: true, FzdxLayer: false, WataLayer: false, AdcdLayer: true, RoadLayer: true, RivlLayer: true, + RealHDLayerQ2: true, + RealSkLayerQ2:true }; Object.keys(DCPJ_TYPES).forEach(key => { layerVisible['Dcpj_' + key + 'Layer'] = false; diff --git a/src/views/Home/InfoDlg/BxjcBlg/index.js b/src/views/Home/InfoDlg/BxjcBlg/index.js index 885ed38..e016fbb 100644 --- a/src/views/Home/InfoDlg/BxjcBlg/index.js +++ b/src/views/Home/InfoDlg/BxjcBlg/index.js @@ -56,7 +56,7 @@ function HDStDlg({ record, onClose }) { setValue(v)}> - + {/* */}
diff --git a/src/views/Home/InfoPops/RealHDPop/HDChart.js b/src/views/Home/InfoPops/RealHDPop/HDChart.js index 2e9ce2b..dfa1080 100644 --- a/src/views/Home/InfoPops/RealHDPop/HDChart.js +++ b/src/views/Home/InfoPops/RealHDPop/HDChart.js @@ -200,19 +200,19 @@ function HDChart({ record }) { {/*
水位 - {renderHDRz(record)} + {renderHDRz(record)}
-
+
设防水位 - {record.sfz || '--'} + {record.sfz || '--'}
警戒水位 - {record.wrz || '--'} + {record.wrz || '--'}
保证水位 - {record.grz || '--'} + {record.grz || '--'}
*/}
diff --git a/src/views/Home/MapCtrl/mapstyle/bxjclayer.js b/src/views/Home/MapCtrl/mapstyle/bxjclayer.js index fca1f6c..106dda9 100644 --- a/src/views/Home/MapCtrl/mapstyle/bxjclayer.js +++ b/src/views/Home/MapCtrl/mapstyle/bxjclayer.js @@ -46,8 +46,8 @@ const ShapeStyle = { const page1 = [ { "res_cd": "42118140035", - "res_lon": 115.14137, - "res_lat": 31.55095, + "res_lon": 114.875, + "res_lat": 31.166667, "cd": "01", "cd_nm": "GN1", "stnm": "GN1", @@ -65,7 +65,7 @@ const page1 = [ "eng_scal": "小(1)型", "danger_stat": "非病险水库", "label": "2023高标准", - "res_nm": "大堰口水库", + "res_nm": "浮桥河水库", "de_value": -11.5381, "dn_value": -11.2248, "du_value": 113.8833, diff --git a/src/views/Home/components/RzSearch/index.js b/src/views/Home/components/RzSearch/index.js index ea9e28a..f32972c 100644 --- a/src/views/Home/components/RzSearch/index.js +++ b/src/views/Home/components/RzSearch/index.js @@ -9,6 +9,7 @@ import ReactEcharts from 'echarts-for-react'; import moment from 'moment' import rzOption from './rzOption'; import DpAlert from '../../../../layouts/mui/DpAlert'; +import { backgroundColor } from 'echarts/lib/theme/dark'; function RzSearch({ record }) { console.log('r', record); @@ -64,7 +65,7 @@ function RzSearch({ record }) { {searchTm.error} ) : ( - + [obj.tm, obj.rz || obj.z || 0]); @@ -19,14 +20,15 @@ export default function rzOption({ data, skinfo }) { ]; } else if (data[0]) { const { sfz, wrz, grz } = data[0]; + const recordWrz = wrz||skinfo.wrz; markLine.data = []; if (sfz) { sorted.push(sfz) markLine.data.push({ label: { formatter: '设防水位' }, yAxis: sfz, lineStyle: { color: hdyjColor[1] } }); } - if (wrz) { - sorted.push(wrz) - markLine.data.push({ label: { formatter: '警戒水位' }, yAxis: wrz, lineStyle: { color: hdyjColor[2] } }); + if (recordWrz) { + sorted.push(recordWrz) + markLine.data.push({ label: { formatter: '警戒水位' + `(${recordWrz})` }, yAxis: recordWrz, lineStyle: { color: hdyjColor[2] } }); } if (grz) { sorted.push(grz) @@ -51,9 +53,9 @@ export default function rzOption({ data, skinfo }) { } }, grid: { - x: 24, + x: 25, y: 24, - x2: 38, + x2: 100, y2: 42, borderWidth: 0 }, diff --git a/src/views/Home/panels/BxSkOverall/OverallContent.js b/src/views/Home/panels/BxSkOverall/OverallContent.js index 64963a2..4983534 100644 --- a/src/views/Home/panels/BxSkOverall/OverallContent.js +++ b/src/views/Home/panels/BxSkOverall/OverallContent.js @@ -67,7 +67,7 @@ export default function OverallContent({ data, skAll }) { 24小时中共有1 个站点雨量为大暴雨,雨量值 261mm; - 共产生3个山洪预警(2个内部预警,1个外部预警),均已处置;1个水库超汛限,已短信通知责任人;无河道预警。 + 共产生3个山洪预警(2个内部预警,1个外部预警),均已处置;1个水库超汛限,已短信通知责任人;1个超警戒河道预警。
{/*
diff --git a/src/views/Home/panels/Bxjc/index.js b/src/views/Home/panels/Bxjc/index.js index 94773ee..1656aa9 100644 --- a/src/views/Home/panels/Bxjc/index.js +++ b/src/views/Home/panels/Bxjc/index.js @@ -14,12 +14,13 @@ import clsx from 'clsx'; import { renderDrp } from '../../../../utils/renutils'; const data1 = [ - { +{ "res_cd": "42118140035", - "res_lon": 115.14137, - "res_lat": 31.55095, + "res_lon": 114.875, + "res_lat": 31.166667, "cd": "01", - "cd_nm": "GN1", + "cd_nm": "GN1", + "stnm": "GN1", "res_reg_cd": "42118140006-A4", "ch": "0+000", "province_cd": "420000000000", @@ -34,50 +35,17 @@ const data1 = [ "eng_scal": "小(1)型", "danger_stat": "非病险水库", "label": "2023高标准", - "res_nm": "大堰口水库", - "de_value": -4.2885, - "dn_value": -13.5384, - "du_value": 132.4892, + "res_nm": "浮桥河水库", + "de_value": -11.5381, + "dn_value": -11.2248, + "du_value": 113.8833, "de_trend": null, "dn_trend": null, "du_trend": null, - "max_de": 1.0981, - "max_dn": -2.3255, - "max_du": 132.4892, - "dt": "2025-05-20", - "is_has_data": "y" - }, - { - "res_cd": "42118140035", - "res_lon": 115.14137, - "res_lat": 31.55095, - "cd": "03", - "cd_nm": "GN3", - "res_reg_cd": "42118140006-A4", - "ch": "0+000", - "province_cd": "420000000000", - "province_nm": "湖北省", - "city_cd": "421100000000", - "city_nm": "黄冈市", - "county_cd": "421181000000", - "county_nm": "麻城市", - "town_cd": "421181112000", - "town_nm": "福田河镇", - "bas_guid": "鄂东五河片区", - "eng_scal": "小(1)型", - "danger_stat": "非病险水库", - "label": "2023高标准", - "res_nm": "大堰口水库", - "de_value": -10.73, - "dn_value": -9.8975, - "du_value": 121.3495, - "de_trend": null, - "dn_trend": null, - "du_trend": null, - "max_de": 1.0981, - "max_dn": -2.3255, - "max_du": 132.4892, - "dt": "2025-05-20", + "max_de": 2.9303, + "max_dn": -2.1648, + "max_du": 113.8833, + "dt": "2025-05-25", "is_has_data": "y" }, { @@ -640,14 +608,16 @@ function DrpReal({ style }) {
{ - const { res_lon:lgtd, res_lat:lttd } = row; - if (lgtd && lttd) { - dispatch.runtime.setCameraTarget({ - center: [lgtd, lttd], - zoom: 15, - pitch: 60, - bearing: 0 - }); + const { res_lon: lgtd, res_lat: lttd,res_nm:stnm } = row; + if (stnm == '浮桥河水库') { + if (lgtd && lttd) { + dispatch.runtime.setCameraTarget({ + center: [lgtd, lttd], + zoom: 15, + pitch: 60, + bearing: 0 + }); + } } }}>{row.res_nm}
diff --git a/src/views/Home/panels/Drpfx/index.js b/src/views/Home/panels/Drpfx/index.js index 0b2c1b6..1ddf900 100644 --- a/src/views/Home/panels/Drpfx/index.js +++ b/src/views/Home/panels/Drpfx/index.js @@ -204,7 +204,11 @@ export default function Overall({ style }) {
阎家河 0 ? hisdata : (data || []); - + console.log("showdata",showdata); + return (
{