diff --git a/public/assets/13331750669157_.pic.jpg b/public/assets/13331750669157_.pic.jpg new file mode 100644 index 0000000..a615f79 Binary files /dev/null and b/public/assets/13331750669157_.pic.jpg differ diff --git a/public/assets/13341750669367_.pic.jpg b/public/assets/13341750669367_.pic.jpg new file mode 100644 index 0000000..36867e6 Binary files /dev/null and b/public/assets/13341750669367_.pic.jpg differ diff --git a/public/data3/skReal.json b/public/data3/skReal.json index b63cd90..affbbad 100644 --- a/public/data3/skReal.json +++ b/public/data3/skReal.json @@ -1923,14 +1923,14 @@ "h12": 4, "h24": 4, "h48": 4, - "drpState": 1, - "rz": 60.7, + "drpState": 2, + "rz": 65.7, "w": 45490, "xs":32133, "a_fsltdz": -4.189999999999998, "rzTm": "2025-06-06T22:00:00.000Z", - "rzWarning": 0, - "rzState": 1, + "rzWarning": 1, + "rzState": 2, "layer": "RealSkLayer", "layerPop": "RealSkPop" }, diff --git a/src/views/Home/InfoDlg/AllSkDlg/index.js b/src/views/Home/InfoDlg/AllSkDlg/index.js index c34fe7a..c376d41 100644 --- a/src/views/Home/InfoDlg/AllSkDlg/index.js +++ b/src/views/Home/InfoDlg/AllSkDlg/index.js @@ -14,52 +14,40 @@ function HDStDlg({ record, onClose }) { const dispatch = useDispatch(); const data = { - "stcd": "716129061", + "stcd": "61614200", "type": "sk", "hasRz": true, - "stnm": "仰天窝水库", - "adcd": "421181201000", + "stnm": "浮桥河水库", + "adcd": "421181100000", "wscd": null, "importancy": 0, - "lgtd": 115.106667, - "lttd": 31.126389, + "lgtd": 114.88069, + "lttd": 31.171967, "elev": 0, - "damel": 325.08, - "dsflz": 324.18, - "fsltdz": 323.5, - "ddz": 319.5, - "zcxsw": 323.5, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, + "damel": 71.33, + "dsflz": 68.04, + "fsltdz": 64.89, + "ddz": 51.78, + "zcxsw": 64.89, + "jhhsw":68.7, + "drpTm": "2025-06-06T22:00:00.000Z", + "today": 4, + "h1": 4, + "h3": 4, + "h6": 4, + "h12": 4, + "h24": 4, + "h48": 4, "drpState": 2, - "rz": 325.16, - "w": 0.132, - "a_fsltdz": 4.660000000000025, - "rzTm": "2025-04-11T05:00:00.000Z", + "rz": 65.7, + "w": 45490, + "xs":32133, + "a_fsltdz": -4.189999999999998, + "rzTm": "2025-06-06T22:00:00.000Z", "rzWarning": 1, "rzState": 2, - "pic": [ - { - "stcd": "716129061", - "tm": "2023-03-12T06:05:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg" - }, - { - "stcd": "716129061", - "tm": "2023-03-12T07:25:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg" - } - ], "layer": "RealSkLayer", - "layerPop": "RealSkPop", - "aRz": 4.66, - "strarz": "4.66" + "layerPop": "RealSkPop" } const flyTo = (row) => { @@ -95,7 +83,7 @@ function HDStDlg({ record, onClose }) {
- +
flyTo(data)} >
diff --git a/src/views/Home/InfoPops/RealSkPop/index.js b/src/views/Home/InfoPops/RealSkPop/index.js index c004266..7f55f01 100644 --- a/src/views/Home/InfoPops/RealSkPop/index.js +++ b/src/views/Home/InfoPops/RealSkPop/index.js @@ -195,6 +195,13 @@ function RealSkTip({ record, dispatch,view }) { 进入三维模块 :null } + + { + (record.stnm == '浮桥河水库' && view===8)? + { + dispatch.map.setView(205) + }}> 进入防汛调度:null + }
详细
diff --git a/src/views/Home/MapCtrl/mapstyle/realsklayerQ2.js b/src/views/Home/MapCtrl/mapstyle/realsklayerQ2.js index 7d438e1..09a73e5 100644 --- a/src/views/Home/MapCtrl/mapstyle/realsklayerQ2.js +++ b/src/views/Home/MapCtrl/mapstyle/realsklayerQ2.js @@ -74,51 +74,41 @@ export default class RealSkLayerQ2 extends BaseLayer { const ms = mapCtrl.getSource(SourceName); let data = [{ - "stcd": "716129061", - "type": "sk", - "hasRz": true, - "stnm": "仰天窝水库", - "adcd": "421181201000", - "wscd": null, - "importancy": 0, - "lgtd": 115.106667, - "lttd": 31.126389, - "elev": 0, - "damel": 325.08, - "dsflz": 324.18, - "fsltdz": 323.5, - "ddz": 319.5, - "zcxsw": 323.5, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 325.16, - "w": 0.132, - "a_fsltdz": 4.660000000000025, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 1, - "rzState": 2, - "pic": [ - { - "stcd": "716129061", - "tm": "2023-03-12T06:05:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg" - }, - { - "stcd": "716129061", - "tm": "2023-03-12T07:25:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg" - } - ], - "aRz": 4.66, - "strarz": "4.66" - }]; + "stcd": "61614200", + "type": "sk", + "hasRz": true, + "stnm": "浮桥河水库", + "adcd": "421181100000", + "wscd": null, + "importancy": 0, + "lgtd": 114.88069, + "lttd": 31.171967, + "elev": 0, + "damel": 71.33, + "dsflz": 68.04, + "fsltdz": 64.89, + "ddz": 51.78, + "zcxsw": 64.89, + "jhhsw":68.7, + "drpTm": "2025-06-06T22:00:00.000Z", + "today": 4, + "h1": 4, + "h3": 4, + "h6": 4, + "h12": 4, + "h24": 4, + "h48": 4, + "drpState": 2, + "rz": 65.7, + "w": 45490, + "xs":32133, + "a_fsltdz": -4.189999999999998, + "rzTm": "2025-06-06T22:00:00.000Z", + "rzWarning": 1, + "rzState": 2, + "layer": "RealSkLayer", + "layerPop": "RealSkPop" + }]; if (Array.isArray(data)) { data.forEach(o => { const strarz = o.rz - o.fsltdz; diff --git a/src/views/Home/panels/Cxsk/ARzSk.js b/src/views/Home/panels/Cxsk/ARzSk.js index eeb4bcf..5550c69 100644 --- a/src/views/Home/panels/Cxsk/ARzSk.js +++ b/src/views/Home/panels/Cxsk/ARzSk.js @@ -40,52 +40,40 @@ function Item({ data, viewInfo, sendMessage }) { function ARzSk({data}) { data = [{ - "stcd": "716129061", + "stcd": "61614200", "type": "sk", "hasRz": true, - "stnm": "仰天窝水库", - "adcd": "421181201000", + "stnm": "浮桥河水库", + "adcd": "421181100000", "wscd": null, "importancy": 0, - "lgtd": 115.106667, - "lttd": 31.126389, + "lgtd": 114.88069, + "lttd": 31.171967, "elev": 0, - "damel": 325.08, - "dsflz": 324.18, - "fsltdz": 323.5, - "ddz": 319.5, - "zcxsw": 323.5, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, + "damel": 71.33, + "dsflz": 68.04, + "fsltdz": 64.89, + "ddz": 51.78, + "zcxsw": 64.89, + "jhhsw":68.7, + "drpTm": "2025-06-06T22:00:00.000Z", + "today": 4, + "h1": 4, + "h3": 4, + "h6": 4, + "h12": 4, + "h24": 4, + "h48": 4, "drpState": 2, - "rz": 325.16, - "w": 0.132, - "a_fsltdz": 4.660000000000025, - "rzTm": "2025-04-11T05:00:00.000Z", + "rz": 65.7, + "w": 45490, + "xs":32133, + "a_fsltdz": -4.189999999999998, + "rzTm": "2025-06-06T22:00:00.000Z", "rzWarning": 1, "rzState": 2, - "pic": [ - { - "stcd": "716129061", - "tm": "2023-03-12T06:05:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg" - }, - { - "stcd": "716129061", - "tm": "2023-03-12T07:25:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg" - } - ], "layer": "RealSkLayer", - "layerPop": "RealSkPop", - "aRz": 4.66, - "strarz": "4.66" + "layerPop": "RealSkPop" }]; useEffect(()=>{ @@ -203,7 +191,7 @@ function ARzSk({data}) { {tableRow.stnm} - 小(2)型 + 大型水库 {tableRow.rz} +{(tableRow.rz-tableRow.fsltdz).toFixed(2)} diff --git a/src/views/Home/panels/DrpSta/index.js b/src/views/Home/panels/DrpSta/index.js index 6337731..389c029 100644 --- a/src/views/Home/panels/DrpSta/index.js +++ b/src/views/Home/panels/DrpSta/index.js @@ -222,14 +222,14 @@ export default function Overall({ style }) { "h12": 4, "h24": 4, "h48": 4, - "drpState": 1, - "rz": 60.7, + "drpState": 2, + "rz": 65.7, "w": 45490, "xs":32133, "a_fsltdz": -4.189999999999998, "rzTm": "2025-06-06T22:00:00.000Z", - "rzWarning": 0, - "rzState": 1, + "rzWarning": 1, + "rzState": 2, "layer": "RealSkLayer", "layerPop": "RealSkPop" }, @@ -386,7 +386,11 @@ export default function Overall({ style }) { 'layout': { // 'icon-allow-overlap': true, // 'text-allow-overlap': true, - 'icon-image': '水库', // 从properties中动态读取icon字段 + 'icon-image': [ + 'case', + ['==', ['get', 'rzWarning'], 1], '水库-超汛限', + '水库' + ], // 从properties中动态读取icon字段 'icon-size': [ 'interpolate', ['linear'], ['zoom'], 10, 0.8, diff --git a/src/views/Home/panels/SkWarning/index.js b/src/views/Home/panels/SkWarning/index.js index d8fb013..0ed7e8d 100644 --- a/src/views/Home/panels/SkWarning/index.js +++ b/src/views/Home/panels/SkWarning/index.js @@ -131,51 +131,41 @@ export default function Overall({ style }) { }; const skData =[{ - "stcd": "716129061", - "type": "sk", - "hasRz": true, - "stnm": "仰天窝水库", - "adcd": "421181201000", - "wscd": null, - "importancy": 0, - "lgtd": 115.106667, - "lttd": 31.126389, - "elev": 0, - "damel": 325.08, - "dsflz": 324.18, - "fsltdz": 323.5, - "ddz": 319.5, - "zcxsw": 323.5, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, - "drpState": 2, - "rz": 325.16, - "w": 0.132, - "a_fsltdz": 4.660000000000025, - "rzTm": "2025-04-11T05:00:00.000Z", - "rzWarning": 1, - "rzState": 2, - "pic": [ - { - "stcd": "716129061", - "tm": "2023-03-12T06:05:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg" - }, - { - "stcd": "716129061", - "tm": "2023-03-12T07:25:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg" - } - ], - "aRz": 4.66, - "strarz": "4.66" - }]; + "stcd": "61614200", + "type": "sk", + "hasRz": true, + "stnm": "浮桥河水库", + "adcd": "421181100000", + "wscd": null, + "importancy": 0, + "lgtd": 114.88069, + "lttd": 31.171967, + "elev": 0, + "damel": 71.33, + "dsflz": 68.04, + "fsltdz": 64.89, + "ddz": 51.78, + "zcxsw": 64.89, + "jhhsw":68.7, + "drpTm": "2025-06-06T22:00:00.000Z", + "today": 4, + "h1": 4, + "h3": 4, + "h6": 4, + "h12": 4, + "h24": 4, + "h48": 4, + "drpState": 2, + "rz": 65.7, + "w": 45490, + "xs":32133, + "a_fsltdz": -4.189999999999998, + "rzTm": "2025-06-06T22:00:00.000Z", + "rzWarning": 1, + "rzState": 2, + "layer": "RealSkLayer", + "layerPop": "RealSkPop" +}]; const flyTo = () => { const { lgtd, lttd } = skData[0]; if (lgtd && lttd) { @@ -249,12 +239,12 @@ export default function Overall({ style }) { station.id == "cxx" && flyTo()}>
仰天窝水库
 + >浮桥河水库 325.16(1.66)
龟山镇
 - 阎家河 + >中馆驿镇 + 长江 { diff --git a/src/views/Home/panels/Skzl/index.js b/src/views/Home/panels/Skzl/index.js index 629343c..9b3482e 100644 --- a/src/views/Home/panels/Skzl/index.js +++ b/src/views/Home/panels/Skzl/index.js @@ -97,11 +97,15 @@ function DrpReal({ style }) { 'layout': { // 'icon-allow-overlap': true, // 'text-allow-overlap': true, - 'icon-image': '水库', // 从properties中动态读取icon字段 + 'icon-image': [ + 'case', + ['==', ['get', 'rzWarning'], 1], '水库-超汛限', + '水库' + ], // 从properties中动态读取icon字段 'icon-size': [ 'interpolate', ['linear'], ['zoom'], 10, 0.8, - 14, 0.8, + 14, 0.8, ], 'text-size': [ 'interpolate', ['linear'], ['zoom'], diff --git a/src/views/Home/panels/Warn/ARzSk.js b/src/views/Home/panels/Warn/ARzSk.js index 6b4118f..876715c 100644 --- a/src/views/Home/panels/Warn/ARzSk.js +++ b/src/views/Home/panels/Warn/ARzSk.js @@ -37,50 +37,40 @@ function Item({ data, viewInfo, sendMessage }) { function ARzSk({ data }) { data = [{ - "stcd": "716129061", + "stcd": "61614200", "type": "sk", "hasRz": true, - "stnm": "仰天窝水库", - "adcd": "421181201000", + "stnm": "浮桥河水库", + "adcd": "421181100000", "wscd": null, "importancy": 0, - "lgtd": 115.106667, - "lttd": 31.126389, + "lgtd": 114.88069, + "lttd": 31.171967, "elev": 0, - "damel": 325.08, - "dsflz": 324.18, - "fsltdz": 323.5, - "ddz": 319.5, - "zcxsw": 323.5, - "drpTm": "2025-04-11T05:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 0, + "damel": 71.33, + "dsflz": 68.04, + "fsltdz": 64.89, + "ddz": 51.78, + "zcxsw": 64.89, + "jhhsw":68.7, + "drpTm": "2025-06-06T22:00:00.000Z", + "today": 4, + "h1": 4, + "h3": 4, + "h6": 4, + "h12": 4, + "h24": 4, + "h48": 4, "drpState": 2, - "rz": 325.16, - "w": 0.132, - "a_fsltdz": 4.660000000000025, - "rzTm": "2025-04-11T05:00:00.000Z", + "rz": 65.7, + "w": 45490, + "xs":32133, + "a_fsltdz": -4.189999999999998, + "rzTm": "2025-06-06T22:00:00.000Z", "rzWarning": 1, "rzState": 2, - "pic": [ - { - "stcd": "716129061", - "tm": "2023-03-12T06:05:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg" - }, - { - "stcd": "716129061", - "tm": "2023-03-12T07:25:00.000Z", - "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg" - } - ], - "aRz": 4.66, - "strarz": "4.66" + "layer": "RealSkLayer", + "layerPop": "RealSkPop" }]; const dispatch = useDispatch(); diff --git a/src/views/Home/panels/Zyskyb/index.js b/src/views/Home/panels/Zyskyb/index.js index 4352ddc..ac2346f 100644 --- a/src/views/Home/panels/Zyskyb/index.js +++ b/src/views/Home/panels/Zyskyb/index.js @@ -27,30 +27,33 @@ function DrpReal({ style }) { "adcd": "421181100000", "wscd": null, "importancy": 0, - "lgtd": 114.875, - "lttd": 31.166667, + "lgtd": 114.88069, + "lttd": 31.171967, "elev": 0, "damel": 71.33, "dsflz": 68.04, "fsltdz": 64.89, "ddz": 51.78, "zcxsw": 64.89, - "drpTm": "2025-06-03T02:00:00.000Z", - "today": 0, - "h1": 0, - "h3": 0, - "h6": 0, - "h12": 0, - "h24": 0, - "h48": 16.5, - "drpState": 1, - "rz": 60.71, - "w": 162.8, - "a_fsltdz": -4.18, - "rzTm": "2025-06-03T02:00:00.000Z", - "rzWarning": 0, - "rzState": 1, - "aRz": -4.18 + "jhhsw":68.7, + "drpTm": "2025-06-06T22:00:00.000Z", + "today": 4, + "h1": 4, + "h3": 4, + "h6": 4, + "h12": 4, + "h24": 4, + "h48": 4, + "drpState": 2, + "rz": 65.7, + "w": 45490, + "xs":32133, + "a_fsltdz": -4.189999999999998, + "rzTm": "2025-06-06T22:00:00.000Z", + "rzWarning": 1, + "rzState": 2, + "layer": "RealSkLayer", + "layerPop": "RealSkPop" },{ "stcd": "61612610", "type": "sk",