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

public/data/shyjFind.json

@@ -9,7 +9,7 @@
         "tempcolumn": 0,
         "warnid": 1128,
         "isauto": "0", 
-        "lgtd": 115.01083,
+        "lgtd": 115.02083,
         "lttd": 31.041152,
         "warnnm": "白果镇山洪准备转移",
         "adnm": "白果镇",
@@ -30,7 +30,7 @@
         "warnnm": "夫子河镇北门村山洪准备转移",
         "adnm": "夫子河镇北门村",
         "adcd": "421181104001000",
-        "lgtd": 115.01986,
+        "lgtd": 115.02986,
         "lttd": 30.968793,
         "warntypeid": 10,
         "temprownumber": 2
@@ -48,7 +48,7 @@
         "warnnm": "夫子河镇山洪准备转移",
         "adnm": "夫子河镇",
         "adcd": "421181104000000",
-        "lgtd": 115.026944,
+        "lgtd": 115.036944,
         "lttd": 30.959121,
         "warntypeid": 10,
         "temprownumber": 3
@@ -66,7 +66,7 @@
         "warnnm": "福田河镇山洪准备转移",
         "adnm": "福田河镇",
         "adcd": "421181111000000",
-        "lgtd": 115.075433,
+        "lgtd": 115.085433,
         "lttd": 31.384331,
         "warntypeid": 10,
         "temprownumber": 4
@@ -84,7 +84,7 @@
         "warnnm": "木子店镇山洪准备转移",
         "adnm": "木子店镇",
         "adcd": "421181107000000",
-        "lgtd": 115.172808,
+        "lgtd": 115.182808,
         "lttd": 30.963342,
         "warntypeid": 10,
         "temprownumber": 5
@@ -102,7 +102,7 @@
         "warnnm": "白果镇山洪准备转移",
         "adnm": "白果镇",
         "adcd": "421181103000000",
-        "lgtd": 115.01083,
+        "lgtd": 115.02083,
         "lttd": 31.041152,
         "warntypeid": 10,
         "temprownumber": 6

src/config.js

@@ -52,7 +52,7 @@ const config = {
     h: 720 / 2
   },
 
-  homePitch: 60,
+  homePitch: 0,
   poiPitch: 60,
 };
 

src/models/map/index.js

@@ -174,6 +174,7 @@ const map = {
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
         });
+        dispatch.runtime.setHome(); 
       }
       else if (id === 0) {
         layerVisible = {
@@ -191,10 +192,11 @@ const map = {
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
         });
+        dispatch.runtime.setHome(); 
       } else if (id === 8) {
         layerVisible = {
-          RealDrpLayer: false,
-          RealHDLayer: false,
+          RealDrpLayer: true,
+          RealHDLayer: true,
           RealSkLayer: false,
           PicStLayer: false,
           RivlLayer: true,
@@ -208,6 +210,7 @@ const map = {
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
         });
+        dispatch.runtime.setHome(); 
       } else if (id === 2) {
         layerVisible = {
           AdcdLayer: true,
@@ -231,6 +234,7 @@ const map = {
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = !SLGC_TYPES[key];
         });
+        dispatch.runtime.setHome(); 
       } else if (id === 4) {
         layerVisible = {
           RealDrpLayer: false,
@@ -243,19 +247,22 @@ const map = {
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
         });
+        dispatch.runtime.setHome(); 
       } else if (id === 5) {
         layerVisible = {
-          RealDrpLayer: true,
+          RealDrpLayer: false,
           RealHDLayer: false,
-          RealSkLayer: true,
+          RealSkLayer: false,
           FzdxLayer: false,
           WataLayer: false,
           AdcdLayer: true,
+          // AdcdLayer2: true,
           RivlLayer: true,
         };
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
         });
+        dispatch.runtime.setHome(); 
       } else if (id === 6) {
         layerVisible = {
           RealDrpLayer: false,
@@ -275,6 +282,7 @@ const map = {
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
         });
+        dispatch.runtime.setHome(); 
       } else if (id === 7) {
         layerVisible = {
           RealDrpLayer: false,
@@ -586,19 +594,33 @@ const map = {
         dispatch.map.setLayerSetting({ dom: false });
         if(map){
           map.setLayoutProperty('灌区图', 'visibility', 'visible');
-        }
+        } 
       } else {
         // dispatch.map.setLayerSetting({dom: true});
         if(map){
           map.setLayoutProperty('灌区图', 'visibility', 'none');
         }
       }
+      // if(id === 5){
+      //   if(map){
+      //     map.setLayoutProperty('网格雨量', 'visibility', 'visible');
+      //   } 
+      // }else{
+      //   if(map){
+      //     map.setLayoutProperty('网格雨量', 'visibility', 'none');
+      //   } 
+      // }
+
+
       if (id != 504) {
         dispatch.runtime.setYyfa({})
       }
 
       if (
         id === 3 
+        || id === 0
+        || id === 1
+        || id === 5
         || id === 8
         || id === 203
         || id === 205
@@ -609,12 +631,13 @@ const map = {
         // if(map){
         //   map.setLayoutProperty('卫星图', 'visibility', 'visible');
         // }
-      } else {
-        dispatch.map.setLayerSetting({ dom: false });
-        // if(map){
-        //   map.setLayoutProperty('卫星图', 'visibility', 'none');
-        // }
-      }
+      } 
+      // else {
+      //   dispatch.map.setLayerSetting({ dom: false });
+      //   // if(map){
+      //   //   map.setLayoutProperty('卫星图', 'visibility', 'none');
+      //   // }
+      // }
 
       if(id!==200&&id!==203&&id!==205&&id!==206){
         if(map){

src/views/Home/MapCtrl/mapstyle/adcdlayer.js

@@ -36,6 +36,8 @@ const SHAPE4 = {
   'minzoom': 1,
   'maxzoom': 14,
   'layout': {
+    // 'icon-allow-overlap': true,
+    // 'text-allow-overlap': true,
     'icon-image': 'adcd5',
     'icon-size': 0.4,
     'text-size': 13,

src/views/Home/MapCtrl/mapstyle/adcdlayer2.js

@@ -0,0 +1,150 @@
+
+import { openRecordPop } from "../_";
+import BaseLayer from "./baselayer";
+
+const SHAPE3 = {
+  id: '县名称2',
+  type: 'symbol',
+  source: 'adcd2',
+  filter: ['==', 'level', 4],
+  minzoom: 1,
+  maxzoom: 12,
+  layout: {
+    'icon-allow-overlap': true,
+    'text-allow-overlap': true,
+    'icon-image': 'adcd4',
+    'icon-size': 0.6,
+    'text-size': 16,
+    'text-font': ['Roboto Black'],
+    'text-field': ['get', 'NAME'],
+    'text-offset': [0, 0.6],
+    'text-anchor': 'top',
+    'text-max-width': 6,
+  },
+  paint: {
+    'text-color': '#fffab8',
+    'text-halo-color': 'hsl(0, 0%, 20%)',
+    'text-halo-width': 0.5
+  }
+};
+
+const SHAPE4 = {
+  'id': '乡镇名称2',
+  'type': 'symbol',
+  'source': 'adcd2',
+  filter: ['==', 'level', 5],
+  'minzoom': 1,
+  'maxzoom': 14,
+  'layout': {
+    'icon-image': 'adcd5',
+    'icon-size': 0.4,
+    // 'icon-allow-overlap': true,
+    // 'text-allow-overlap': true,
+    'text-size': 13,
+    'text-font': ['Roboto Black'],
+    'text-field': ['get', 'NAME'],
+    'text-offset': [0, 0.6],
+    'text-anchor': 'top',
+    'text-max-width': 6,
+  },
+  'paint': {
+    'text-color': '#fffab8',
+    'text-halo-color': '#062040',
+    'text-halo-width': 1
+  }
+};
+
+
+const SHAPE5 = {
+  'id': '村名称2',
+  'type': 'symbol',
+  'source': 'adcd2',
+  filter: ['==', 'level', 6],
+  'minzoom': 12,
+  'maxzoom': 18,
+  'layout': {
+    'icon-image': 'adcd6',
+    'icon-size': 0.4,
+    'text-size': 12,
+    'text-font': ['Roboto Black'],
+    'text-field': ['get', 'NAME'],
+    'text-offset': [0, 0.8],
+    'text-anchor': 'top',
+    'text-max-width': 6
+  },
+  'paint': {
+    'text-color': '#fff',
+    'text-halo-color': '#062040',
+    'text-halo-width': 1
+  }
+};
+
+
+
+const SHAPE6 = {
+  'id': '组名称2',
+  'type': 'symbol',
+  'source': 'adcd2',
+  filter: ['==', 'level', 7],
+  'minzoom': 13,
+  'maxzoom': 18,
+  'layout': {
+    'icon-image': 'adcd7',
+    'icon-size': 0.4,
+    'text-size': 11,
+    'text-font': ['Roboto Black'],
+    'text-field': ['get', 'NAME'],
+    'text-offset': [0, 0.6],
+    'text-anchor': 'top',
+    'text-max-width': 6
+  },
+  'paint': {
+    'text-color': '#fff',
+    'text-halo-color': '#062040',
+    'text-halo-width': 1
+  }
+};
+
+export default class AdcdLayer2 extends BaseLayer {
+
+  getStyle(index) {
+    let shp;
+    if (index === 1) {
+      shp = SHAPE4;
+    } else if (index === 2) {
+      shp = SHAPE5;
+    } else if (index === 3) {
+      shp = SHAPE6;
+    } else {
+      shp = SHAPE3;
+    }
+    this._setStyleVisibility(shp);
+    return shp;
+  }
+
+  getName() {
+    return 'AdcdLayer2';
+  }
+
+  getSubLayers() {
+    return [SHAPE3.id, SHAPE4.id, SHAPE5.id, SHAPE6.id];
+  }
+
+  getRefreshInterval() {
+    return 0;
+  }
+
+
+  async doRefreshLayer() {
+    return true;
+  }
+
+  getFeatureTip() {
+    return null;
+  }
+
+  featureClicked(properties, dispatch) {
+    console.log(properties);
+    openRecordPop(dispatch, 'adcd', properties)
+  }
+}

src/views/Home/MapCtrl/mapstyle/base.js

@@ -66,6 +66,17 @@ export default {
     'paint': {
       'raster-opacity': 1,
     }
+  },
+  wangge:{
+    'id': '网格雨量',
+    'type': 'raster',
+    'source': '网格雨量',
+    'layout': {
+      'visibility':'none'
+    },
+    'paint': {
+      'raster-opacity': 1,
+    }
   },
    gqmap: {
     'id': '灌区图',

src/views/Home/MapCtrl/mapstyle/layermgr.js

@@ -12,6 +12,7 @@ import ContourLayer from "./contourlayer";
 import WataLayer from "./watalayer";
 import HighlightLayer from "./highlightlayer";
 import AdcdLayer from "./adcdlayer";
+import AdcdLayer2 from "./adcdlayer2"
 import FzdxLayer from "./fzdxlayer";
 import TerrainLayer from "./terrainlayer";
 import PlaneAreaLayer from "./planarealayer";
@@ -112,6 +113,7 @@ class LayerMgr {
     this.layers.push(new PlaneAreaLayer());
     this.layers.push(new HighlightLayer());
     this.layers.push(new AdcdLayer());
+    this.layers.push(new AdcdLayer2());
     this.layers.push(new FzdxLayer());
     this.layers.push(new TerrainLayer());
     this.layers.push(new RoadLayer());
@@ -141,7 +143,6 @@ class LayerMgr {
       terrain: this.layerMap.TerrainLayer.getTerrain(),
       layers: [
         base.background,
-        base.zhenGround,
         base.heatmap,
         base.gwmap,
         base.gqmap,
@@ -151,8 +152,10 @@ class LayerMgr {
         this.layerMap.RivlLayer.getStyle('water'),
         this.layerMap.RivlLayer.getStyle('rivl'),
         sources.绿色区域 && base.plantZone,
+        base.zhenGround,
         base.浮桥河流域,
         base.浮桥河,
+        base.wangge,
         base.xzj.shape, base.xj.shape,
 
         this.layerMap.RoadLayer.getStyle('铁路case'),
@@ -207,6 +210,12 @@ class LayerMgr {
         this.layerMap.AdcdLayer.getStyle(1),
         this.layerMap.AdcdLayer.getStyle(0),
 
+        // this.layerMap.AdcdLayer2.getStyle(3),
+        // this.layerMap.AdcdLayer2.getStyle(2),
+        // this.layerMap.AdcdLayer2.getStyle(1),
+        // this.layerMap.AdcdLayer2.getStyle(0),
+
+
         this.layerMap.FzdxLayer.getStyle(),
         this.layerMap.BxjcLayer.getStyle(),
         this.layerMap.SyjcLayer.getStyle(),

src/views/Home/MapCtrl/mapstyle/sources.js

@@ -93,6 +93,21 @@ const sources = {
       [114.7460271999999929, 30.8613739500000008], // 左下
     ],
   },
+  //网格雨量
+  "网格雨量": {
+    'type': 'image',
+    'url': `${hash}/assets/画板1.png`,
+    'coordinates': [
+      // 图片覆盖地图的四至点
+      [114.6710271999999929, 31.6068084090000987], // 左上
+
+      [115.4657823634995805, 31.6068084090000987], // 右上
+
+      [115.4657823634995805, 30.8613739500000008], // 右下
+
+      [114.6710271999999929, 30.8613739500000008], // 左下
+    ],
+  },
   //灌区图
   "gqmapImg": {
     'type': 'image',
@@ -150,6 +165,10 @@ const sources = {
     "data": `${hash}/data/adcd.geojson`,
     "type": "geojson"
   },
+  "adcd2": {
+    "data": `${hash}/data/adcd2.geojson`,
+    "type": "geojson"
+  },
   /*
   "绿色区域": {
     "data": `${hash}/mapbox/geojson/绿色区域.geojson`,

src/views/Home/components/ActionDock/index.js

@@ -17,7 +17,7 @@ const VIEWS = [
       { id: 6, title: '预警', img: process.env.PUBLIC_URL+'/assets/menu/病险水库.png' },
       { id: 4, title: '预演', img: process.env.PUBLIC_URL+'/assets/menu/预警分析.png' },
       { id: 3, title: '预案', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' },
-      { id: 7, title: '调度', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' },
+      // { id: 7, title: '调度', img: process.env.PUBLIC_URL+'/assets/menu/辅助决策.png' },
     ]
   },
   // { id: 200, title: '水库', img: process.env.PUBLIC_URL+'/assets/menu/水库专题.png',children:[

src/views/Home/panels/Diaodujg/tableYj.js

@@ -142,6 +142,12 @@ const ReservoirTable = ({onChange}) => {
               <TableCell className={classes.headerCell}>
                 最大出库流量<br/>(m³/s)
               </TableCell>
+              <TableCell className={classes.headerCell}>
+                总出库水量<br/>(万m³)
+              </TableCell>
+               <TableCell className={classes.headerCell}>
+                最高库水位<br/>(m)
+              </TableCell>
             </TableRow>
           </TableHead>
           <TableBody>
@@ -151,6 +157,8 @@ const ReservoirTable = ({onChange}) => {
                 <TableCell className={classes.cell}>{formatFlowCell(item.maxInflow)}</TableCell>
                 <TableCell className={classes.cell}>{item.totalStorage}</TableCell>
                 <TableCell className={classes.cell}>{formatFlowCell(item.maxOutflow)}</TableCell>
+                <TableCell className={classes.cell}>16.76</TableCell>
+                <TableCell className={classes.cell}>12.32（03-23 14：:32）</TableCell>
               </TableRow>
             ))}
           </TableBody>

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

@@ -28,21 +28,21 @@ function DrpReal({ style }) {
         "NAME": "龙池办事处",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 20
     },
     {
         "ADCD": "421181002000000",
         "NAME": "鼓楼办事处",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 27
     },
     {
         "ADCD": "421181003000000",
         "NAME": "南湖办事处",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 10
     },
     {
         "ADCD": "421181100000000",
@@ -56,14 +56,14 @@ function DrpReal({ style }) {
         "NAME": "宋埠镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 13
     },
     {
         "ADCD": "421181102000000",
         "NAME": "歧亭镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 21
     },
     {
         "ADCD": "421181103000000",
@@ -77,35 +77,35 @@ function DrpReal({ style }) {
         "NAME": "夫子河镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 6
     },
     {
         "ADCD": "421181105000000",
         "NAME": "阎家河镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 16
     },
     {
         "ADCD": "421181106000000",
         "NAME": "龟山镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 9
     },
     {
         "ADCD": "421181107000000",
         "NAME": "盐田河镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 4
     },
     {
         "ADCD": "421181108000000",
         "NAME": "张家畈镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av":5
     },
     {
         "ADCD": "421181109000000",
@@ -126,7 +126,7 @@ function DrpReal({ style }) {
         "NAME": "黄土岗镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 10
     },
     {
         "ADCD": "421181112000000",
@@ -140,28 +140,28 @@ function DrpReal({ style }) {
         "NAME": "乘马岗镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 31
     },
     {
         "ADCD": "421181114000000",
         "NAME": "顺河镇",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 28
     },
     {
         "ADCD": "421181200000000",
         "NAME": "铁门岗乡",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 6
     },
     {
         "ADCD": "421181471000000",
         "NAME": "经济开发区",
         "drp": 0,
         "cnt": 0,
-        "av": 0
+        "av": 3
     }
 ] 
   const data2 = [

src/views/Home/panels/JbqkRight/page3.js

@@ -118,8 +118,8 @@ function Page({jbqkKey}) {
                     <TableRow>
                         <DpTableCell style={{ minWidth: '1rem' }} align="left">序号</DpTableCell>
                         <DpTableCell style={{ minWidth: '5rem' }} align="center">水库名称</DpTableCell>
-                        <DpTableCell style={{ minWidth: '8rem' }} align="center">类型</DpTableCell>
-                        <DpTableCell style={{ minWidth: '8rem' }} align="center">类型</DpTableCell>
+                        {/* <DpTableCell style={{ minWidth: '8rem' }} align="center">类型</DpTableCell> */}
+                        <DpTableCell style={{ minWidth: '8rem' }} align="center">库容</DpTableCell>
                     </TableRow>
                   </TableHead>
                   {
@@ -135,7 +135,7 @@ function Page({jbqkKey}) {
                           {tableRow.stnm}
                         </div>
                         </DpTableCell>
-                        <DpTableCell align="center" >{tableRow.name}</DpTableCell>
+                        {/* <DpTableCell align="center" >{tableRow.name}</DpTableCell> */}
                         <DpTableCell align="center" >{tableRow.w}</DpTableCell>
                       </DpTableRow>
                     </TableBody>

src/views/Home/panels/Overall/OverallContent.js

@@ -145,12 +145,12 @@ export default function OverallContent({ data }) {
       <div className={classes.grid}>
         <div>
           <div className="value">{strNumber(h24?.drpStCount?.total, '-')}</div>
-          <div className="key">降雨测站</div>
+          <div className="key">降雨测站数</div>
         </div>
         <div>
           {/* <div className="value">{strNumber(skInfo?.aRz, '-')}</div> */}
           <div className="value">{strNumber(1, '-')}</div>
-          <div className="key">超汛限水库</div>
+          <div className="key">超汛限水库数</div>
         </div>
         <div>
           <div className="value" style={{ fontSize: '1.5rem', cursor: 'pointer' }} onClick={() => {

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

@@ -247,11 +247,11 @@ function DrpReal({ style }) {
             <div style={{textAlign:'center'}}>生态流量站(2025-06-02 09:00)</div>
           </div>
           <div style={{width:'8rem',padding:'0.5rem 0.5rem',background:'#2a5278',display:'flex',flexDirection:'column',justifyContent:'flex-start',alignItems:'center',color:"#ffffff"}}>
-            <div><span style={{color:'#76b1d4',fontSize:'22px'}}>441.12</span> 万m³</div>
+            <div><span style={{color:'#76b1d4',fontSize:'22px'}}>371.12</span> 万m³</div>
             <div style={{marginTop:'5px'}}>月供水量</div>
           </div>
           <div style={{width:'8rem',padding:'0.5rem 0.5rem',background:'#2a5278',display:'flex',flexDirection:'column',justifyContent:'flex-start',alignItems:'center',color:"#ffffff"}}>
-            <div><span style={{color:'#76b1d4',fontSize:'22px'}}>371.12</span> 万m³</div>
+            <div><span style={{color:'#76b1d4',fontSize:'22px'}}>641.12</span> 万m³</div>
             <div style={{marginTop:'5px'}}>年供水量</div>
           </div>
         </div>
@@ -283,7 +283,7 @@ function DrpReal({ style }) {
             <div style={{textAlign:'center'}}>发电流量站(2025-06-02 09:00)</div>
           </div>
           <div style={{width:'8rem',padding:'0.5rem 0.5rem',background:'#2a5278',display:'flex',flexDirection:'column',justifyContent:'flex-start',alignItems:'center',color:"#ffffff"}}>
-            <div><span style={{color:'#76b1d4',fontSize:'22px'}}>426.12</span> 万m³</div>
+            <div><span style={{color:'#76b1d4',fontSize:'22px'}}>126.12</span> 万m³</div>
             <div style={{marginTop:'5px'}}>月供水量</div>
           </div>
           <div style={{width:'8rem',padding:'0.5rem 0.5rem',background:'#2a5278',display:'flex',flexDirection:'column',justifyContent:'flex-start',alignItems:'center',color:"#ffffff"}}>

src/views/Home/panels/Tqyb24h/dsld.js

@@ -35,79 +35,101 @@ import moment from 'moment';
 const { RangePicker } = DatePicker;
 
 const ljtj = [
-    {'level':'≥250',children:[],stcd:'001',color:'#ffd5d5'},
-    {'level':'100~250',children:[],stcd:'002',color:'#f2defe'},
-    {'level':'50~100',children:[],stcd:'003',color:'#ddf'},
-    {'level':'25~50',children:[],stcd:'004',color:'#d2e9fc'},
-    {'level':'10~25',children:[],stcd:'005',color:'#d9f7ff'},
-    {'level':'0.1~10',stcd:'006',color:'#edfce9',children:[
-        {
-            "stcd": "61612910",
-            "stnm": "铁门岗乡",
-            "adcd": "421181000000000",
-            "wscd": null,
-            "importancy": 0,
-            "lgtd": 115.087777777,
-            "lttd": 31.164444444,
-            "elev": null,
-            "hasRz": true,
-            "type": "sh",
-            "today": 0,
-            "h1": 7,
-            "h3": 8.4,
-            "h6": 10.5,
-            "h12": 11.200000000000001,
-            "h24": 12.6,
-            "h48": 32.8,
-            "tm": "2025-06-03T02:10:00.000Z",
-            "state": 1,
-            "warning": 0
-        },
-        {
-            "stcd": "61614460",
-            "stnm": "夫子河镇",
-            "adcd": "421181000000000",
-            "wscd": null,
-            "importancy": 0,
-            "lgtd": 114.798056,
-            "lttd": 31.058611,
-            "elev": null,
-            "hasRz": true,
-            "type": "sh",
-            "today": 0,
-            "h1": 6,
-            "h3": 7.199999999999999,
-            "h6": 9,
-            "h12": 9.600000000000001,
-            "h24": 10.8,
-            "h48": 11.899999999999999,
-            "tm": "2025-06-03T02:00:00.000Z",
-            "state": 1,
-            "warning": 0
-        },
-        {
-            "stcd": "61615110",
-            "stnm": "盐田河镇",
-            "adcd": "421181000000000",
-            "wscd": null,
-            "importancy": 0,
-            "lgtd": 115.339667,
-            "lttd": 31.1595,
-            "elev": null,
-            "hasRz": true,
-            "type": "sh",
-            "today": 0,
-            "h1": 7,
-            "h3": 8.4,
-            "h6": 10.5,
-            "h12": 11.200000000000001,
-            "h24": 12.6,
-            "h48": 31.299999999999997,
-            "tm": "2025-06-03T02:00:00.000Z",
-            "state": 1,
-            "warning": 0
-        },
-    ]},
+  {'level':'≥250',children:[],stcd:'001',color:'#ffd5d5'},
+  {'level':'100~250',children:[],stcd:'002',color:'#f2defe'},
+  {'level':'50~100',children:[],stcd:'003',color:'#ddf'},
+  {'level':'25~50',children:[],stcd:'004',color:'#d2e9fc'},
+  {'level':'10~25',children:[],stcd:'005',color:'#d9f7ff'},
+  {'level':'0.1~10',stcd:'006',color:'#edfce9',children:[
+      {
+          "stcd": "61612910",
+          "stnm": "白果镇",
+          "adcd": "421181000000000",
+          "wscd": null,
+          "importancy": 0,
+          "lgtd": 115.01083,
+          "lttd": 31.041152,
+          "elev": null,
+          "hasRz": true,
+          "type": "sh",
+          "today": 0,
+          "h1": 7,
+          "h3": 8.4,
+          "h6": 10.5,
+          "h12": 11.200000000000001,
+          "h24": 0.6,
+          "h48": 32.8,
+          "tm": "2025-06-03T02:10:00.000Z",
+          "state": 1,
+          "warning": 0
+      },
+      {
+          "stcd": "61614460",
+          "stnm": "夫子河镇",
+          "adcd": "421181000000000",
+          "wscd": null,
+          "importancy": 0,
+          "lgtd": 115.026944,
+          "lttd": 30.959121,
+          "elev": null,
+          "hasRz": true,
+          "type": "sh",
+          "today": 0,
+          "h1": 6,
+          "h3": 7.199999999999999,
+          "h6": 9,
+          "h12": 9.600000000000001,
+          "h24": 0.6,
+          "h48": 11.899999999999999,
+          "tm": "2025-06-03T02:00:00.000Z",
+          "state": 1,
+          "warning": 0
+      },
+      {
+          "stcd": "61615110",
+          "stnm": "盐田河镇",
+          "adcd": "421181000000000",
+          "wscd": null,
+          "importancy": 0,
+          "lgtd": 115.172808,
+          "lttd": 30.963342,
+          "elev": null,
+          "hasRz": true,
+          "type": "sh",
+          "today": 0,
+          "h1": 7,
+          "h3": 8.4,
+          "h6": 10.5,
+          "h12": 11.200000000000001,
+          "h24": 0.4,
+          "h48": 31.299999999999997,
+          "tm": "2025-06-03T02:00:00.000Z",
+          "state": 1,
+          "warning": 0
+      },
+      {
+          "stcd": "616151210",
+          "stnm": "龟山镇",
+          "adcd": "421181000000000",
+          "wscd": null,
+          "importancy": 0,
+          "lgtd": 115.183208,
+          "lttd": 31.074978,
+          "elev": null,
+          "hasRz": true,
+          "type": "sh",
+          "today": 0,
+          "h1": 7,
+          "h3": 8.4,
+          "h6": 10.5,
+          "h12": 11.200000000000001,
+          "h24": 0.51,
+          "h48": 31.299999999999997,
+          "tm": "2025-06-03T02:00:00.000Z",
+          "state": 1,
+          "warning": 0
+      },
+  ]},
 ]
 
 const useStyles = makeStyles((theme) => ({
@@ -185,11 +207,11 @@ export default function AreaDrp({ style }) {
   const flyTo = (record) => {
     const { lgtd, lttd } = record;
     if (lgtd && lttd) {
-      dispatch.runtime.setFeaturePop({ type: 'RealDrpPop', properties: record, coordinates: [lgtd, lttd] });
+      // dispatch.runtime.setFeaturePop({ type: 'RealDrpPop', properties: record, coordinates: [lgtd, lttd] });
       dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd + config.poiPositionOffsetY.sk],
-        zoom: config.poiPositionZoom.sk,
-        pitch: config.poiPitch,
+        center: [lgtd, lttd ],
+        zoom: 12,//12config.poiPositionZoom.sk,
+        pitch: 0,//config.poiPitch,
         bearing: 0,
       });
     }
@@ -277,7 +299,7 @@ export default function AreaDrp({ style }) {
                                             row.children.map((i,index)=>(
                                                 <div style={{display:'flex', color:'#ffffff',padding:'10px 0',paddingLeft:"2.5rem",background:'#1c2439',width:'26.6rem'}}>
                                                     <div style={{width:'13rem',textAlign:'center',cursor:'pointer'}} onClick={()=>{
-                                                        // flyTo(i)
+                                                        flyTo(i)
                                                     }}>{i.stnm}</div>
                                                     <div style={{width:'10rem',textAlign:'center'}}>{i.h24}</div>
                                                 </div>

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

@@ -32,9 +32,10 @@ const useStyles = makeStyles({
 
 export default function AreaDrp({ style }) {
   const classes = useStyles();
+  const [show,setShow] = useState(false)
   const dispatch = useDispatch();
   const [tab,setTab] = useState('1')
-  useEffect(()=>{
+  useEffect(()=>{ 
     // if(tab==='1'){
     //   dispatch.rcview.showRealContour('h24')
     // }else{
@@ -46,7 +47,18 @@ export default function AreaDrp({ style }) {
     //   dispatch.runtime.setLayerSetting({ planeArea: null });
     //   dispatch.map.setLayerVisible({ ContourLayer: false });
     // }
-  },[tab])
+    const map = window.__mapref
+    if(map){
+      map.setLayoutProperty('网格雨量', 'visibility', show?'visible':'none');
+    } 
+
+    return ()=>{
+      const map = window.__mapref
+      if(map){
+        map.setLayoutProperty('网格雨量', 'visibility', 'none');
+      } 
+    }
+  },[show])
 
 
   return (
@@ -54,6 +66,13 @@ export default function AreaDrp({ style }) {
       style={style}
       title="天气预报"
       color="blue"
+      extra={
+        <>
+          <div style={{color:show?"#29b6f6":'#ffffff',marginTop:"0.1rem",cursor:'pointer'}} onClick={()=>{
+            setShow(!show)
+          }}>显示网格</div>
+        </>
+      }
     >
       <div className={classes.root} style={{marginBottom:'-1.5rem'}}>
         <Grid container className={classes.tool}>

src/views/Home/panels/Tqyb24h/yb24h.js

@@ -2003,12 +2003,12 @@ const ljtj = [
     {'level':'0.1~10',stcd:'006',color:'#edfce9',children:[
         {
             "stcd": "61612910",
-            "stnm": "铁门岗乡",
+            "stnm": "白果镇",
             "adcd": "421181000000000",
             "wscd": null,
             "importancy": 0,
-            "lgtd": 115.087777777,
-            "lttd": 31.164444444,
+            "lgtd": 115.01083,
+            "lttd": 31.041152,
             "elev": null,
             "hasRz": true,
             "type": "sh",
@@ -2017,7 +2017,7 @@ const ljtj = [
             "h3": 8.4,
             "h6": 10.5,
             "h12": 11.200000000000001,
-            "h24": 12.6,
+            "h24": 0.6,
             "h48": 32.8,
             "tm": "2025-06-03T02:10:00.000Z",
             "state": 1,
@@ -2029,8 +2029,8 @@ const ljtj = [
             "adcd": "421181000000000",
             "wscd": null,
             "importancy": 0,
-            "lgtd": 114.798056,
-            "lttd": 31.058611,
+            "lgtd": 115.026944,
+            "lttd": 30.959121,
             "elev": null,
             "hasRz": true,
             "type": "sh",
@@ -2039,7 +2039,7 @@ const ljtj = [
             "h3": 7.199999999999999,
             "h6": 9,
             "h12": 9.600000000000001,
-            "h24": 10.8,
+            "h24": 0.6,
             "h48": 11.899999999999999,
             "tm": "2025-06-03T02:00:00.000Z",
             "state": 1,
@@ -2051,8 +2051,8 @@ const ljtj = [
             "adcd": "421181000000000",
             "wscd": null,
             "importancy": 0,
-            "lgtd": 115.339667,
-            "lttd": 31.1595,
+            "lgtd": 115.172808,
+            "lttd": 30.963342,
             "elev": null,
             "hasRz": true,
             "type": "sh",
@@ -2061,7 +2061,29 @@ const ljtj = [
             "h3": 8.4,
             "h6": 10.5,
             "h12": 11.200000000000001,
-            "h24": 12.6,
+            "h24": 0.4,
+            "h48": 31.299999999999997,
+            "tm": "2025-06-03T02:00:00.000Z",
+            "state": 1,
+            "warning": 0
+        },
+        {
+            "stcd": "616151210",
+            "stnm": "龟山镇",
+            "adcd": "421181000000000",
+            "wscd": null,
+            "importancy": 0,
+            "lgtd": 115.183208,
+            "lttd": 31.074978,
+            "elev": null,
+            "hasRz": true,
+            "type": "sh",
+            "today": 0,
+            "h1": 7,
+            "h3": 8.4,
+            "h6": 10.5,
+            "h12": 11.200000000000001,
+            "h24": 0.51,
             "h48": 31.299999999999997,
             "tm": "2025-06-03T02:00:00.000Z",
             "state": 1,
@@ -2081,11 +2103,11 @@ export default function AreaDrp({ style }) {
   const flyTo = (record) => {
     const { lgtd, lttd } = record;
     if (lgtd && lttd) {
-      dispatch.runtime.setFeaturePop({ type: 'RealDrpPop', properties: record, coordinates: [lgtd, lttd] });
+    //   dispatch.runtime.setFeaturePop({ type: 'RealDrpPop', properties: record, coordinates: [lgtd, lttd] });
       dispatch.runtime.setCameraTarget({
-        center: [lgtd, lttd + config.poiPositionOffsetY.sk],
-        zoom: config.poiPositionZoom.sk,
-        pitch: config.poiPitch,
+        center: [lgtd, lttd],
+        zoom: 12,//config.poiPositionZoom.sk,
+        pitch: 0,
         bearing: 0,
       });
     }
@@ -2348,7 +2370,7 @@ export default function AreaDrp({ style }) {
                                             row.children.map((i,index)=>(
                                                 <div style={{display:'flex', color:'#ffffff',padding:'10px 0',paddingLeft:"2.5rem",background:'#1c2439',width:'26.6rem'}}>
                                                     <div style={{width:'13rem',textAlign:'center',cursor:'pointer'}} onClick={()=>{
-                                                        // flyTo(i)
+                                                        flyTo(i)
                                                     }}>{i.stnm}</div>
                                                     <div style={{width:'10rem',textAlign:'center'}}>{i.h24}</div>
                                                 </div>

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

@@ -228,15 +228,15 @@ const householdData = [
             </Typography>
             <div style={{ display: 'flex', justifyContent: 'center', flexWrap: 'wrap', columnGap: 40 }}>
               <div style={{ padding: 10, width: 130, background: "linear-gradient(to bottom, #001529, #003366)" }}>
-                <div className="value" style={{ color: '#5ecd45' }}>35</div>
-                <div className="key" style={{ color: '#fff', fontSize: 16 }}>危险区面积</div>
+                <div className="value" style={{ color: '#5ecd45' }}>794</div>
+                <div className="key" style={{ color: '#fff', fontSize: 16 }}>危险区面积(m²)</div>
               </div>
               <div style={{ padding: 10, width: 130, background: "linear-gradient(to bottom, #001529, #003366)" }}>
-                <div className="value" style={{ color: '#5ecd45' }}>35</div>
+                <div className="value" style={{ color: '#5ecd45' }}>8</div>
                 <div className="key" style={{ color: '#fff', fontSize: 16 }}>危险区户数</div>
               </div>
               <div style={{ padding: 10, width: 130, background: "linear-gradient(to bottom, #001529, #003366)" }}>
-                <div className="value" style={{ color: '#5ecd45' }}>35</div>
+                <div className="value" style={{ color: '#5ecd45' }}>8</div>
                 <div className="key" style={{ color: '#fff', fontSize: 16 }}>风险点(个)</div>
               </div>
               <div style={{ padding: 10, width: 130, background: "linear-gradient(to bottom, #001529, #003366)" }}>
@@ -244,7 +244,7 @@ const householdData = [
                   className="value"
                   style={{ cursor: 'pointer', color: '#5ecd45' }}
                 >
-                  15
+                  32
                 </div>
                 <div className="key" style={{ color: '#fff', fontSize: 16 }}>危险区人口(人)</div>
               </div>
@@ -256,11 +256,11 @@ const householdData = [
         <div className="info-row">
           <div className="info-item">
             <span className="label">威胁对象：</span>
-            <span className="value">18</span>
+            <span className="value">8</span>
           </div>
           <div className="info-item">
             <span className="label">威胁人口：</span>
-            <span className="value">75</span>
+            <span className="value">32</span>
           </div>
         </div>
         <div className="info-item">

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

@@ -49,7 +49,7 @@ function DrpReal({ style }) {
   return (
     <PanelBox
       style={style}
-      title="雨情"
+      title="重点关注水情"
       color="green"
       tabs={
         <>

src/views/Home/panels/Zdgzsq/table.js

@@ -8,21 +8,136 @@ import TableBody from '@material-ui/core/TableBody';
 import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 import DpTableCell from '../../../../layouts/mui/DpTableCell';
+import { useDispatch, useSelector } from 'react-redux';
 import DpTableRow from '../../../../layouts/mui/DpTableRow';
 import appconsts from '../../../../models/appconsts';
 import { renderDrp, renderSkArz, renderSkRz } from '../../../../utils/renutils';
 
 
 const data = [
-  { name:'宋埠镇', name2:'项生(宋埠)', name3:'675.49', name4:'680.23', name5:'692.17' },
-  { name:'黄土岗镇', name2:'鹰山畈(黄土岗)', name3:'692.92', name4:'710.29', name5:'728.38' },
+  { name:'宋埠镇', name2:'项生(宋埠)', name3:'21.84', name4:'25.24', name5:'26.23',data: {
+    "stcd": "61614460",
+    "stnm": "项生(宋埠)",
+    "adcd": "421181000000000",
+    "wscd": null,
+    "importancy": 0,
+    "lgtd": 114.798056,
+    "lttd": 31.058611,
+    "elev": null,
+    "hasRz": true,
+    "wrz": null,
+    "wrq": null,
+    "grz": null,
+    "grq": null,
+    "sfz": null,
+    "sfq": null,
+    "type": "sh",
+    "tm": "2025-06-06T22:00:00.000Z",
+    "rz": 21.84,
+    "trend": -1,
+    "state": 1,
+    "warning": 0,
+    "maxRz": 21.9,
+    "maxDate": "2025-06-06T04:30:00.000Z",
+    "warndes": null
+}},
+  { name:'黄土岗镇', name2:'鹰山畈(黄土岗)', name3:'76.99', name4:'78.21', name5:'82.64',data:{
+    "stcd": "61612150",
+    "stnm": "鹰山畈(黄土岗)",
+    "adcd": "421181000000000",
+    "wscd": null,
+    "importancy": 0,
+    "lgtd": 115.073611,
+    "lttd": 31.386667,
+    "elev": null,
+    "hasRz": true,
+    "wrz": null,
+    "wrq": null,
+    "grz": null,
+    "grq": null,
+    "sfz": null,
+    "sfq": null,
+    "type": "sh",
+    "tm": "2025-06-06T22:00:00.000Z",
+    "rz": 76.99,
+    "trend": 1,
+    "state": 1,
+    "warning": 0,
+    "maxRz": 76.99,
+    "maxDate": "2025-06-05T17:25:00.000Z",
+    "warndes": null
+}},
 ]
 const data2 = [
-  { name:'阎家河', name2:'桃林河(阎河)', name3:'609.78', name4:'603.20', name5:'639.21' },
-  { name:'巴水', name2:'杨梅河(木子店)', name3:'509.53', name4:'539.20', name5:'558.29' },
+  { name:'阎家河', name2:'桃林河(阎河)', name3:'55.67', name4:'58.12', name5:'60.52',data:{
+    "stcd": "61612910",
+    "stnm": "桃林河(阎河)",
+    "adcd": "421181000000000",
+    "wscd": null,
+    "importancy": 0,
+    "lgtd": 115.087777777,
+    "lttd": 31.164444444,
+    "elev": null,
+    "hasRz": true,
+    "wrz": null,
+    "wrq": null,
+    "grz": null,
+    "grq": null,
+    "sfz": null,
+    "sfq": null,
+    "type": "sh",
+    "tm": "2025-06-06T22:15:00.000Z",
+    "rz": 55.67,
+    "trend": 0,
+    "state": 1,
+    "warning": 0,
+    "maxRz": 55.67,
+    "maxDate": "2025-06-06T02:05:00.000Z",
+    "warndes": null
+} },
+  { name:'巴水', name2:'杨梅河(木子店)', name3:'112.71', name4:'120.31', name5:'130.12',data:{
+    "stcd": "61615110",
+    "stnm": "杨梅河(木子店)",
+    "adcd": "421181000000000",
+    "wscd": null,
+    "importancy": 0,
+    "lgtd": 115.339667,
+    "lttd": 31.1595,
+    "elev": null,
+    "hasRz": true,
+    "wrz": null,
+    "wrq": null,
+    "grz": null,
+    "grq": null,
+    "sfz": null,
+    "sfq": null,
+    "type": "sh",
+    "tm": "2025-06-06T22:15:00.000Z",
+    "rz": 112.71,
+    "trend": 0,
+    "state": 1,
+    "warning": 0,
+    "maxRz": 112.71,
+    "maxDate": "2025-06-06T14:05:00.000Z",
+    "warndes": null
+}},
 ]
 
 function Page({ tab }) {
+  const dispatch = useDispatch();
+
+  const flyTo = (row) => {
+    const { lgtd, lttd } = row;
+    if (lgtd && lttd) {
+      dispatch.runtime.setFeaturePop({ type: 'RealHDPop', properties: row, coordinates: [row.lgtd, row.lttd] });
+      dispatch.runtime.setCameraTarget({
+        center: [lgtd, lttd],
+        zoom: 15,
+        pitch: 50,
+        bearing: 0
+      });
+    }
+  }
 
   return (
     <TableContainer style={{ height: '12rem' }}>
@@ -39,10 +154,10 @@ function Page({ tab }) {
           <TableBody>
             {(tab==='1'?data:data2).map((row) => (
               <DpTableRow key={row.name}>
+                <DpTableCell align="center">{row.name}</DpTableCell>
                 <DpTableCell component="th" scope="row">
-                  <div className="table-ellipsis cursor-pointer" onClick={() => {}}>{row.name}</div>
+                  <div className="table-ellipsis cursor-pointer" onClick={() => {flyTo(row.data)}}>{row.name2}</div>
                 </DpTableCell>
-                <DpTableCell align="center">{row.name2}</DpTableCell>
                 <DpTableCell align="center">{row.name3}</DpTableCell>
                 <DpTableCell align="center">{row.name4}</DpTableCell>
                 <DpTableCell align="center">{row.name5}</DpTableCell>

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

@@ -83,7 +83,7 @@ function DrpReal({ style }) {
       title="站点统计"
       color="green"
     >
-      <img  src={process.env.PUBLIC_URL+'/assets/站点统计.jpg'} style={{width:'27rem',marginLeft:'0rem',marginTop:'0rem'}} onClick={()=>{
+      <img  src={process.env.PUBLIC_URL+'/assets/站点统计.png'} style={{width:'26rem',marginLeft:'0.2rem',marginTop:'0.8rem'}} onClick={()=>{
         // setSkLayer1()
       }}/>
     </PanelBox>