Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/mcfxkh-Web

public/data3/skReal.json

@@ -1914,6 +1914,7 @@
         "fsltdz": 64.89,
         "ddz": 51.78,
         "zcxsw": 64.89,
+        "jhhsw":68.7,
         "drpTm": "2025-06-06T22:00:00.000Z",
         "today": 4,
         "h1": 4,

src/views/Home/InfoPops/RealSkPop/index.js

@@ -206,7 +206,7 @@ function RealSkTip({ record, dispatch,view }) {
           >水位上报时间: {moment(record.drpTm).format('YYYY-MM-DD HH:mm')}</Typography>
 
           <div className={classes.infoItem}>
-            <div className="row-key">监测水位:</div>
+            <div className="row-key">实时水位:</div>
             <div className="row-value">{record.rz}</div>
             <div className="row-unit">米</div>
           </div>
@@ -229,6 +229,12 @@ function RealSkTip({ record, dispatch,view }) {
             <div className="row-unit">米</div>
           </div>
 
+          <div className={classes.infoItem}>
+            <div className="row-key">校核洪水位:</div>
+            <div className="row-value">{record.jhhsw || '-'}</div>
+            <div className="row-unit">米</div>
+          </div>
+
           <div className={classes.infoItem}>
             <div className="row-key">死水位:</div>
             <div className="row-value">{record.ddz}</div>

src/views/Home/MapCtrl/index.js

@@ -147,12 +147,14 @@ export default function MapCtrl({ initParams, onLoad }) {
               dispatch?.runtime.setInfoDlg({ layerId: 'ByjcLayer', properties: record })
           }else if (record.stnm == '浮桥河水库') {
               dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: record })
-          } else if (record.type == 'sw') {
+          }else if (record.type == 'sw') {
               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 })
+          } else if (record.taskType) {
+              dispatch?.runtime.setInfoDlg({ layerId: 'XcxqLayer', properties: record })
           }
           // dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: record, coordinates: [record.lgtd, record.lttd] });
         }

src/views/Home/panels/Xcwtkb/index.js

@@ -2,6 +2,7 @@ import React, { useMemo, useState } from 'react';
 import useRequest from '../../../../utils/useRequest';
 import { useDispatch, useSelector } from 'react-redux';
 import PanelBox from '../../components/PanelBox';
+import { parseGeoJSON } from "../../../../utils/tools";
 
 import Table from '@material-ui/core/Table';
 import TableContainer from '@material-ui/core/TableContainer';
@@ -1755,11 +1756,64 @@ function DrpReal({ style }) {
     const value = event.target.value;
     setDimension(value);
     }
+    const setLayer = (data = [], type) => {
+            const map = window.__mapref;
+            const layer = map.getLayer('关联站点')
+            if (layer) {
+              map.removeLayer('关联站点');
+              map.removeSource('关联站点');
+            }
+            if (data.length === 0) { return }
+            map.addLayer({
+                'id': '关联站点',//+new Date().getTime(),
+                'type': 'symbol',
+                'source': {
+                  'type': 'geojson',
+                  'data': {
+                    'type': 'FeatureCollection',
+                    'features': [],
+                  },
+                },
+                'layout': {
+                  'icon-allow-overlap': true,
+                  'text-allow-overlap': true,
+                  'icon-image': '巡查',
+                  'icon-size': [
+                    'interpolate', ['linear'], ['zoom'],
+                    10, 0.4,
+                    14, 0.8,
+                  ],
+        
+                  'text-allow-overlap': true,
+                  'text-size': [
+                    'interpolate', ['linear'], ['zoom'],
+                    10, 10,
+                    14, 14,
+                  ],
+                  'text-font': ['Roboto Black'],
+                  'text-field': [
+                    'step',
+                    ['zoom'],
+                    '',
+                    12, ['get', 'stnm']
+                  ],
+                  'text-anchor': 'top',
+                  'text-offset': [0, 1],
+                },
+                'paint': {
+                  'text-color': '#fff'
+                },
+                'visibility': 'visible',
+              });
+        
+            map.getSource('关联站点').setData(parseGeoJSON(data))
+          }
      const jumpTo = (record) => {
             const { lgtd, lttd } = record;
             const lgtdNum = Number(lgtd);
          const lttdNum = Number(lttd)
          if (record.code == 1) {
+               setLayer([{...record,lgtd:lgtdNum,lttd:lttdNum,stnm:"06-02浮桥河水库日常巡查"}])
              if (lgtdNum && lttdNum) {
                  dispatch.runtime.setCameraTarget({
                      center: [lgtdNum, lttdNum],

src/views/Home/panels/Xczl/index.js

@@ -2,6 +2,7 @@ import React, { useMemo, useState } from 'react';
 import useRequest from '../../../../utils/useRequest';
 import { useDispatch, useSelector } from 'react-redux';
 import PanelBox from '../../components/PanelBox';
+import { parseGeoJSON } from "../../../../utils/tools";
 
 import Table from '@material-ui/core/Table';
 import TableContainer from '@material-ui/core/TableContainer';
@@ -117,13 +118,67 @@ function DrpReal({ style }) {
         },
         'visibility': 'visible',
     });
-  }
+    }
+    
+    const setLayer = (data = [], type) => {
+        const map = window.__mapref;
+        const layer = map.getLayer('关联站点')
+        if (layer) {
+          map.removeLayer('关联站点');
+          map.removeSource('关联站点');
+        }
+        if (data.length === 0) { return }
+        map.addLayer({
+            'id': '关联站点',//+new Date().getTime(),
+            'type': 'symbol',
+            'source': {
+              'type': 'geojson',
+              'data': {
+                'type': 'FeatureCollection',
+                'features': [],
+              },
+            },
+            'layout': {
+              'icon-allow-overlap': true,
+              'text-allow-overlap': true,
+              'icon-image': '巡查',
+              'icon-size': [
+                'interpolate', ['linear'], ['zoom'],
+                10, 0.4,
+                14, 0.8,
+              ],
+    
+              'text-allow-overlap': true,
+              'text-size': [
+                'interpolate', ['linear'], ['zoom'],
+                10, 10,
+                14, 14,
+              ],
+              'text-font': ['Roboto Black'],
+              'text-field': [
+                'step',
+                ['zoom'],
+                '',
+                12, ['get', 'stnm']
+              ],
+              'text-anchor': 'top',
+              'text-offset': [0, 1],
+            },
+            'paint': {
+              'text-color': '#fff'
+            },
+            'visibility': 'visible',
+          });
+    
+        map.getSource('关联站点').setData(parseGeoJSON(data))
+      }
     const jumpTo = (record) => {
         const { lgtd, lttd } = record;
         const lgtdNum = Number(lgtd);
         const lttdNum = Number(lttd)
         if (record.code == 1) {
             setSkLayer1()
+            setLayer([{...record,lgtd:lgtdNum,lttd:lttdNum,stnm:"06-02浮桥河水库日常巡查"}])
             if (lgtdNum && lttdNum) {
                 dispatch.runtime.setCameraTarget({
                     center: [lgtdNum, lttdNum],