From 3494416b0e5ebd4b80bc21e706a112bbe233d090 Mon Sep 17 00:00:00 2001
From: qzc <qzc@cloudowr.com>
Date: Wed, 28 May 2025 15:09:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |    2 +-
 public/mapbox/sprite@2x.json                  |   18 +-
 src/config.js                                 |    2 +-
 src/models/map/index.js                       |   39 +-
 src/views/Home/InfoDlg/BxjcBlg/descstyle.js   |  104 --
 src/views/Home/InfoDlg/BxjcBlg/drpOption.js   |  135 ++
 src/views/Home/InfoDlg/BxjcBlg/index.js       |   13 +-
 src/views/Home/InfoDlg/BxjcBlg/index.less     |  138 ++
 src/views/Home/InfoDlg/BxjcBlg/jbxx.js        |   98 --
 src/views/Home/InfoDlg/BxjcBlg/table.js       |  310 +++++
 src/views/Home/InfoDlg/LayersDlg/index.js     |    8 +-
 src/views/Home/InfoDlg/SljcDlg/drpOption.js   |  135 ++
 src/views/Home/InfoDlg/SljcDlg/index.js       |   46 +
 src/views/Home/InfoDlg/SljcDlg/index.less     |  138 ++
 src/views/Home/InfoDlg/SljcDlg/table.js       |  311 +++++
 src/views/Home/InfoDlg/SyjcDlg/drpOption.js   |  135 ++
 src/views/Home/InfoDlg/SyjcDlg/index.js       |   46 +
 src/views/Home/InfoDlg/SyjcDlg/index.less     |  138 ++
 src/views/Home/InfoDlg/SyjcDlg/table.js       |  304 +++++
 src/views/Home/InfoDlg/index.js               |    7 +-
 src/views/Home/InfoPops/_/layericons.js       |    3 +-
 src/views/Home/MapCtrl/mapstyle/bzlayer.js    |   12 +-
 src/views/Home/MapCtrl/mapstyle/layermgr.js   |   12 +
 src/views/Home/MapCtrl/mapstyle/qdlayer.js    |   14 +-
 src/views/Home/MapCtrl/mapstyle/sblayer.js    |   14 +-
 .../Home/MapCtrl/mapstyle/shuichangLayer.js   | 1162 +++++++++++++++++
 .../Home/MapCtrl/mapstyle/shuiyuandiLayer.js  |  252 ++++
 .../Home/MapCtrl/mapstyle/shuizhalayer.js     |   12 +-
 .../Home/MapCtrl/mapstyle/shuizhilayer.js     |   14 +-
 src/views/Home/MapCtrl/mapstyle/sources.js    |   13 +
 src/views/Home/MapCtrl/mapstyle/trsqlayer.js  |   14 +-
 src/views/Home/panels/Bjtj/chart.js           |    2 +-
 src/views/Home/panels/SkReal/index.js         |    2 +-
 src/views/Home/panels/Warn/Cxxsk.js           |   47 +
 src/views/Home/panels/Warn/index.js           |    4 +-
 35 files changed, 3439 insertions(+), 265 deletions(-)
 delete mode 100644 src/views/Home/InfoDlg/BxjcBlg/descstyle.js
 create mode 100644 src/views/Home/InfoDlg/BxjcBlg/drpOption.js
 create mode 100644 src/views/Home/InfoDlg/BxjcBlg/index.less
 delete mode 100644 src/views/Home/InfoDlg/BxjcBlg/jbxx.js
 create mode 100644 src/views/Home/InfoDlg/BxjcBlg/table.js
 create mode 100644 src/views/Home/InfoDlg/SljcDlg/drpOption.js
 create mode 100644 src/views/Home/InfoDlg/SljcDlg/index.js
 create mode 100644 src/views/Home/InfoDlg/SljcDlg/index.less
 create mode 100644 src/views/Home/InfoDlg/SljcDlg/table.js
 create mode 100644 src/views/Home/InfoDlg/SyjcDlg/drpOption.js
 create mode 100644 src/views/Home/InfoDlg/SyjcDlg/index.js
 create mode 100644 src/views/Home/InfoDlg/SyjcDlg/index.less
 create mode 100644 src/views/Home/InfoDlg/SyjcDlg/table.js
 create mode 100644 src/views/Home/MapCtrl/mapstyle/shuichangLayer.js
 create mode 100644 src/views/Home/MapCtrl/mapstyle/shuiyuandiLayer.js
 create mode 100644 src/views/Home/panels/Warn/Cxxsk.js

diff --git a/public/index.html b/public/index.html
index 0b6973b..cc1c6a7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -29,7 +29,7 @@
   <script type="text/javascript" src="%PUBLIC_URL%/d3.min.js"></script>
   <script type="text/javascript" src="%PUBLIC_URL%/popmotion.xl.min.js"></script>
 
-  <title>麻城市防汛抗旱大数据监控平台</title>
+  <title>麻城市智慧水利一张图</title>
 
   <style>
     .lf {
diff --git a/public/mapbox/sprite@2x.json b/public/mapbox/sprite@2x.json
index a013f71..5808d66 100644
--- a/public/mapbox/sprite@2x.json
+++ b/public/mapbox/sprite@2x.json
@@ -289,7 +289,7 @@
   },
   "变形监测": {
     "width": 26,
-    "height": 32,
+    "height": 26,
     "x": 0,
     "y": 288,
     "pixelRatio": 0.8,
@@ -366,5 +366,21 @@
     "y": 290,
     "pixelRatio": 0.5,
     "visible": true
+  },
+  "水厂": {
+    "width": 32,
+    "height": 32,
+    "x": 0,
+    "y": 315,
+    "pixelRatio": 0.6,
+    "visible": true
+  },
+  "水源地": {
+    "width": 32,
+    "height": 32,
+    "x": 256,
+    "y": 0,
+    "pixelRatio": 0.6,
+    "visible": true
   } 
 }
\ No newline at end of file
diff --git a/src/config.js b/src/config.js
index c946457..a127c25 100644
--- a/src/config.js
+++ b/src/config.js
@@ -8,7 +8,7 @@ const isShYjDebug = false;
 
 const config = {
   address,
-  title: '麻城市防汛抗旱大数据监控平台',
+  title: '麻城市智慧水利一张图',
   ADCD,
   ADCD6,
   ADCD12,
diff --git a/src/models/map/index.js b/src/models/map/index.js
index 19e0c17..3aa9d7c 100644
--- a/src/models/map/index.js
+++ b/src/models/map/index.js
@@ -320,18 +320,53 @@ const map = {
         layerVisible = {
           RealDrpLayer: false,
           RealHDLayer: false,
-          RealSkLayer: true,
+          RealSkLayer: false,
           BxSkLayer: false,
           FzdxLayer: false,
           WataLayer: false,
           AdcdLayer: true,
           RoadLayer: true,
           RivlLayer: true,
+          ShuichangLayer:true,
+          ShuiyuandiLayer:true,
         };
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
         });
-      } else if (id === 302 || id === 303 || id === 306 || id === 305) {
+      } else if (id === 302) {
+        layerVisible = {
+          RealDrpLayer: false,
+          RealHDLayer: false,
+          RealSkLayer: false,
+          BxSkLayer: false,
+          FzdxLayer: false,
+          WataLayer: false,
+          AdcdLayer: true,
+          RoadLayer: true,
+          RivlLayer: true,
+          // ShuichangLayer:true,
+          ShuizhiLayer:true,
+        };
+        Object.keys(DCPJ_TYPES).forEach(key => {
+          layerVisible['Dcpj_' + key + 'Layer'] = false;
+        });
+      } else if (id === 303) {
+        layerVisible = {
+          RealDrpLayer: false,
+          RealHDLayer: false,
+          RealSkLayer: false,
+          BxSkLayer: false,
+          FzdxLayer: false,
+          WataLayer: false,
+          AdcdLayer: true,
+          RoadLayer: true,
+          RivlLayer: true,
+          ShuichangLayer:true,
+        };
+        Object.keys(DCPJ_TYPES).forEach(key => {
+          layerVisible['Dcpj_' + key + 'Layer'] = false;
+        });
+      } else if ( id === 303 || id === 306 || id === 305) {
         layerVisible = {
           RealDrpLayer: false,
           RealHDLayer: false,
diff --git a/src/views/Home/InfoDlg/BxjcBlg/descstyle.js b/src/views/Home/InfoDlg/BxjcBlg/descstyle.js
deleted file mode 100644
index 36e42b1..0000000
--- a/src/views/Home/InfoDlg/BxjcBlg/descstyle.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import { makeStyles } from '@material-ui/core'
-const useDescStyles = makeStyles({
-  root: { flex: 'auto' },
-
-  tabBox: { width: '2rem' },
-  tabs1: {
-    backgroundColor: '#122e47',
-    fontWeight: 'bold',
-    overflow: 'hidden',
-    marginBottom: '0.6rem',
-    color: '#E2EDFF'
-  },
-  tabIndicator: {
-    backgroundColor: 'transparent'
-  },
-
-  active: {
-    border: '1px solid #02a6b5'
-  },
-  title: {
-    width: '16%',
-    display: 'flex',
-    alignItems: 'center',
-    padding: '0.2rem 0.5rem',
-    textAlign: 'left',
-    borderBottom: '1px solid rgb(33, 53, 77)',
-    borderLeft: '1px solid rgb(33, 53, 77)',
-    borderTop: '1px solid rgb(33, 53, 77)',
-    overflowWrap: 'break-word'
-  },
-
-  value: {
-    width: '50%',
-    display: 'flex',
-    alignItems: 'center',
-    padding: '1rem 0.5rem',
-    textAlign: 'left',
-    border: '1px solid rgb(33, 53, 77)',
-    overflowWrap: 'break-word',
-    wordBreak: 'break-all'
-  },
-  title1: {
-    width: '99.6%',
-    display: 'flex',
-    alignItems: 'center',
-    padding: '0.2rem 0.5rem',
-    textAlign: 'left',
-    border: '1px solid rgb(33, 53, 77)',
-    overflowWrap: 'break-word',
-    height: '2.5rem'
-  },
-
-  cont: {
-    display: 'flex'
-  },
-  tabList: {
-    width: '100%'
-  },
-  tableCont: {
-    height: '100%',
-    width: '99.6%',
-    border: '1px solid rgb(33, 53, 77)'
-  },
-  tablebg: {
-    backgroundColor: 'transparent',
-    border: '1px solid rgb(33, 53, 77)'
-  },
-  emit: {
-    border: '1px solid rgb(33, 53, 77)'
-  },
-  title2: {
-    width: '83.6%',
-    display: 'flex',
-    alignItems: 'center',
-    padding: '0.2rem 0.5rem',
-    textAlign: 'left',
-    border: '1px solid rgb(33, 53, 77)',
-    overflowWrap: 'break-word'
-  },
-  tit: {
-    width: '50%',
-    display: 'flex',
-    alignItems: 'center',
-    padding: '1rem 0.5rem',
-    textAlign: 'left',
-    borderBottom: '1px solid rgb(33, 53, 77)',
-    borderLeft: '1px solid rgb(33, 53, 77)',
-    borderTop: '1px solid rgb(33, 53, 77)',
-    overflowWrap: 'break-word',
-    backgroundColor: 'rgba(33,53,77,0.2)'
-    // color: '#bbb'
-  },
-  value1: {
-    width: '99.6%',
-    display: 'flex',
-    alignItems: 'center',
-    padding: '0.2rem 0.5rem',
-    textAlign: 'left',
-    border: '1px solid rgb(33, 53, 77)',
-    overflowWrap: 'break-word'
-  }
-})
-
-export default useDescStyles
diff --git a/src/views/Home/InfoDlg/BxjcBlg/drpOption.js b/src/views/Home/InfoDlg/BxjcBlg/drpOption.js
new file mode 100644
index 0000000..d001c67
--- /dev/null
+++ b/src/views/Home/InfoDlg/BxjcBlg/drpOption.js
@@ -0,0 +1,135 @@
+export default function drpOption(data) {
+  return {
+
+    tooltip: {
+      trigger: 'axis',
+    },
+    grid: [
+      {
+        top: "15%",
+        left: "10%",
+        right: "8%",
+        width: '80%',
+        height: '75%'
+      }
+    ],
+    legend: {
+      // 显示图例
+      show: true,
+      textStyle: {
+        color: '#fff', 
+      },
+      // 图例的位置
+      data: ['垂直位移', '库水位'],
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.map(o => o.dt),//.reverse(),
+        splitLine: {
+          show: false
+        },
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+          show:false,
+        },
+        axisLine: {
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.5,
+          }
+        },
+        axisTick: {
+          show: false,
+        },
+      },
+    ],
+    yAxis: [
+      {
+        inverse: false,
+        type: 'value',
+        position: 'left',
+        name: "垂直位移",
+        nameTextStyle: {
+          color: '#fff' 
+        },
+        // nameLocation: "start",
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+        },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.25,
+            type: 'dotted'
+          }
+        },
+        axisLine: {
+          show: false
+        },
+        axisTick: {
+          show: false,
+        },
+        min: -20,
+        max:20
+      },
+      {
+        // gridIndex: 1,
+        type: 'value',
+        position: 'right',
+        name: "库水位",
+        nameTextStyle: {
+          color: '#fff' 
+        },
+        splitLine: {
+          show: false,
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.25,
+            type: 'dotted'
+          }
+        },
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+        },
+        axisLine: {
+          show: false
+        },
+        axisTick: {
+          show: false,
+        },
+        min: 0,
+        max: 150
+      }
+    ],
+    series: [
+      {
+        yAxisIndex: 0,
+        name: '垂直位移(mm)',
+        type: 'line',
+        symbol: 'none',
+        color: "#0AE0B5",
+        label: {
+          show: false,
+        },
+        data:data.map(o => o.du_value),
+      },
+      {
+        yAxisIndex: 1,
+        name: '库水位(m)',
+        type: 'line',
+        color: "#007AFD",
+        symbol: 'none',
+        showSymbol: false,
+        label: {
+          show: false,
+        },
+        data:  data.map(o => o.rz),
+      }
+    ]
+  };
+}
diff --git a/src/views/Home/InfoDlg/BxjcBlg/index.js b/src/views/Home/InfoDlg/BxjcBlg/index.js
index c3b47e1..1314e54 100644
--- a/src/views/Home/InfoDlg/BxjcBlg/index.js
+++ b/src/views/Home/InfoDlg/BxjcBlg/index.js
@@ -12,8 +12,7 @@ import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
 import DrpSearch from '../../components/DrpSearch';
 import DrpStAround from '../../components/DrpStAround';
 import GqJcsj from '../../components/Hdjcsj'
-import GqJbxx from './jbxx';
-import Gqspxx from '../GqbzDlg/spxx' 
+import Table from './table'
 
 function HDStDlg({ record, onClose }) {
   const [value, setValue] = React.useState(0);
@@ -31,18 +30,12 @@ function HDStDlg({ record, onClose }) {
       <DialogContent style={{ padding: 0, width: '80rem', overflowX: 'hidden' }}>
         <DpAppBar position="sticky">
           <DpTabs value={value} indicatorColor="primary" onChange={(_, v) => setValue(v)}>
-            <DpTab label="监测数据" />
-            {/* <DpTab label="基本信息" /> */}
-                        {/* <DpTab label="视频信息" /> */}
-            
+            <DpTab label={record.res_nm+'-'+record.cd_nm} />
           </DpTabs>
           <DpCloseButton onClick={onClose} />
         </DpAppBar>
         <div style={{ padding: '2rem', hminHeight: '50rem',maxHeight: '60rem' }}>
-          {value === 0 && <GqJcsj record={record} />}
-          {/* {value === 1 && <GqJbxx record={record} />} */}
-                    {/* {value === 2 && <Gqspxx record={record} />} */}
-          
+          <Table/>
         </div>
 
       </DialogContent>
diff --git a/src/views/Home/InfoDlg/BxjcBlg/index.less b/src/views/Home/InfoDlg/BxjcBlg/index.less
new file mode 100644
index 0000000..5e5a3ee
--- /dev/null
+++ b/src/views/Home/InfoDlg/BxjcBlg/index.less
@@ -0,0 +1,138 @@
+.infoDlg_jcsj{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    .toolbar{
+        display: flex;
+        .tm{
+            width: 40%;
+            display: flex;
+            justify-content: center;
+            font-size: 14px;
+            font-weight: 400;
+            border-radius: 2px;
+            color: #fff;
+            background: linear-gradient(270deg,rgba(65,76,217,.4),rgba(58,85,218,.2) 14%,rgba(54,90,218,0) 49%,rgba(51,94,218,.2) 86%,rgba(44,102,219,.4));
+            border: 1px solid #0e4e93;
+
+            .MuiInput-underline:before{
+                border: 0px;
+            }
+            .time-picker{
+                .ant-picker-input > input{
+                    color: #fff;
+                }
+                .ant-picker-separator{
+                    color: #fff;
+                }
+                
+            }
+        }
+        .time-type {
+            margin-left: 10rem;
+            display: flex;
+            cursor: pointer;
+            background-color: #393e45;
+            border-radius: 5%;
+            padding: 0.01% !important;
+            border: 1px solid #585e64;
+            div {
+              width: 80px;
+              border-radius: 5%;
+              text-align: center;
+              border: 1px solid #585e64;
+              padding: 4px 0;
+            }
+        
+            .active {
+              color: #5FB7FF;
+            //   background: #F0F7FF;
+              border: 1px solid #5FB7FF;
+            }
+          }
+        .search{
+            margin-left: 1.5rem;
+            border: 1px solid #0e4e93;
+   
+            background: url(../../../../assets/btn44.png) no-repeat 100% center;
+            color: #fff;
+            padding: 0 1rem;
+            border-radius: 2px;
+            cursor: pointer;
+        }
+    }
+    .content{
+        height: 40vh;
+        margin-top: 1vh;
+        display: flex;
+
+        .list{
+            width: 40%;
+        }
+        .echart{
+            flex: 1;
+        }
+    }
+    .echartBox{
+        width: 60%;
+        .echart1{
+            width: 100%;
+            height: 100%;
+        }
+    }
+    .foot{
+        flex: 1;
+        margin-top: 15px;
+        .split-line{
+            width: 100%;
+            border: 1px dashed rgba(16, 102, 141);
+            opacity: .36;
+            margin-bottom: 15px;
+        }
+        .MuiGrid-container{
+            background-color: #182d42 !important;
+        }
+    }
+    
+}
+.ant-picker-panel-container{
+    background-color: rgba(36, 46, 92,1) !important;
+   
+}
+.ant-picker-header,.ant-picker-body{
+    color: #fff !important;
+    border-color: #242e5c;
+}
+.ant-picker-content th{
+    color: #fff !important;
+}
+.ant-picker-cell,
+.ant-picker-header-super-prev-btn,
+.ant-picker-header-prev-btn,
+.ant-picker-header-next-btn,
+.ant-picker-header-super-next-btn
+{
+    color: #fff !important;
+}
+.ant-picker-cell:hover:not(.ant-picker-cell-selected):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end):not(.ant-picker-cell-range-hover-start):not(.ant-picker-cell-range-hover-end) .ant-picker-cell-inner{
+    // background: transparent !important;
+    color: #000;
+}
+.ant-picker-cell-in-view.ant-picker-cell-in-range::before,
+.ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single)::before,
+.ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single)::before
+{
+    background-color:transparent !important;
+}
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner{
+    background-color: #1890ff !important;
+}
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell .ant-picker-time-panel-cell-inner:hover{
+    // background-color:transparent !important;
+    color: #000 !important;
+}
+.ant-picker-header-super-next-btn,.ant-picker-time-panel-cell-inner
+{
+    color: #fff !important;
+}
\ No newline at end of file
diff --git a/src/views/Home/InfoDlg/BxjcBlg/jbxx.js b/src/views/Home/InfoDlg/BxjcBlg/jbxx.js
deleted file mode 100644
index 4b09e13..0000000
--- a/src/views/Home/InfoDlg/BxjcBlg/jbxx.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Grid } from '@material-ui/core'
-import useDescStyle from './descstyle'
-
-function Jbxx ({ record }) {
-  const classes = useDescStyle()
-
-  return (
-    <>
-      <div style={{ fontSize: '0.9rem', marginLeft: '1rem' }}>
-        <Grid container className={classes.cont}>
-          <Grid item className={classes.tit}>
-            灌区名称
-          </Grid>
-          <Grid item className={classes.value}>
-                        {record?.chanCode_dictText}
-          </Grid>
-          <Grid item className={classes.tit}>
-            水闸类型
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.wagaType_dictText??'--'}
-          </Grid>
-          <Grid item className={classes.tit}>
-            行政区划
-          </Grid>
-          <Grid item className={classes.value} style={{}}>
-            {record?.adCode_dictText}
-          </Grid>
-          <Grid item className={classes.tit}>
-            管理单位
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.engManCode_dictText}
-          </Grid>
-          <Grid item className={classes.tit}>
-            渠道名称
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.chanCode_dictText}
-          </Grid>
-          <Grid item className={classes.tit}>
-            桩号
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.bnch}
-          </Grid>
-          <Grid item className={classes.tit}>
-            动力类型
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.pwrTp_dictText??'--'}
-          </Grid>
-          <Grid item className={classes.tit}>
-            闸门孔数
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.whthInWat??'--'}
-          </Grid>
-          <Grid item className={classes.tit}>
-            闸门尺寸
-          </Grid>
-          <Grid item className={classes.value}>
-            3*2.8m*m
-          </Grid>
-          <Grid item className={classes.tit}>
-             设计流量
-          </Grid> 
-          <Grid item className={classes.value}>
-            {record?.dsfl}m³/s
-          </Grid>
-          <Grid item className={classes.tit}>
-            进口高程
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.actIrrA??'--'}m
-          </Grid>
-          <Grid item className={classes.tit}>
-            实达流量
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.stfl??'--'}
-          </Grid>
-            <Grid item className={classes.tit}>
-            运行状态
-          </Grid>
-          <Grid item className={classes.value}>
-            {record?.runStat_dictText??'--'}
-          </Grid>
-        </Grid>
-      </div>
-
-      <div className='boxfoot'></div>
-    </>
-  )
-}
-
-export default React.memo(Jbxx)
\ No newline at end of file
diff --git a/src/views/Home/InfoDlg/BxjcBlg/table.js b/src/views/Home/InfoDlg/BxjcBlg/table.js
new file mode 100644
index 0000000..71b0551
--- /dev/null
+++ b/src/views/Home/InfoDlg/BxjcBlg/table.js
@@ -0,0 +1,310 @@
+import { TableCell, withStyles, Table, TableBody, TableContainer, TableHead, TableRow, TextField, Grid } from '@material-ui/core';
+import { DatePicker } from 'antd';
+import { makeStyles } from '@material-ui/core/styles';
+import moment from 'moment';
+import DpTableRow from '../../../../layouts/mui/DpTableRow';
+import DescriptionItem from '../../components/DescrptionItem2';
+import ReactEcharts from 'echarts-for-react';
+import drpOption from './drpOption';
+import { DateTimePicker } from '@material-ui/pickers';
+import React, { useEffect, useState,useMemo } from 'react';
+import './index.less'
+const { RangePicker } = DatePicker;
+const useStyles = makeStyles({
+    tableContainer: {
+      background: '#182d42', // 设置表格容器的背景颜色
+    },
+    item: {
+        '& .MuiGrid-item': {
+          '& [class*="makeStyles-title"]': {
+            color: '#fff',
+            backgroundColor: '#104175',
+          },
+        },
+      },
+  });
+const DpTableCell = withStyles({
+    head: {
+        backgroundColor: '#104175',
+        color: '#fff',
+        fontSize: '1rem',
+        padding: '0.5rem 0.3rem !important',
+      },
+    body: {
+        color: '#fff',
+        fontSize: '0.9rem',
+        padding: '0.7rem 0.3rem !important',
+        borderBottom: 'none',
+        position: "relative"
+    },
+  })(TableCell);
+
+
+
+const data = [
+    {
+        "res_cd": "42118140022",
+        "rz": 141.95,
+        "du_value":-8.29,
+        "dt": "2025-04-28"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-8.80,
+        "rz": 141.95,
+        "dt": "2025-04-29"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.13,
+        "rz": 141.94,
+        "dt": "2025-04-30"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.19,
+        "rz": 141.95,
+        "dt": "2025-05-01"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.29,
+        "rz": 141.95,
+        "dt": "2025-05-02"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.26,
+        "rz": 141.94,
+        "dt": "2025-05-03"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.31,
+        "rz": 141.92,
+        "dt": "2025-05-04"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.20,
+        "rz": 142.03,
+        "dt": "2025-05-05"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.66,
+        "rz": 142.03,
+        "dt": "2025-05-06"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.52,
+        "rz": 142.03,
+        "dt": "2025-05-07"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.40,
+        "rz": 142.01,
+        "dt": "2025-05-08"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.75,
+        "rz": 142.22,
+        "dt": "2025-05-09"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.25,
+        "rz": 142.23,
+        "dt": "2025-05-10"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.59,
+        "rz": 142.27,
+        "dt": "2025-05-11"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.98,
+        "rz": 142.28,
+        "dt": "2025-05-12"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.82,
+        "rz": 142.28,
+        "dt": "2025-05-13"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.72,
+        "rz": 142.3,
+        "dt": "2025-05-14"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-11.26,
+        "rz": 142.28,
+        "dt": "2025-05-15"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-12.16,
+        "rz": 142.33,
+        "dt": "2025-05-16"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-11.82,
+        "rz": 142.33,
+        "dt": "2025-05-17"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.92,
+        "rz": 142.32,
+        "dt": "2025-05-18"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.15,
+        "rz": 142.36,
+        "dt": "2025-05-19"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.09,
+        "rz": 142.33,
+        "dt": "2025-05-20"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-10.21,
+        "rz": 142.33,
+        "dt": "2025-05-21"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-11.62,
+        "rz": 142.31,
+        "dt": "2025-05-22"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-11.42,
+        "rz": 142.41,
+        "dt": "2025-05-23"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.74,
+        "rz": 142.45,
+        "dt": "2025-05-24"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-9.02,
+        "rz": 142.45,
+        "dt": "2025-05-25"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-8.37,
+        "rz": 142.44,
+        "dt": "2025-05-26"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-8.79,
+        "rz": 142.45,
+        "dt": "2025-05-27"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":-8.29,
+        "rz": 142.4,
+        "dt": "2025-05-28"
+    }
+]
+
+function DrpStAround({ record }) {
+    const classes = useStyles();
+
+    const option = useMemo(() => {
+      return drpOption(data);
+    }, [])
+    
+  
+    return (
+        <div className='infoDlg_jcsj'>
+            <div className='toolbar'>
+                <div className='tm' style={{position:"relative",zIndex:999999}}>
+                    <RangePicker
+                        width="100%"
+                        className='time-picker'
+                        style={{
+                            flex:1,
+                            background: "transparent",
+                            border: "none",
+                            color: "#fff",
+                        }}
+                        allowClear
+                        format="YYYY-MM-DD"
+                        showTime={{
+                          format: 'HH:mm',
+                        }}
+                        value={[moment('2025-04-28'),moment('2025-05-28')]}
+                    />
+                </div>
+                <button className='search'>查询</button>
+            </div>
+            <div className='content' style={{height:"49vh"}}>
+                <div className='list'>
+                    <TableContainer style={{ height: '100%' }} className={classes.tableContainer}>
+                        <Table size="small" stickyHeader>
+                            <TableHead>
+                                <TableRow>
+                                <DpTableCell align="center" style={{ width: '20%' }}>时间</DpTableCell>
+                                <DpTableCell align="center" style={{ width: '20%' }}>库水位(m)</DpTableCell>
+                                <DpTableCell align="center" style={{ width: '20%' }}>垂直位移(mm)</DpTableCell>
+                                </TableRow>
+                            </TableHead>
+                            <TableBody>
+                                {
+                                    data.map((row) => (
+                                <DpTableRow key={row.dt}>
+                                    <DpTableCell align="center"><div className="ellipsis">{row.dt}</div></DpTableCell>
+                                    <DpTableCell align="center">{row.rz?? "-"}</DpTableCell>
+                                    <DpTableCell align="center">{row.du_value?? "-"}</DpTableCell>
+                                </DpTableRow>
+                                ))}
+                            </TableBody>
+                        </Table>
+                    </TableContainer>
+                </div>
+                <div className='echartBox'>
+                    <div className='echart1'>
+                        <ReactEcharts
+                            option={option}
+                            style={{ height: '100%' }}
+                        />
+                    </div>
+                </div>
+            </div>
+            <div className='foot'>
+                <Grid container size="small">
+                    <DescriptionItem label="最大值(m)" myWidth={'20%'}>-8.29</DescriptionItem>
+                    <DescriptionItem label="日期" myWidth={'20%'}>2025-04-28</DescriptionItem>
+                    <DescriptionItem label="最小值" myWidth={'20%'}>-12.16</DescriptionItem>
+                    <DescriptionItem label="日期" myWidth={'20%'}>2025-05-16</DescriptionItem>
+                    <DescriptionItem label="变幅(mm)" myWidth={'20%'}>3.97</DescriptionItem>
+                </Grid>
+            </div>
+        </div>
+    )
+}
+
+export default DrpStAround
diff --git a/src/views/Home/InfoDlg/LayersDlg/index.js b/src/views/Home/InfoDlg/LayersDlg/index.js
index 2406128..31292ef 100644
--- a/src/views/Home/InfoDlg/LayersDlg/index.js
+++ b/src/views/Home/InfoDlg/LayersDlg/index.js
@@ -29,7 +29,8 @@ import SbLayer from '../../MapCtrl/mapstyle/sblayer';
 import QdLayer from '../../MapCtrl/mapstyle/qdlayer';
 import ShuizhiLayer from '../../MapCtrl/mapstyle/shuizhilayer';
 import TrsqLayer from '../../MapCtrl/mapstyle/trsqlayer';
-import ScjcLayer from '../../MapCtrl/mapstyle/scjclayer'
+import ShuichangLayer from '../../MapCtrl/mapstyle/shuichangLayer'
+import ShuiyuandiLayer from '../../MapCtrl/mapstyle/shuiyuandiLayer'
 
 
 
@@ -143,7 +144,10 @@ function LayersDlg({ onClose }) {
             <RowItem icon="土壤墒情" label="土壤墒情" name={TrsqLayer.LayerName} checked={!!layerVisible[TrsqLayer.LayerName]} onChange={layerVisibleChanged} />
           </div>
           <div className={classes.catItem}>
-            <RowItem icon="水厂监测" label="水厂监测" name={ScjcLayer.LayerName} checked={!!layerVisible[ScjcLayer.LayerName]} onChange={layerVisibleChanged} />
+            <RowItem icon="水厂监测" label="水厂监测" name={ShuichangLayer.LayerName} checked={!!layerVisible[ShuichangLayer.LayerName]} onChange={layerVisibleChanged} />
+          </div>
+          <div className={classes.catItem}>
+            <RowItem icon="水源地" label="水源地" name={ShuiyuandiLayer.LayerName} checked={!!layerVisible[ShuiyuandiLayer.LayerName]} onChange={layerVisibleChanged} />
           </div>
         </div>
 
diff --git a/src/views/Home/InfoDlg/SljcDlg/drpOption.js b/src/views/Home/InfoDlg/SljcDlg/drpOption.js
new file mode 100644
index 0000000..67be3db
--- /dev/null
+++ b/src/views/Home/InfoDlg/SljcDlg/drpOption.js
@@ -0,0 +1,135 @@
+export default function drpOption(data) {
+  return {
+
+    tooltip: {
+      trigger: 'axis',
+    },
+    grid: [
+      {
+        top: "15%",
+        left: "10%",
+        right: "8%",
+        width: '80%',
+        height: '75%'
+      }
+    ],
+    legend: {
+      // 显示图例
+      show: true,
+      textStyle: {
+        color: '#fff', 
+      },
+      // 图例的位置
+      data: ['渗流量', '库水位'],
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.map(o => o.dt),//.reverse(),
+        splitLine: {
+          show: false
+        },
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+          show:false,
+        },
+        axisLine: {
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.5,
+          }
+        },
+        axisTick: {
+          show: false,
+        },
+      },
+    ],
+    yAxis: [
+      {
+        inverse: false,
+        type: 'value',
+        position: 'left',
+        name: "渗流量(L/s)",
+        nameTextStyle: {
+          color: '#fff' 
+        },
+        // nameLocation: "start",
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+        },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.25,
+            type: 'dotted'
+          }
+        },
+        axisLine: {
+          show: false
+        },
+        axisTick: {
+          show: false,
+        },
+        min: 0,
+        max:300
+      },
+      {
+        // gridIndex: 1,
+        type: 'value',
+        position: 'right',
+        name: "库水位(m)",
+        nameTextStyle: {
+          color: '#fff' 
+        },
+        splitLine: {
+          show: false,
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.25,
+            type: 'dotted'
+          }
+        },
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+        },
+        axisLine: {
+          show: false
+        },
+        axisTick: {
+          show: false,
+        },
+        min: 0,
+        max: 300
+      }
+    ],
+    series: [
+      {
+        yAxisIndex: 0,
+        name: '渗流量',
+        type: 'line',
+        symbol: 'none',
+        color: "#0AE0B5",
+        label: {
+          show: false,
+        },
+        data:data.map(o => o.low_z),
+      },
+      {
+        yAxisIndex: 1,
+        name: '库水位',
+        type: 'line',
+        color: "#007AFD",
+        symbol: 'none',
+        showSymbol: false,
+        label: {
+          show: false,
+        },
+        data:  data.map(o => o.rz),
+      }
+    ]
+  };
+}
diff --git a/src/views/Home/InfoDlg/SljcDlg/index.js b/src/views/Home/InfoDlg/SljcDlg/index.js
new file mode 100644
index 0000000..01095b0
--- /dev/null
+++ b/src/views/Home/InfoDlg/SljcDlg/index.js
@@ -0,0 +1,46 @@
+import React from 'react';
+
+import Dialog from '@material-ui/core/Dialog';
+import DialogContent from '@material-ui/core/DialogContent';
+import DpPaperComponent from '../../../../layouts/mui/DpPaperCompanent';
+import DpTabs from '../../../../layouts/mui/DpTabs';
+import DpTab from '../../../../layouts/mui/DpTab';
+import RzSearch from '../../components/RzSearch';
+import DpAppBar from '../../../../layouts/mui/DpAppBar';
+import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop';
+import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
+import DrpSearch from '../../components/DrpSearch';
+import DrpStAround from '../../components/DrpStAround';
+import GqJcsj from '../../components/Hdjcsj'
+import Table from './table'
+
+function HDStDlg({ record, onClose }) {
+  const [value, setValue] = React.useState(0);
+  return (
+    <Dialog
+      open={true}
+      onClose={onClose}
+      maxWidth="xl"
+      style={{ borderRadius: 0 }}
+      PaperComponent={DpPaperComponent}
+      BackdropComponent={DpBackgroundDrop}
+    >
+      <div className="boxhead"></div>
+      <DialogContent style={{ padding: 0, width: '80rem', overflowX: 'hidden' }}>
+        <DpAppBar position="sticky">
+          <DpTabs value={value} indicatorColor="primary" onChange={(_, v) => setValue(v)}>
+            <DpTab label={record.res_nm+'-'+record.cd_nm} />
+          </DpTabs>
+          <DpCloseButton onClick={onClose} />
+        </DpAppBar>
+        <div style={{ padding: '2rem', hminHeight: '50rem',maxHeight: '60rem' }}>
+          <Table/>
+        </div>
+
+      </DialogContent>
+      <div className="boxfoot"></div>
+    </Dialog>
+  )
+}
+
+export default React.memo(HDStDlg);
diff --git a/src/views/Home/InfoDlg/SljcDlg/index.less b/src/views/Home/InfoDlg/SljcDlg/index.less
new file mode 100644
index 0000000..5e5a3ee
--- /dev/null
+++ b/src/views/Home/InfoDlg/SljcDlg/index.less
@@ -0,0 +1,138 @@
+.infoDlg_jcsj{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    .toolbar{
+        display: flex;
+        .tm{
+            width: 40%;
+            display: flex;
+            justify-content: center;
+            font-size: 14px;
+            font-weight: 400;
+            border-radius: 2px;
+            color: #fff;
+            background: linear-gradient(270deg,rgba(65,76,217,.4),rgba(58,85,218,.2) 14%,rgba(54,90,218,0) 49%,rgba(51,94,218,.2) 86%,rgba(44,102,219,.4));
+            border: 1px solid #0e4e93;
+
+            .MuiInput-underline:before{
+                border: 0px;
+            }
+            .time-picker{
+                .ant-picker-input > input{
+                    color: #fff;
+                }
+                .ant-picker-separator{
+                    color: #fff;
+                }
+                
+            }
+        }
+        .time-type {
+            margin-left: 10rem;
+            display: flex;
+            cursor: pointer;
+            background-color: #393e45;
+            border-radius: 5%;
+            padding: 0.01% !important;
+            border: 1px solid #585e64;
+            div {
+              width: 80px;
+              border-radius: 5%;
+              text-align: center;
+              border: 1px solid #585e64;
+              padding: 4px 0;
+            }
+        
+            .active {
+              color: #5FB7FF;
+            //   background: #F0F7FF;
+              border: 1px solid #5FB7FF;
+            }
+          }
+        .search{
+            margin-left: 1.5rem;
+            border: 1px solid #0e4e93;
+   
+            background: url(../../../../assets/btn44.png) no-repeat 100% center;
+            color: #fff;
+            padding: 0 1rem;
+            border-radius: 2px;
+            cursor: pointer;
+        }
+    }
+    .content{
+        height: 40vh;
+        margin-top: 1vh;
+        display: flex;
+
+        .list{
+            width: 40%;
+        }
+        .echart{
+            flex: 1;
+        }
+    }
+    .echartBox{
+        width: 60%;
+        .echart1{
+            width: 100%;
+            height: 100%;
+        }
+    }
+    .foot{
+        flex: 1;
+        margin-top: 15px;
+        .split-line{
+            width: 100%;
+            border: 1px dashed rgba(16, 102, 141);
+            opacity: .36;
+            margin-bottom: 15px;
+        }
+        .MuiGrid-container{
+            background-color: #182d42 !important;
+        }
+    }
+    
+}
+.ant-picker-panel-container{
+    background-color: rgba(36, 46, 92,1) !important;
+   
+}
+.ant-picker-header,.ant-picker-body{
+    color: #fff !important;
+    border-color: #242e5c;
+}
+.ant-picker-content th{
+    color: #fff !important;
+}
+.ant-picker-cell,
+.ant-picker-header-super-prev-btn,
+.ant-picker-header-prev-btn,
+.ant-picker-header-next-btn,
+.ant-picker-header-super-next-btn
+{
+    color: #fff !important;
+}
+.ant-picker-cell:hover:not(.ant-picker-cell-selected):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end):not(.ant-picker-cell-range-hover-start):not(.ant-picker-cell-range-hover-end) .ant-picker-cell-inner{
+    // background: transparent !important;
+    color: #000;
+}
+.ant-picker-cell-in-view.ant-picker-cell-in-range::before,
+.ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single)::before,
+.ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single)::before
+{
+    background-color:transparent !important;
+}
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner{
+    background-color: #1890ff !important;
+}
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell .ant-picker-time-panel-cell-inner:hover{
+    // background-color:transparent !important;
+    color: #000 !important;
+}
+.ant-picker-header-super-next-btn,.ant-picker-time-panel-cell-inner
+{
+    color: #fff !important;
+}
\ No newline at end of file
diff --git a/src/views/Home/InfoDlg/SljcDlg/table.js b/src/views/Home/InfoDlg/SljcDlg/table.js
new file mode 100644
index 0000000..2ebca16
--- /dev/null
+++ b/src/views/Home/InfoDlg/SljcDlg/table.js
@@ -0,0 +1,311 @@
+import { TableCell, withStyles, Table, TableBody, TableContainer, TableHead, TableRow, TextField, Grid } from '@material-ui/core';
+import { DatePicker } from 'antd';
+import { makeStyles } from '@material-ui/core/styles';
+import moment from 'moment';
+import DpTableRow from '../../../../layouts/mui/DpTableRow';
+import DescriptionItem from '../../components/DescrptionItem2';
+import ReactEcharts from 'echarts-for-react';
+import drpOption from './drpOption';
+import { DateTimePicker } from '@material-ui/pickers';
+import React, { useEffect, useState,useMemo } from 'react';
+import './index.less'
+const { RangePicker } = DatePicker;
+const useStyles = makeStyles({
+    tableContainer: {
+      background: '#182d42', // 设置表格容器的背景颜色
+    },
+    item: {
+        '& .MuiGrid-item': {
+          '& [class*="makeStyles-title"]': {
+            color: '#fff',
+            backgroundColor: '#104175',
+          },
+        },
+      },
+  });
+const DpTableCell = withStyles({
+    head: {
+        backgroundColor: '#104175',
+        color: '#fff',
+        fontSize: '1rem',
+        padding: '0.5rem 0.3rem !important',
+      },
+    body: {
+        color: '#fff',
+        fontSize: '0.9rem',
+        padding: '0.7rem 0.3rem !important',
+        borderBottom: 'none',
+        position: "relative"
+    },
+  })(TableCell);
+
+
+
+const data = [
+    {
+        "res_cd": "42118140004",
+        "rz": 71.08,
+        "dt": "2025-04-28",
+        "low_z": 0.38
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.08,
+        "dt": "2025-04-29",
+        "low_z": 0.29
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.08,
+        "dt": "2025-04-30",
+        "low_z": 0.29
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.08,
+        "dt": "2025-05-01",
+        "low_z": 0.27
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.07,
+        "dt": "2025-05-02",
+        "low_z": 0.28
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.07,
+        "dt": "2025-05-03",
+        "low_z": 0.17
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.06,
+        "dt": "2025-05-04",
+        "low_z": 0
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.1,
+        "dt": "2025-05-05",
+        "low_z": 0.71
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.04,
+        "dt": "2025-05-06",
+        "low_z": 0.43
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 70.98,
+        "dt": "2025-05-07",
+        "low_z": 0.34
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 70.97,
+        "dt": "2025-05-08",
+        "low_z": 1.73
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.3,
+        "dt": "2025-05-09",
+        "low_z": 0.71
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.33,
+        "dt": "2025-05-10",
+        "low_z": 0.56
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.35,
+        "dt": "2025-05-11",
+        "low_z": 0.47
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.35,
+        "dt": "2025-05-12",
+        "low_z": 0.38
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.35,
+        "dt": "2025-05-13",
+        "low_z": 0.3
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.35,
+        "dt": "2025-05-14",
+        "low_z": 0.29
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.38,
+        "dt": "2025-05-15",
+        "low_z": 0.63
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.4,
+        "dt": "2025-05-16",
+        "low_z": 0.45
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.41,
+        "dt": "2025-05-17",
+        "low_z": 0.38
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.41,
+        "dt": "2025-05-18",
+        "low_z": 0.34
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.41,
+        "dt": "2025-05-19",
+        "low_z": 0.3
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.41,
+        "dt": "2025-05-20",
+        "low_z": 0.27
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.41,
+        "dt": "2025-05-21",
+        "low_z": 0.25
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 71.41,
+        "dt": "2025-05-22",
+        "low_z": 3.81
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 72.04,
+        "dt": "2025-05-23",
+        "low_z": 2.26
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 72.15,
+        "dt": "2025-05-24",
+        "low_z": 0.75
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 72.19,
+        "dt": "2025-05-25",
+        "low_z": 0.68
+
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 72.21,
+        "dt": "2025-05-26",
+        "low_z": 0.62
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 72.22,
+        "dt": "2025-05-27",
+        "low_z": 0.55
+    },
+    {
+        "res_cd": "42118140004",
+        "rz": 72.22,
+        "dt": "2025-05-28",
+        "low_z": 0.54
+    }
+]
+
+function DrpStAround({ record }) {
+    const classes = useStyles();
+
+    const option = useMemo(() => {
+      return drpOption(data);
+    }, [])
+    
+  
+    return (
+        <div className='infoDlg_jcsj'>
+            <div className='toolbar'>
+                <div className='tm' style={{position:"relative",zIndex:999999}}>
+                    <RangePicker
+                        width="100%"
+                        className='time-picker'
+                        style={{
+                            flex:1,
+                            background: "transparent",
+                            border: "none",
+                            color: "#fff",
+                        }}
+                        allowClear
+                        format="YYYY-MM-DD"
+                        showTime={{
+                          format: 'HH:mm',
+                        }}
+                        value={[moment('2025-04-28'),moment('2025-05-28')]}
+                    />
+                </div>
+                <button className='search'>查询</button>
+            </div>
+            <div className='content' style={{height:"49vh"}}>
+                <div className='list'>
+                    <TableContainer style={{ height: '100%' }} className={classes.tableContainer}>
+                        <Table size="small" stickyHeader>
+                            <TableHead>
+                                <TableRow>
+                                <DpTableCell align="center" style={{ width: '20%' }}>时间</DpTableCell>
+                                <DpTableCell align="center" style={{ width: '20%' }}>库水位(m)</DpTableCell>
+                                <DpTableCell align="center" style={{ width: '20%' }}>渗流量(L/s)</DpTableCell>
+                                </TableRow>
+                            </TableHead>
+                            <TableBody>
+                                {
+                                    data.map((row) => (
+                                <DpTableRow key={row.dt}>
+                                    <DpTableCell align="center"><div className="ellipsis">{row.dt}</div></DpTableCell>
+                                    <DpTableCell align="center">{row.rz?? "-"}</DpTableCell>
+                                    <DpTableCell align="center">{row.low_z?? "-"}</DpTableCell>
+                                </DpTableRow>
+                                ))}
+                            </TableBody>
+                        </Table>
+                    </TableContainer>
+                </div>
+                <div className='echartBox'>
+                    <div className='echart1'>
+                        <ReactEcharts
+                            option={option}
+                            style={{ height: '100%' }}
+                        />
+                    </div>
+                </div>
+            </div>
+            <div className='foot'>
+                <Grid container size="small">
+                    <DescriptionItem label="最大值(m)" myWidth={'20%'}>209.55</DescriptionItem>
+                    <DescriptionItem label="日期" myWidth={'20%'}>2025-04-28</DescriptionItem>
+                    <DescriptionItem label="最小值" myWidth={'20%'}>209.40</DescriptionItem>
+                    <DescriptionItem label="日期" myWidth={'20%'}>2025-05-20</DescriptionItem>
+                    <DescriptionItem label="变幅" myWidth={'20%'}>3.97</DescriptionItem>
+                </Grid>
+            </div>
+        </div>
+    )
+}
+
+export default DrpStAround
diff --git a/src/views/Home/InfoDlg/SyjcDlg/drpOption.js b/src/views/Home/InfoDlg/SyjcDlg/drpOption.js
new file mode 100644
index 0000000..bd8d6bc
--- /dev/null
+++ b/src/views/Home/InfoDlg/SyjcDlg/drpOption.js
@@ -0,0 +1,135 @@
+export default function drpOption(data) {
+  return {
+
+    tooltip: {
+      trigger: 'axis',
+    },
+    grid: [
+      {
+        top: "15%",
+        left: "10%",
+        right: "8%",
+        width: '80%',
+        height: '75%'
+      }
+    ],
+    legend: {
+      // 显示图例
+      show: true,
+      textStyle: {
+        color: '#fff', 
+      },
+      // 图例的位置
+      data: ['渗压水位', '库水位'],
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.map(o => o.dt),//.reverse(),
+        splitLine: {
+          show: false
+        },
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+          show:false,
+        },
+        axisLine: {
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.5,
+          }
+        },
+        axisTick: {
+          show: false,
+        },
+      },
+    ],
+    yAxis: [
+      {
+        inverse: false,
+        type: 'value',
+        position: 'left',
+        name: "渗压水位(m)",
+        nameTextStyle: {
+          color: '#fff' 
+        },
+        // nameLocation: "start",
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+        },
+        splitLine: {
+          show: true,
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.25,
+            type: 'dotted'
+          }
+        },
+        axisLine: {
+          show: false
+        },
+        axisTick: {
+          show: false,
+        },
+        min: 0,
+        max:300
+      },
+      {
+        // gridIndex: 1,
+        type: 'value',
+        position: 'right',
+        name: "库水位(m)",
+        nameTextStyle: {
+          color: '#fff' 
+        },
+        splitLine: {
+          show: false,
+          lineStyle: {
+            color: '#07a6ff',
+            width: 0.25,
+            type: 'dotted'
+          }
+        },
+        axisLabel: {
+          color: '#fff',
+          fontSize: 12,
+        },
+        axisLine: {
+          show: false
+        },
+        axisTick: {
+          show: false,
+        },
+        min: 0,
+        max: 300
+      }
+    ],
+    series: [
+      {
+        yAxisIndex: 0,
+        name: '渗压水位',
+        type: 'line',
+        symbol: 'none',
+        color: "#0AE0B5",
+        label: {
+          show: false,
+        },
+        data:data.map(o => o.du_value),
+      },
+      {
+        yAxisIndex: 1,
+        name: '库水位',
+        type: 'line',
+        color: "#007AFD",
+        symbol: 'none',
+        showSymbol: false,
+        label: {
+          show: false,
+        },
+        data:  data.map(o => o.rz),
+      }
+    ]
+  };
+}
diff --git a/src/views/Home/InfoDlg/SyjcDlg/index.js b/src/views/Home/InfoDlg/SyjcDlg/index.js
new file mode 100644
index 0000000..01095b0
--- /dev/null
+++ b/src/views/Home/InfoDlg/SyjcDlg/index.js
@@ -0,0 +1,46 @@
+import React from 'react';
+
+import Dialog from '@material-ui/core/Dialog';
+import DialogContent from '@material-ui/core/DialogContent';
+import DpPaperComponent from '../../../../layouts/mui/DpPaperCompanent';
+import DpTabs from '../../../../layouts/mui/DpTabs';
+import DpTab from '../../../../layouts/mui/DpTab';
+import RzSearch from '../../components/RzSearch';
+import DpAppBar from '../../../../layouts/mui/DpAppBar';
+import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop';
+import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
+import DrpSearch from '../../components/DrpSearch';
+import DrpStAround from '../../components/DrpStAround';
+import GqJcsj from '../../components/Hdjcsj'
+import Table from './table'
+
+function HDStDlg({ record, onClose }) {
+  const [value, setValue] = React.useState(0);
+  return (
+    <Dialog
+      open={true}
+      onClose={onClose}
+      maxWidth="xl"
+      style={{ borderRadius: 0 }}
+      PaperComponent={DpPaperComponent}
+      BackdropComponent={DpBackgroundDrop}
+    >
+      <div className="boxhead"></div>
+      <DialogContent style={{ padding: 0, width: '80rem', overflowX: 'hidden' }}>
+        <DpAppBar position="sticky">
+          <DpTabs value={value} indicatorColor="primary" onChange={(_, v) => setValue(v)}>
+            <DpTab label={record.res_nm+'-'+record.cd_nm} />
+          </DpTabs>
+          <DpCloseButton onClick={onClose} />
+        </DpAppBar>
+        <div style={{ padding: '2rem', hminHeight: '50rem',maxHeight: '60rem' }}>
+          <Table/>
+        </div>
+
+      </DialogContent>
+      <div className="boxfoot"></div>
+    </Dialog>
+  )
+}
+
+export default React.memo(HDStDlg);
diff --git a/src/views/Home/InfoDlg/SyjcDlg/index.less b/src/views/Home/InfoDlg/SyjcDlg/index.less
new file mode 100644
index 0000000..5e5a3ee
--- /dev/null
+++ b/src/views/Home/InfoDlg/SyjcDlg/index.less
@@ -0,0 +1,138 @@
+.infoDlg_jcsj{
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+
+    .toolbar{
+        display: flex;
+        .tm{
+            width: 40%;
+            display: flex;
+            justify-content: center;
+            font-size: 14px;
+            font-weight: 400;
+            border-radius: 2px;
+            color: #fff;
+            background: linear-gradient(270deg,rgba(65,76,217,.4),rgba(58,85,218,.2) 14%,rgba(54,90,218,0) 49%,rgba(51,94,218,.2) 86%,rgba(44,102,219,.4));
+            border: 1px solid #0e4e93;
+
+            .MuiInput-underline:before{
+                border: 0px;
+            }
+            .time-picker{
+                .ant-picker-input > input{
+                    color: #fff;
+                }
+                .ant-picker-separator{
+                    color: #fff;
+                }
+                
+            }
+        }
+        .time-type {
+            margin-left: 10rem;
+            display: flex;
+            cursor: pointer;
+            background-color: #393e45;
+            border-radius: 5%;
+            padding: 0.01% !important;
+            border: 1px solid #585e64;
+            div {
+              width: 80px;
+              border-radius: 5%;
+              text-align: center;
+              border: 1px solid #585e64;
+              padding: 4px 0;
+            }
+        
+            .active {
+              color: #5FB7FF;
+            //   background: #F0F7FF;
+              border: 1px solid #5FB7FF;
+            }
+          }
+        .search{
+            margin-left: 1.5rem;
+            border: 1px solid #0e4e93;
+   
+            background: url(../../../../assets/btn44.png) no-repeat 100% center;
+            color: #fff;
+            padding: 0 1rem;
+            border-radius: 2px;
+            cursor: pointer;
+        }
+    }
+    .content{
+        height: 40vh;
+        margin-top: 1vh;
+        display: flex;
+
+        .list{
+            width: 40%;
+        }
+        .echart{
+            flex: 1;
+        }
+    }
+    .echartBox{
+        width: 60%;
+        .echart1{
+            width: 100%;
+            height: 100%;
+        }
+    }
+    .foot{
+        flex: 1;
+        margin-top: 15px;
+        .split-line{
+            width: 100%;
+            border: 1px dashed rgba(16, 102, 141);
+            opacity: .36;
+            margin-bottom: 15px;
+        }
+        .MuiGrid-container{
+            background-color: #182d42 !important;
+        }
+    }
+    
+}
+.ant-picker-panel-container{
+    background-color: rgba(36, 46, 92,1) !important;
+   
+}
+.ant-picker-header,.ant-picker-body{
+    color: #fff !important;
+    border-color: #242e5c;
+}
+.ant-picker-content th{
+    color: #fff !important;
+}
+.ant-picker-cell,
+.ant-picker-header-super-prev-btn,
+.ant-picker-header-prev-btn,
+.ant-picker-header-next-btn,
+.ant-picker-header-super-next-btn
+{
+    color: #fff !important;
+}
+.ant-picker-cell:hover:not(.ant-picker-cell-selected):not(.ant-picker-cell-range-start):not(.ant-picker-cell-range-end):not(.ant-picker-cell-range-hover-start):not(.ant-picker-cell-range-hover-end) .ant-picker-cell-inner{
+    // background: transparent !important;
+    color: #000;
+}
+.ant-picker-cell-in-view.ant-picker-cell-in-range::before,
+.ant-picker-cell-in-view.ant-picker-cell-range-end:not(.ant-picker-cell-range-end-single)::before,
+.ant-picker-cell-in-view.ant-picker-cell-range-start:not(.ant-picker-cell-range-start-single)::before
+{
+    background-color:transparent !important;
+}
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell-selected .ant-picker-time-panel-cell-inner{
+    background-color: #1890ff !important;
+}
+.ant-picker-time-panel-column > li.ant-picker-time-panel-cell .ant-picker-time-panel-cell-inner:hover{
+    // background-color:transparent !important;
+    color: #000 !important;
+}
+.ant-picker-header-super-next-btn,.ant-picker-time-panel-cell-inner
+{
+    color: #fff !important;
+}
\ No newline at end of file
diff --git a/src/views/Home/InfoDlg/SyjcDlg/table.js b/src/views/Home/InfoDlg/SyjcDlg/table.js
new file mode 100644
index 0000000..9ecdfcc
--- /dev/null
+++ b/src/views/Home/InfoDlg/SyjcDlg/table.js
@@ -0,0 +1,304 @@
+import { TableCell, withStyles, Table, TableBody, TableContainer, TableHead, TableRow, TextField, Grid } from '@material-ui/core';
+import { DatePicker } from 'antd';
+import { makeStyles } from '@material-ui/core/styles';
+import moment from 'moment';
+import DpTableRow from '../../../../layouts/mui/DpTableRow';
+import DescriptionItem from '../../components/DescrptionItem2';
+import ReactEcharts from 'echarts-for-react';
+import drpOption from './drpOption';
+import { DateTimePicker } from '@material-ui/pickers';
+import React, { useEffect, useState,useMemo } from 'react';
+import './index.less'
+const { RangePicker } = DatePicker;
+const useStyles = makeStyles({
+    tableContainer: {
+      background: '#182d42', // 设置表格容器的背景颜色
+    },
+    item: {
+        '& .MuiGrid-item': {
+          '& [class*="makeStyles-title"]': {
+            color: '#fff',
+            backgroundColor: '#104175',
+          },
+        },
+      },
+  });
+const DpTableCell = withStyles({
+    head: {
+        backgroundColor: '#104175',
+        color: '#fff',
+        fontSize: '1rem',
+        padding: '0.5rem 0.3rem !important',
+      },
+    body: {
+        color: '#fff',
+        fontSize: '0.9rem',
+        padding: '0.7rem 0.3rem !important',
+        borderBottom: 'none',
+        position: "relative"
+    },
+  })(TableCell);
+
+
+
+const data = [
+    {
+        "res_cd": "42118140022",
+        "rz": 141.95,
+        "du_value":209.55,
+        "dt": "2025-04-28"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.52,
+        "rz": 141.95,
+        "dt": "2025-04-29"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.48,
+        "rz": 141.94,
+        "dt": "2025-04-30"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.51,
+        "rz": 141.95,
+        "dt": "2025-05-01"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.47,
+        "rz": 141.95,
+        "dt": "2025-05-02"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.5,
+        "rz": 141.94,
+        "dt": "2025-05-03"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.46,
+        "rz": 141.92,
+        "dt": "2025-05-04"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.46,
+        "rz": 142.03,
+        "dt": "2025-05-05"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.49,
+        "rz": 142.03,
+        "dt": "2025-05-06"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.47,
+        "rz": 142.03,
+        "dt": "2025-05-07"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.41,
+        "rz": 142.01,
+        "dt": "2025-05-08"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.47,
+        "rz": 142.22,
+        "dt": "2025-05-09"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.54,
+        "rz": 142.23,
+        "dt": "2025-05-10"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.5,
+        "rz": 142.27,
+        "dt": "2025-05-11"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.46,
+        "rz": 142.28,
+        "dt": "2025-05-12"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.45,
+        "rz": 142.28,
+        "dt": "2025-05-13"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.48,
+        "rz": 142.3,
+        "dt": "2025-05-14"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.5,
+        "rz": 142.28,
+        "dt": "2025-05-15"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.47,
+        "rz": 142.33,
+        "dt": "2025-05-16"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.47,
+        "rz": 142.33,
+        "dt": "2025-05-17"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.47,
+        "rz": 142.32,
+        "dt": "2025-05-18"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.43,
+        "rz": 142.36,
+        "dt": "2025-05-19"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.4,
+        "rz": 142.33,
+        "dt": "2025-05-20"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.42,
+        "rz": 142.33,
+        "dt": "2025-05-21"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.42,
+        "rz": 142.31,
+        "dt": "2025-05-22"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.48,
+        "rz": 142.41,
+        "dt": "2025-05-23"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.54,
+        "rz": 142.45,
+        "dt": "2025-05-24"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.54,
+        "rz": 142.45,
+        "dt": "2025-05-25"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.53,
+        "rz": 142.44,
+        "dt": "2025-05-26"
+    },
+    {
+        "res_cd": "42118140022",
+        "du_value":209.52,
+        "rz": 142.45,
+        "dt": "2025-05-27"
+    }
+]
+
+function DrpStAround({ record }) {
+    const classes = useStyles();
+
+    const option = useMemo(() => {
+      return drpOption(data);
+    }, [])
+    
+  
+    return (
+        <div className='infoDlg_jcsj'>
+            <div className='toolbar'>
+                <div className='tm' style={{position:"relative",zIndex:999999}}>
+                    <RangePicker
+                        width="100%"
+                        className='time-picker'
+                        style={{
+                            flex:1,
+                            background: "transparent",
+                            border: "none",
+                            color: "#fff",
+                        }}
+                        allowClear
+                        format="YYYY-MM-DD"
+                        showTime={{
+                          format: 'HH:mm',
+                        }}
+                        value={[moment('2025-04-28'),moment('2025-05-28')]}
+                    />
+                </div>
+                <button className='search'>查询</button>
+            </div>
+            <div className='content' style={{height:"49vh"}}>
+                <div className='list'>
+                    <TableContainer style={{ height: '100%' }} className={classes.tableContainer}>
+                        <Table size="small" stickyHeader>
+                            <TableHead>
+                                <TableRow>
+                                <DpTableCell align="center" style={{ width: '20%' }}>时间</DpTableCell>
+                                <DpTableCell align="center" style={{ width: '20%' }}>库水位(m)</DpTableCell>
+                                <DpTableCell align="center" style={{ width: '20%' }}>渗压水位(m)</DpTableCell>
+                                </TableRow>
+                            </TableHead>
+                            <TableBody>
+                                {
+                                    data.map((row) => (
+                                <DpTableRow key={row.dt}>
+                                    <DpTableCell align="center"><div className="ellipsis">{row.dt}</div></DpTableCell>
+                                    <DpTableCell align="center">{211.94?? "-"}</DpTableCell>
+                                    <DpTableCell align="center">{row.du_value?? "-"}</DpTableCell>
+                                </DpTableRow>
+                                ))}
+                            </TableBody>
+                        </Table>
+                    </TableContainer>
+                </div>
+                <div className='echartBox'>
+                    <div className='echart1'>
+                        <ReactEcharts
+                            option={option}
+                            style={{ height: '100%' }}
+                        />
+                    </div>
+                </div>
+            </div>
+            <div className='foot'>
+                <Grid container size="small">
+                    <DescriptionItem label="最大值(m)" myWidth={'20%'}>209.55</DescriptionItem>
+                    <DescriptionItem label="日期" myWidth={'20%'}>2025-04-28</DescriptionItem>
+                    <DescriptionItem label="最小值" myWidth={'20%'}>209.40</DescriptionItem>
+                    <DescriptionItem label="日期" myWidth={'20%'}>2025-05-20</DescriptionItem>
+                    <DescriptionItem label="变幅(m)" myWidth={'20%'}>3.97</DescriptionItem>
+                </Grid>
+            </div>
+        </div>
+    )
+}
+
+export default DrpStAround
diff --git a/src/views/Home/InfoDlg/index.js b/src/views/Home/InfoDlg/index.js
index e9a6d6d..72e544b 100644
--- a/src/views/Home/InfoDlg/index.js
+++ b/src/views/Home/InfoDlg/index.js
@@ -29,6 +29,9 @@ import LlsbDlg from './LlsbDlg';
 import BxjcDlg from './BxjcBlg'
 import ByjcDlg from './ByjcDlg'
 import PdfDlg from './PdfDlg'
+import SyjcDlg from './SyjcDlg'
+import SljcDlg from './SljcDlg'
+
 
 function InfoDlg() {
   const infoDlg = useSelector(getInfoDlg);
@@ -94,9 +97,9 @@ function InfoDlg() {
   }else if (layerId === 'BxjcLayer') {
     return <BxjcDlg record={properties} onClose={handleClose} />
   }else if (layerId === 'SyjcLayer') {
-    return <BxjcDlg record={properties} onClose={handleClose} />
+    return <SyjcDlg record={properties} onClose={handleClose} />
   }else if (layerId === 'SljcLayer') {
-    return <BxjcDlg record={properties} onClose={handleClose} />
+    return <SljcDlg record={properties} onClose={handleClose} />
   }else if (layerId === 'ByjcLayer') {
     return <ByjcDlg record={properties} onClose={handleClose} />
   }else if (layerId === 'PdfLayer') {
diff --git a/src/views/Home/InfoPops/_/layericons.js b/src/views/Home/InfoPops/_/layericons.js
index 3e03203..88e69d8 100644
--- a/src/views/Home/InfoPops/_/layericons.js
+++ b/src/views/Home/InfoPops/_/layericons.js
@@ -71,7 +71,7 @@ export const iconstyles = {
 
   病险水库: { backgroundPosition: '0 -800%' },
   
-  变形监测: { backgroundPosition: '0% -40%',backgroundSize: '1890% 1650%' },
+  变形监测: { backgroundPosition: '0% -40.5%',backgroundSize: '1890% 1650%' },
   渗压监测: { backgroundPosition: '5.5% -40%',backgroundSize: '1990% 1650%' },
   渗流监测: { backgroundPosition: '10.5% -40%',backgroundSize: '2394% 1650%' },
   白蚁监测: { backgroundPosition: '14.8% -40%',backgroundSize: '2394% 1650%' },
@@ -82,6 +82,7 @@ export const iconstyles = {
   水质: { backgroundPosition: '33.5% -40%',backgroundSize: '3295% 1650%' },
   土壤墒情: { backgroundPosition: '37.5% -40%',backgroundSize: '1895% 1650%' },
   水厂监测: { backgroundPosition: '0.5% -34%',backgroundSize: '1895% 1650%' },
+  水源地: { backgroundPosition: '53.3% -106.7%',backgroundSize: '1597% 1550%' },
 
 
 
diff --git a/src/views/Home/MapCtrl/mapstyle/bzlayer.js b/src/views/Home/MapCtrl/mapstyle/bzlayer.js
index deca106..c20e924 100644
--- a/src/views/Home/MapCtrl/mapstyle/bzlayer.js
+++ b/src/views/Home/MapCtrl/mapstyle/bzlayer.js
@@ -5613,11 +5613,11 @@ export default class BzLayer extends BaseLayer {
   }
 
   featureClicked(properties, dispatch) {
-    dispatch.runtime.setFeaturePop({
-      type: InfoPopNames.PicStPop,
-      properties,
-      coordinates: [properties.lgtd, properties.lttd],
-      offsetPop: true,
-    });
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
   }
 }
diff --git a/src/views/Home/MapCtrl/mapstyle/layermgr.js b/src/views/Home/MapCtrl/mapstyle/layermgr.js
index 7a1c210..dde8d4d 100644
--- a/src/views/Home/MapCtrl/mapstyle/layermgr.js
+++ b/src/views/Home/MapCtrl/mapstyle/layermgr.js
@@ -29,6 +29,8 @@ import SbLayer from "./sblayer"
 import QdLayer from "./qdlayer"
 import ShuizhiLayer from "./shuizhilayer"
 import TrsqLayer from "./trsqlayer"
+import ShuichangLayer from "./shuichangLayer"
+import ShuiyuandiLayer from "./shuiyuandiLayer"
 
 
 
@@ -56,6 +58,13 @@ class LayerMgr {
     this.layers.push(new QdLayer());
     this.layers.push(new ShuizhiLayer());
     this.layers.push(new TrsqLayer());
+    this.layers.push(new ShuichangLayer());
+    this.layers.push(new ShuiyuandiLayer());
+
+
+
+
+    
     this.layers.push(new RealDrpLayer());
     this.layers.push(new RealHDLayer());
     this.layers.push(new RealSkLayer());
@@ -183,6 +192,9 @@ class LayerMgr {
         this.layerMap.QdLayer.getStyle(),
         this.layerMap.ShuizhiLayer.getStyle(),
         this.layerMap.TrsqLayer.getStyle(),
+        this.layerMap.ShuichangLayer.getStyle(),
+        this.layerMap.ShuiyuandiLayer.getStyle(),
+
 
 
         this.layerMap.RivlLayer.getStyle('rivlLabel'),
diff --git a/src/views/Home/MapCtrl/mapstyle/qdlayer.js b/src/views/Home/MapCtrl/mapstyle/qdlayer.js
index b8c8c6f..00e617b 100644
--- a/src/views/Home/MapCtrl/mapstyle/qdlayer.js
+++ b/src/views/Home/MapCtrl/mapstyle/qdlayer.js
@@ -1341,15 +1341,15 @@ export default class QdLayer extends BaseLayer {
   }
 
   getFeatureTip(record) {
-    return record.stnm;
+    return '';
   }
 
   featureClicked(properties, dispatch) {
-    dispatch.runtime.setFeaturePop({
-      type: InfoPopNames.PicStPop,
-      properties,
-      coordinates: [properties.lgtd, properties.lttd],
-      offsetPop: true,
-    });
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
   }
 }
diff --git a/src/views/Home/MapCtrl/mapstyle/sblayer.js b/src/views/Home/MapCtrl/mapstyle/sblayer.js
index 6344a6a..8c47064 100644
--- a/src/views/Home/MapCtrl/mapstyle/sblayer.js
+++ b/src/views/Home/MapCtrl/mapstyle/sblayer.js
@@ -769,15 +769,15 @@ export default class SbLayer extends BaseLayer {
   }
 
   getFeatureTip(record) {
-    return record.stnm;
+    return '';
   }
 
   featureClicked(properties, dispatch) {
-    dispatch.runtime.setFeaturePop({
-      type: InfoPopNames.PicStPop,
-      properties,
-      coordinates: [properties.lgtd, properties.lttd],
-      offsetPop: true,
-    });
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
   }
 }
diff --git a/src/views/Home/MapCtrl/mapstyle/shuichangLayer.js b/src/views/Home/MapCtrl/mapstyle/shuichangLayer.js
new file mode 100644
index 0000000..36f2fdf
--- /dev/null
+++ b/src/views/Home/MapCtrl/mapstyle/shuichangLayer.js
@@ -0,0 +1,1162 @@
+import clone from "clone";
+import { PicStPromise, TestPicStPromise } from "../../../../models/_/real";
+import { parseGeoJSON } from "../../../../utils/tools";
+import { InfoPopNames } from "../../InfoPops";
+import BaseLayer from "./baselayer";
+
+const SourceName = '水厂';
+
+const ShapeStyle = {
+  id: SourceName,
+  type: 'symbol',
+  source: SourceName,
+  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],
+
+    'visibility': 'none',
+  },
+  paint: {
+    'text-color': '#fff'
+  }
+};
+
+const page1 = [
+  {
+      "stcd": "716164901",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "界岭水库",
+      "adcd": "421181107000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.450833,
+      "lttd": 31.302222,
+      "elev": 0,
+      "damel": 385.6,
+      "dsflz": 384.01,
+      "fsltdz": 382.84,
+      "ddz": 370.4,
+      "zcxsw": 382.84,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 378.57,
+      "w": 0.77,
+      "a_fsltdz": -4.269999999999982,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716164901",
+              "tm": "2023-03-12T07:03:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716164901/20230312150300.jpg"
+          },
+          {
+              "stcd": "716164901",
+              "tm": "2023-03-12T07:16:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716164902/20230312151600.jpg"
+          }
+      ],
+      "aRz": -4.27
+  },
+  {
+      "stcd": "716165051",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "蛤蟆石水库",
+      "adcd": "421181107000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.452778,
+      "lttd": 31.258056,
+      "elev": 0,
+      "damel": 189.9,
+      "dsflz": 187,
+      "fsltdz": 184.52,
+      "ddz": 174.9,
+      "zcxsw": 184.52,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 181.33,
+      "w": 0.657,
+      "a_fsltdz": -3.1899999999999977,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716165051",
+              "tm": "2023-03-12T07:21:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716165051/20230312152100.jpg"
+          },
+          {
+              "stcd": "716165051",
+              "tm": "2023-03-12T07:16:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716165052/20230312151600.jpg"
+          }
+      ],
+      "aRz": -3.19
+  },
+  {
+      "stcd": "716165101",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "游家冲水库",
+      "adcd": "421181107000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.295556,
+      "lttd": 31.202778,
+      "elev": 0,
+      "damel": 476.62,
+      "dsflz": 475.08,
+      "fsltdz": 473.2,
+      "ddz": 456.8,
+      "zcxsw": 473.2,
+      "drpTm": "2025-04-11T06:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 464.51,
+      "w": 0.668,
+      "a_fsltdz": -8.689999999999998,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716165101",
+              "tm": "2023-03-12T07:03:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716165101/20230312150300.jpg"
+          },
+          {
+              "stcd": "716165101",
+              "tm": "2023-03-12T07:20:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716165102/20230312152000.jpg"
+          }
+      ],
+      "aRz": -8.69
+  },
+  {
+      "stcd": "716167061",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "花桥水库",
+      "adcd": "421181107000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.444444,
+      "lttd": 31.274444,
+      "elev": 0,
+      "damel": 18,
+      "dsflz": 14.58,
+      "fsltdz": 269.4,
+      "ddz": 4.5,
+      "zcxsw": 269.4,
+      "drpTm": "2025-03-22T08:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 265.86,
+      "w": 0.31,
+      "a_fsltdz": -3.5399999999999636,
+      "rzTm": "2025-03-22T08:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716167061",
+              "tm": "2025-03-06T04:13:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2025/0306/716167061/20250306121300.jpg"
+          },
+          {
+              "stcd": "716167061",
+              "tm": "2025-03-06T04:14:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2025/0306/716167062/20250306121400.jpg"
+          }
+      ],
+      "aRz": -3.54
+  },
+  {
+      "stcd": "716130461",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "垅下水库",
+      "adcd": "421181107000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.364722,
+      "lttd": 31.218056,
+      "elev": 0,
+      "damel": 24.1,
+      "dsflz": 22.69,
+      "fsltdz": 303.2,
+      "ddz": 7.4,
+      "zcxsw": 303.2,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 302.02,
+      "w": 0.212,
+      "a_fsltdz": -1.1800000000000068,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716130461",
+              "tm": "2023-03-12T07:03:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716130461/20230312150300.jpg"
+          },
+          {
+              "stcd": "716130461",
+              "tm": "2023-03-12T07:11:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716130462/20230312151100.jpg"
+          }
+      ],
+      "aRz": -1.18
+  },
+  {
+      "stcd": "716124861",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "鲤鱼河水库",
+      "adcd": "421181003000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.968056,
+      "lttd": 31.204722,
+      "elev": 0,
+      "damel": 81.1,
+      "dsflz": 79.02,
+      "fsltdz": 78.4,
+      "ddz": 71.4,
+      "zcxsw": 78.4,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 75.79,
+      "w": 0.3,
+      "a_fsltdz": -2.6099999999999994,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716124861",
+              "tm": "2023-03-12T07:02:07.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716124861/20230312150207.jpg"
+          },
+          {
+              "stcd": "716124861",
+              "tm": "2023-03-12T07:03:44.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716124862/20230312150344.jpg"
+          }
+      ],
+      "aRz": -2.61
+  },
+  {
+      "stcd": "716112801",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "黑龙潭水库",
+      "adcd": "421181113000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.846944,
+      "lttd": 31.441944,
+      "elev": 0,
+      "damel": 135.91,
+      "dsflz": 134.31,
+      "fsltdz": 132.3,
+      "ddz": 119.6,
+      "zcxsw": 132.3,
+      "drpTm": "2025-04-11T06:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 125.17,
+      "w": 1.092,
+      "a_fsltdz": -7.13000000000001,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716112801",
+              "tm": "2023-11-03T05:05:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1103/716112801/20231103130500.jpg"
+          },
+          {
+              "stcd": "716112801",
+              "tm": "2023-11-03T05:12:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1103/716112802/20231103131200.jpg"
+          }
+      ],
+      "aRz": -7.13
+  },
+  {
+      "stcd": "716113001",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "朝阳水库",
+      "adcd": "421181113000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.805278,
+      "lttd": 31.206667,
+      "elev": 0,
+      "damel": 104.27,
+      "dsflz": 102.9,
+      "fsltdz": 102.36,
+      "ddz": 90.86,
+      "zcxsw": 102.36,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 8.19,
+      "w": 0,
+      "a_fsltdz": -94.17,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716113001",
+              "tm": "2023-03-12T07:01:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716113001/20230312150100.jpg"
+          },
+          {
+              "stcd": "716113001",
+              "tm": "2023-03-12T07:08:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716113002/20230312150800.jpg"
+          }
+      ],
+      "aRz": -94.17
+  },
+  
+  {
+      "stcd": "716121901",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "地畈水库",
+      "adcd": "421181113000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.883056,
+      "lttd": 31.417778,
+      "elev": 0,
+      "damel": 106.4,
+      "dsflz": 105.82,
+      "fsltdz": 105.09,
+      "ddz": 98.19,
+      "zcxsw": 105.09,
+      "drpTm": "2025-04-11T06:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 100.22,
+      "w": 0.036,
+      "a_fsltdz": -4.8700000000000045,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716121901",
+              "tm": "2023-11-13T05:01:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1113/716121901/20231113130100.jpg"
+          },
+          {
+              "stcd": "716121901",
+              "tm": "2023-11-13T05:04:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1113/716121902/20231113130400.jpg"
+          }
+      ],
+      "aRz": -4.87
+  },
+  {
+      "stcd": "716123561",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "大松树水库",
+      "adcd": "421181113000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.791389,
+      "lttd": 31.236944,
+      "elev": 0,
+      "damel": 10.54,
+      "dsflz": 9.12,
+      "fsltdz": 78.7,
+      "ddz": 6,
+      "zcxsw": 78.7,
+      "drpTm": "2025-04-11T06:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 76.51,
+      "w": 0.121,
+      "a_fsltdz": -2.1899999999999977,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716123561",
+              "tm": "2023-11-14T06:04:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1114/716123561/20231114140400.jpg"
+          },
+          {
+              "stcd": "716123561",
+              "tm": "2023-10-23T07:41:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1023/716123562/20231023154100.jpg"
+          }
+      ],
+      "aRz": -2.19
+  },
+  {
+      "stcd": "61612580",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "芭茅河水库",
+      "adcd": "421181110000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.101389,
+      "lttd": 31.307778,
+      "elev": 0,
+      "damel": 127.8,
+      "dsflz": 125.57,
+      "fsltdz": 122.44,
+      "ddz": 106.94,
+      "zcxsw": 122.44,
+      "drpTm": "2025-05-28T06:00:00.000Z",
+      "today": 8.5,
+      "h1": 8.5,
+      "h3": 8.5,
+      "h6": 8.5,
+      "h12": 8.5,
+      "h24": 8.5,
+      "h48": 8.5,
+      "drpState": 1,
+      "rz": 117.52,
+      "w": 6.011,
+      "a_fsltdz": -4.920000000000002,
+      "rzTm": "2025-05-28T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 1,
+      "aRz": -4.92
+  },
+  {
+      "stcd": "7CS000231",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "刘家冲水库",
+      "adcd": "421181100000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.048056,
+      "lttd": 31.335556,
+      "elev": 0,
+      "damel": 79.6,
+      "dsflz": 78.65,
+      "fsltdz": 72.05,
+      "ddz": 69.55,
+      "zcxsw": 72.05,
+      "drpTm": "2023-11-20T01:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 76.49,
+      "w": 0.049,
+      "a_fsltdz": 4.439999999999998,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 1,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "7CS000231",
+              "tm": "2023-11-20T01:04:18.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000231/20231120090418.jpg"
+          },
+          {
+              "stcd": "7CS000231",
+              "tm": "2023-11-20T01:07:54.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/1120/7CS000232/20231120090754.jpg"
+          }
+      ],
+      "aRz": 4.44
+  },
+  
+  {
+      "stcd": "716111301",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "蛤蟆岗水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.016667,
+      "lttd": 31.406111,
+      "elev": 0,
+      "damel": 173.1,
+      "dsflz": 171.11,
+      "fsltdz": 170,
+      "ddz": 154.5,
+      "zcxsw": 170,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 165.85,
+      "w": 0.938,
+      "a_fsltdz": -4.150000000000006,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716111301",
+              "tm": "2023-03-12T07:02:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716111301/20230312150200.jpg"
+          },
+          {
+              "stcd": "716111301",
+              "tm": "2023-03-12T07:16:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716111302/20230312151600.jpg"
+          }
+      ],
+      "aRz": -4.15
+  },
+  {
+      "stcd": "716112161",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "白石河水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.929444,
+      "lttd": 31.267222,
+      "elev": 0,
+      "damel": 121.3,
+      "dsflz": 117.78,
+      "fsltdz": 117,
+      "ddz": 107,
+      "zcxsw": 117,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 112.76,
+      "w": 2.638,
+      "a_fsltdz": -4.239999999999995,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716112161",
+              "tm": "2023-03-12T07:02:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716112161/20230312150200.jpg"
+          },
+          {
+              "stcd": "716112161",
+              "tm": "2023-03-12T07:07:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716112162/20230312150700.jpg"
+          }
+      ],
+      "aRz": -4.24
+  },
+  {
+      "stcd": "716119601",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "江蔡河水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.963333,
+      "lttd": 31.492778,
+      "elev": 0,
+      "damel": 286,
+      "dsflz": 284.36,
+      "fsltdz": 282.5,
+      "ddz": 275.4,
+      "zcxsw": 282.5,
+      "drpTm": "2025-03-12T03:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 276.13,
+      "w": 0.058,
+      "a_fsltdz": -6.3700000000000045,
+      "rzTm": "2025-03-12T03:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716119601",
+              "tm": "2025-03-12T03:03:37.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2025/0312/716119601/20250312110337.jpg"
+          },
+          {
+              "stcd": "716119601",
+              "tm": "2025-03-12T03:05:01.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2025/0312/716119602/20250312110501.jpg"
+          }
+      ],
+      "aRz": -6.37
+  },
+  {
+      "stcd": "716122051",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "杨树庵水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.429167,
+      "lttd": 31.406944,
+      "elev": 0,
+      "damel": 141.1,
+      "dsflz": 139.94,
+      "fsltdz": 138.8,
+      "ddz": 132.1,
+      "zcxsw": 138.8,
+      "drpTm": "2025-04-11T06:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 136.23,
+      "w": 0.057,
+      "a_fsltdz": -2.5700000000000216,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716122051",
+              "tm": "2023-03-12T07:04:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716122051/20230312150400.jpg"
+          },
+          {
+              "stcd": "716122051",
+              "tm": "2023-03-12T07:21:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716122052/20230312152100.jpg"
+          }
+      ],
+      "aRz": -2.57
+  },
+ 
+  {
+      "stcd": "716123001",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "正冲水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.9175,
+      "lttd": 31.325556,
+      "elev": 0,
+      "damel": 114.75,
+      "dsflz": 113.39,
+      "fsltdz": 112.3,
+      "ddz": 107.9,
+      "zcxsw": 112.3,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 107.53,
+      "w": 0,
+      "a_fsltdz": -4.769999999999996,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716123001",
+              "tm": "2023-03-12T07:02:15.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716123001/20230312150215.jpg"
+          },
+          {
+              "stcd": "716123001",
+              "tm": "2023-03-12T07:04:02.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716123002/20230312150402.jpg"
+          }
+      ],
+      "aRz": -4.77
+  },
+  {
+      "stcd": "716122901",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "李家冲水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.905833,
+      "lttd": 31.339444,
+      "elev": 0,
+      "damel": 90.5,
+      "dsflz": 89.28,
+      "fsltdz": 88.6,
+      "ddz": 14.44,
+      "zcxsw": 88.6,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 87.23,
+      "w": 0.092,
+      "a_fsltdz": -1.3699999999999903,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716122901",
+              "tm": "2023-03-12T07:03:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716122901/20230312150300.jpg"
+          },
+          {
+              "stcd": "716122901",
+              "tm": "2023-03-12T07:12:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716122902/20230312151200.jpg"
+          }
+      ],
+      "aRz": -1.37
+  },
+  {
+      "stcd": "716123901",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "宗家冲水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.903056,
+      "lttd": 31.285833,
+      "elev": 0,
+      "damel": 14.2,
+      "dsflz": 13.88,
+      "fsltdz": 93.3,
+      "ddz": 9.4,
+      "zcxsw": 93.3,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 110.13,
+      "w": 0,
+      "a_fsltdz": 16.83,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 1,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716123901",
+              "tm": "2023-03-12T08:01:08.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716123901/20230312160108.jpg"
+          },
+          {
+              "stcd": "716123901",
+              "tm": "2023-03-12T07:03:56.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716123902/20230312150356.jpg"
+          }
+      ],
+      "aRz": 16.83
+  },
+  {
+      "stcd": "716115801",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "张家凹水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.014444,
+      "lttd": 31.355833,
+      "elev": 0,
+      "damel": 134.7,
+      "dsflz": 133.45,
+      "fsltdz": 132.6,
+      "ddz": 124.5,
+      "zcxsw": 132.6,
+      "drpTm": "2025-04-11T06:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 128.72,
+      "w": 0.054,
+      "a_fsltdz": -3.8799999999999955,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716115801",
+              "tm": "2023-03-12T07:03:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115801/20230312150300.jpg"
+          },
+          {
+              "stcd": "716115801",
+              "tm": "2023-03-12T07:12:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716115802/20230312151200.jpg"
+          }
+      ],
+      "aRz": -3.88
+  },
+  {
+      "stcd": "716120401",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "江园水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.954167,
+      "lttd": 31.311944,
+      "elev": 0,
+      "damel": 100,
+      "dsflz": 98.46,
+      "fsltdz": 97.4,
+      "ddz": 93.2,
+      "zcxsw": 97.4,
+      "drpTm": "2024-09-03T02:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 96.71,
+      "w": 0,
+      "a_fsltdz": -0.6900000000000119,
+      "rzTm": "2024-09-03T02:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716120401",
+              "tm": "2023-03-12T08:01:20.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716120401/20230312160120.jpg"
+          },
+          {
+              "stcd": "716120401",
+              "tm": "2023-03-12T07:04:03.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716120402/20230312150403.jpg"
+          }
+      ],
+      "aRz": -0.69
+  },
+  {
+      "stcd": "716116201",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "戴家冲水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 115.024444,
+      "lttd": 31.232222,
+      "elev": 0,
+      "damel": 140,
+      "dsflz": 137.65,
+      "fsltdz": 136.2,
+      "ddz": 128,
+      "zcxsw": 136.2,
+      "drpTm": "2025-04-11T06:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 131.47,
+      "w": 0.091,
+      "a_fsltdz": -4.72999999999999,
+      "rzTm": "2025-04-11T06:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716116201",
+              "tm": "2023-03-12T07:03:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716116201/20230312150300.jpg"
+          },
+          {
+              "stcd": "716116201",
+              "tm": "2023-03-12T07:11:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716116202/20230312151100.jpg"
+          }
+      ],
+      "aRz": -4.73
+  },
+  {
+      "stcd": "716122701",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "石板冲水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.908889,
+      "lttd": 31.334167,
+      "elev": 0,
+      "damel": 114.6,
+      "dsflz": 112.89,
+      "fsltdz": 111.6,
+      "ddz": 101.8,
+      "zcxsw": 111.6,
+      "drpTm": "2025-04-11T05:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 103.84,
+      "w": 0.123,
+      "a_fsltdz": -7.759999999999991,
+      "rzTm": "2025-04-11T05:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716122701",
+              "tm": "2022-02-21T01:05:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2022/0221/716122701/20220221090500.jpg"
+          },
+          {
+              "stcd": "716122701",
+              "tm": "2022-02-21T01:30:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2022/0221/716122702/20220221093000.jpg"
+          }
+      ],
+      "aRz": -7.76
+  },
+  {
+      "stcd": "716122601",
+      "type": "sk",
+      "hasRz": true,
+      "stnm": "山圣庵水库",
+      "adcd": "421181112000",
+      "wscd": null,
+      "importancy": 0,
+      "lgtd": 114.891667,
+      "lttd": 31.346944,
+      "elev": 0,
+      "damel": 128,
+      "dsflz": 125.52,
+      "fsltdz": 124.4,
+      "ddz": 117.2,
+      "zcxsw": 124.4,
+      "drpTm": "2025-04-11T04:00:00.000Z",
+      "today": 0,
+      "h1": 0,
+      "h3": 0,
+      "h6": 0,
+      "h12": 0,
+      "h24": 0,
+      "h48": 0,
+      "drpState": 2,
+      "rz": 121.77,
+      "w": 0.057,
+      "a_fsltdz": -2.6300000000000097,
+      "rzTm": "2025-04-11T04:00:00.000Z",
+      "rzWarning": 0,
+      "rzState": 2,
+      "pic": [
+          {
+              "stcd": "716122601",
+              "tm": "2023-03-12T07:27:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716122601/20230312152700.jpg"
+          },
+          {
+              "stcd": "716122601",
+              "tm": "2023-03-12T07:39:00.000Z",
+              "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716122602/20230312153900.jpg"
+          }
+      ],
+      "aRz": -2.63
+  },
+]
+
+export default class ShuichangLayer extends BaseLayer {
+
+  static LayerName = 'ShuichangLayer';
+
+  static SourceName = SourceName;
+
+  getStyle() {
+
+    const ret = clone(ShapeStyle);
+    this._setStyleVisibility(ret);
+    return ret;
+
+  }
+
+  getName() {
+    return ShuichangLayer.LayerName;
+  }
+
+  getSubLayers() {
+    return [ShapeStyle.id];
+  }
+
+  async doRefreshLayer(mapCtrl) {
+    const ms = mapCtrl.getSource(SourceName);
+
+    let data = page1
+    ms.setData(parseGeoJSON(data));
+    return true;
+  }
+
+  getFeatureTip(record) {
+    return '';
+  }
+
+  featureClicked(properties, dispatch) {
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
+  }
+}
diff --git a/src/views/Home/MapCtrl/mapstyle/shuiyuandiLayer.js b/src/views/Home/MapCtrl/mapstyle/shuiyuandiLayer.js
new file mode 100644
index 0000000..259ea63
--- /dev/null
+++ b/src/views/Home/MapCtrl/mapstyle/shuiyuandiLayer.js
@@ -0,0 +1,252 @@
+import clone from "clone";
+import { PicStPromise, TestPicStPromise } from "../../../../models/_/real";
+import { parseGeoJSON } from "../../../../utils/tools";
+import { InfoPopNames } from "../../InfoPops";
+import BaseLayer from "./baselayer";
+
+const SourceName = '水源地';
+
+const ShapeStyle = {
+  id: SourceName,
+  type: 'symbol',
+  source: SourceName,
+  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],
+
+    'visibility': 'none',
+  },
+  paint: {
+    'text-color': '#fff'
+  }
+};
+
+const page1 = [
+  {
+      "addvcd": "420800000000000",
+      "moditime": "2022-05-01 21:00:00",
+      "comments": "漳河遥测",
+      "src": "zhzj",
+      "esstym": "",
+      "mvalue": {
+          "slmmmt": null,
+          "slm60": 0,
+          "exkey": "@",
+          "slm80": 0,
+          "hitrsn": null,
+          "crpty": null,
+          "crpgrwprd": null,
+          "srlslm": null,
+          "stcd": "ZH201417",
+          "slm10": 24,
+          "slm20": 5.3,
+          "slm30": 44.3,
+          "slm40": 44.3,
+          "tm": "2024-08-03 05:00",
+          "slm100": 0,
+          "vtavslm": null,
+          "slmAvg": 24.5
+      },
+      "lttd": 30.8456,
+      "sttp": "SS",
+      "irrCode": "D00000010",
+      "sort": 9999,
+      "hasImg": false,
+      "stlc": "荆门市",
+      "dtmel": 0,
+      "stcd": "ZH201417",
+      "stnm": "马山二组（墒情）",
+      "addvcd_dictText": "荆门市",
+      "lgtd": 112.2321,
+      "irrCode_dictText": "漳河实验站",
+      "bsnm": "漳河流域"
+  },
+  {
+      "addvcd": "420800000000000",
+      "moditime": "2022-05-01 21:00:00",
+      "comments": "漳河遥测",
+      "src": "zhzj",
+      "esstym": "",
+      "mvalue": {
+          "slmmmt": null,
+          "slm60": 0,
+          "exkey": "@",
+          "slm80": 0,
+          "hitrsn": null,
+          "crpty": null,
+          "crpgrwprd": null,
+          "srlslm": null,
+          "stcd": "ZH201421",
+          "slm10": 12.1,
+          "slm20": 16.2,
+          "slm30": 12.8,
+          "slm40": 12.8,
+          "tm": "2024-08-15 08:00",
+          "slm100": 0,
+          "vtavslm": null,
+          "slmAvg": 13.7
+      },
+      "lttd": 30.8446,
+      "sttp": "SS",
+      "irrCode": "D00000010",
+      "sort": 9999,
+      "hasImg": false,
+      "stlc": "荆门市",
+      "dtmel": 0,
+      "stcd": "ZH201421",
+      "stnm": "槐桥四组（墒情）",
+      "addvcd_dictText": "荆门市",
+      "lgtd": 112.203,
+      "irrCode_dictText": "漳河实验站",
+      "bsnm": "漳河流域"
+  },
+  {
+      "addvcd": "420800000000000",
+      "moditime": "2022-05-01 21:00:00",
+      "src": "zhzj",
+      "esstym": "",
+      "mvalue": {
+          "slmmmt": null,
+          "slm60": 0,
+          "exkey": "@",
+          "slm80": 0,
+          "hitrsn": null,
+          "crpty": null,
+          "crpgrwprd": null,
+          "srlslm": null,
+          "stcd": "ZH201418",
+          "slm10": 16.5,
+          "slm20": 12.5,
+          "slm30": 0,
+          "slm40": 0,
+          "tm": "2024-09-19 11:00",
+          "slm100": 0,
+          "vtavslm": null,
+          "slmAvg": 14.5
+      },
+      "lttd": 30.8866,
+      "sttp": "SS",
+      "irrCode": "D00000010",
+      "sort": 9999,
+      "hasImg": false,
+      "stlc": "荆门市",
+      "dtmel": 0,
+      "stcd": "ZH201418",
+      "stnm": "双碑一组（墒情）",
+      "addvcd_dictText": "荆门市",
+      "lgtd": 112.2006,
+      "irrCode_dictText": "漳河实验站",
+      "bsnm": "漳河流域"
+  },
+  {
+      "addvcd": "420800000000000",
+      "moditime": "2022-05-01 21:00:00",
+      "comments": "水资源多孔闸门控制系统",
+      "src": "zhzj",
+      "esstym": "",
+      "mvalue": {
+          "slmmmt": null,
+          "slm60": null,
+          "exkey": "@",
+          "slm80": null,
+          "hitrsn": null,
+          "crpty": null,
+          "crpgrwprd": null,
+          "srlslm": null,
+          "stcd": "4211221031",
+          "slm10": 31,
+          "slm20": 42.6,
+          "slm30": null,
+          "slm40": 26.6,
+          "tm": "2025-05-26 09:00",
+          "slm100": null,
+          "vtavslm": null,
+          "slmAvg": 33.4
+      },
+      "lttd": 30.904191,
+      "sttp": "SS",
+      "irrCode": "D00000010",
+      "sort": 9999,
+      "hasImg": false,
+      "stlc": "荆门市",
+      "stcd": "4211221031",
+      "stnm": "试验站墒情",
+      "addvcd_dictText": "荆门市",
+      "lgtd": 112.087806,
+      "irrCode_dictText": "漳河实验站",
+      "bsnm": "漳河流域"
+  }
+]
+
+export default class ShuiyuandiLayer extends BaseLayer {
+
+  static LayerName = 'ShuiyuandiLayer';
+
+  static SourceName = SourceName;
+
+  getStyle() {
+
+    const ret = clone(ShapeStyle);
+    this._setStyleVisibility(ret);
+    return ret;
+
+  }
+
+  getName() {
+    return ShuiyuandiLayer.LayerName;
+  }
+
+  getSubLayers() {
+    return [ShapeStyle.id];
+  }
+
+  async doRefreshLayer(mapCtrl) {
+    const ms = mapCtrl.getSource(SourceName);
+
+    let data = 
+    // await PicStPromise.get();
+    [...page1].map((item)=>{
+      const obj = {...item}
+      obj.lgtd = item.lgtd + 2.9619
+      obj.lttd = item.lttd + 0.2002
+      return obj
+    })
+    ms.setData(parseGeoJSON(data));
+    return true;
+  }
+
+  getFeatureTip(record) {
+    return '';
+  }
+
+  featureClicked(properties, dispatch) {
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
+  }
+}
diff --git a/src/views/Home/MapCtrl/mapstyle/shuizhalayer.js b/src/views/Home/MapCtrl/mapstyle/shuizhalayer.js
index 1399d33..038d708 100644
--- a/src/views/Home/MapCtrl/mapstyle/shuizhalayer.js
+++ b/src/views/Home/MapCtrl/mapstyle/shuizhalayer.js
@@ -4919,11 +4919,11 @@ export default class ShuiZhaLayer extends BaseLayer {
   }
 
   featureClicked(properties, dispatch) {
-    dispatch.runtime.setFeaturePop({
-      type: InfoPopNames.PicStPop,
-      properties,
-      coordinates: [properties.lgtd, properties.lttd],
-      offsetPop: true,
-    });
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
   }
 }
diff --git a/src/views/Home/MapCtrl/mapstyle/shuizhilayer.js b/src/views/Home/MapCtrl/mapstyle/shuizhilayer.js
index 9733490..b4d1703 100644
--- a/src/views/Home/MapCtrl/mapstyle/shuizhilayer.js
+++ b/src/views/Home/MapCtrl/mapstyle/shuizhilayer.js
@@ -539,15 +539,15 @@ export default class ShuizhiLayer extends BaseLayer {
   }
 
   getFeatureTip(record) {
-    return record.stnm;
+    return '';
   }
 
   featureClicked(properties, dispatch) {
-    dispatch.runtime.setFeaturePop({
-      type: InfoPopNames.PicStPop,
-      properties,
-      coordinates: [properties.lgtd, properties.lttd],
-      offsetPop: true,
-    });
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
   }
 }
diff --git a/src/views/Home/MapCtrl/mapstyle/sources.js b/src/views/Home/MapCtrl/mapstyle/sources.js
index 7650557..0c9304e 100644
--- a/src/views/Home/MapCtrl/mapstyle/sources.js
+++ b/src/views/Home/MapCtrl/mapstyle/sources.js
@@ -20,6 +20,8 @@ import SbLayer from "./sblayer";
 import QdLayer from "./qdlayer";
 import ShuizhiLayer from "./shuizhilayer";
 import TrsqLayer from "./trsqlayer";
+import ShuichangLayer from "./shuichangLayer";
+import ShuiyuandiLayer from "./shuiyuandiLayer";
 
 
 const hash = window.location.origin;
@@ -170,6 +172,17 @@ const sources = {
     type: 'geojson',
     data: { type: 'FeatureCollection', features: [] },
   },
+  [ShuichangLayer.SourceName]: {
+    type: 'geojson',
+    data: { type: 'FeatureCollection', features: [] },
+  },
+  [ShuiyuandiLayer.SourceName]: {
+    type: 'geojson',
+    data: { type: 'FeatureCollection', features: [] },
+  },
+
+
+
   [RealDrpLayer.SourceName]: {
     type: 'geojson',
     data: { type: 'FeatureCollection', features: [] },
diff --git a/src/views/Home/MapCtrl/mapstyle/trsqlayer.js b/src/views/Home/MapCtrl/mapstyle/trsqlayer.js
index 844a724..9045402 100644
--- a/src/views/Home/MapCtrl/mapstyle/trsqlayer.js
+++ b/src/views/Home/MapCtrl/mapstyle/trsqlayer.js
@@ -238,15 +238,15 @@ export default class TrsqLayer extends BaseLayer {
   }
 
   getFeatureTip(record) {
-    return record.stnm;
+    return '';
   }
 
   featureClicked(properties, dispatch) {
-    dispatch.runtime.setFeaturePop({
-      type: InfoPopNames.PicStPop,
-      properties,
-      coordinates: [properties.lgtd, properties.lttd],
-      offsetPop: true,
-    });
+    // dispatch.runtime.setFeaturePop({
+    //   type: InfoPopNames.PicStPop,
+    //   properties,
+    //   coordinates: [properties.lgtd, properties.lttd],
+    //   offsetPop: true,
+    // });
   }
 }
diff --git a/src/views/Home/panels/Bjtj/chart.js b/src/views/Home/panels/Bjtj/chart.js
index 5dda17f..ba49b35 100644
--- a/src/views/Home/panels/Bjtj/chart.js
+++ b/src/views/Home/panels/Bjtj/chart.js
@@ -88,7 +88,7 @@ const AreaDrpChart = () => {
       {
         type: 'value',
         position: 'left',
-        name: '产水量m³',
+        name: '个',
         nameTextStyle: {
           color: '#B9BFC9',
           fontSize: 10,//10,
diff --git a/src/views/Home/panels/SkReal/index.js b/src/views/Home/panels/SkReal/index.js
index bef724f..621a0dc 100644
--- a/src/views/Home/panels/SkReal/index.js
+++ b/src/views/Home/panels/SkReal/index.js
@@ -112,7 +112,7 @@ function SkReal({ style }) {
                   <div className="table-ellipsis cursor-pointer" onClick={() => flyTo(row)}>{row.stnm}</div>
                 </DpTableCell>
                 <DpTableCell align="right">{renderDrp(row, tableSkDrpField)}</DpTableCell>
-                <DpTableCell align="right">{renderSkRz(row)}</DpTableCell>
+                <DpTableCell align="right">{row?.rz}</DpTableCell>
                 <DpTableCell align="right">{renderSkArz(row)}</DpTableCell>
               </DpTableRow>
             ))}
diff --git a/src/views/Home/panels/Warn/Cxxsk.js b/src/views/Home/panels/Warn/Cxxsk.js
new file mode 100644
index 0000000..f11fc4a
--- /dev/null
+++ b/src/views/Home/panels/Warn/Cxxsk.js
@@ -0,0 +1,47 @@
+import React, { useMemo, useState } from 'react';
+import useRequest from '../../../../utils/useRequest';
+import PanelBox from '../../components/PanelBox';
+
+import Table from '@material-ui/core/Table';
+import TableContainer from '@material-ui/core/TableContainer';
+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 DpTableRow from '../../../../layouts/mui/DpTableRow';
+import clsx from 'clsx';
+import { renderDrp } from '../../../../utils/renutils';
+
+
+
+function DrpReal({ style }) {
+
+  return (
+      <TableContainer style={{ height: '100%' }}>
+        <Table size="small" stickyHeader>
+            <TableHead>
+              <TableRow>
+                <DpTableCell style={{ minWidth: '5rem' }} align="center">水库名称</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">超汛限</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">方案</DpTableCell>
+              </TableRow>
+            </TableHead>
+            <TableBody>
+              {/* {data1.map((row,index) => (
+                <DpTableRow key={row.stcd}>
+                  <DpTableCell align="center">{index+1}</DpTableCell>
+                  <DpTableCell align="center">{row.res_nm}</DpTableCell>
+                </DpTableRow>
+              ))} */}
+              <DpTableRow>
+                <DpTableCell align="center">夏家山水库</DpTableCell>
+                <DpTableCell align="center">12.1</DpTableCell>
+                <DpTableCell align="center">夏家山水库超汛限预案</DpTableCell>
+              </DpTableRow>
+            </TableBody>
+          </Table>
+      </TableContainer>
+  )
+}
+
+export default DrpReal;
diff --git a/src/views/Home/panels/Warn/index.js b/src/views/Home/panels/Warn/index.js
index 14a939b..5b9ea28 100644
--- a/src/views/Home/panels/Warn/index.js
+++ b/src/views/Home/panels/Warn/index.js
@@ -13,6 +13,7 @@ import ARzSk from './ARzSk';
 import Hdyj from './Hdyj';
 import Shqx from './Shqx';
 import ShYj from './ShYj';
+import Cxxsk from './Cxxsk'
 
 export default function Warn({ style }) {
   const t = useRefresh(60 * 1000);
@@ -55,7 +56,8 @@ export default function Warn({ style }) {
       }
     >
       {warnType === 'sh' ? <ShYj data={shyjData} /> : null}
-      {warnType === 'sk' ? <ARzSk data={bxData?.aRzSk} /> : null}
+      {/* {warnType === 'sk' ? <ARzSk data={bxData?.aRzSk} /> : null} */}
+      {warnType === 'sk' ? <Cxxsk/> : null}
       {warnType === 'hd' ? <Hdyj data={hdyj} /> : null}
       {warnType === 'qx' ? <Shqx data={shqx} /> : null}
     </PanelBox>