diff --git a/public/assets/icon/典型灾害事件.png b/public/assets/icon/典型灾害事件.png
new file mode 100644
index 0000000..1fda8bb
Binary files /dev/null and b/public/assets/icon/典型灾害事件.png differ
diff --git a/public/assets/icon/地质灾害点.png b/public/assets/icon/地质灾害点.png
new file mode 100644
index 0000000..afd5001
Binary files /dev/null and b/public/assets/icon/地质灾害点.png differ
diff --git a/public/assets/icon/易涝点.png b/public/assets/icon/易涝点.png
new file mode 100644
index 0000000..154a7d6
Binary files /dev/null and b/public/assets/icon/易涝点.png differ
diff --git a/public/assets/icon/水库.png b/public/assets/icon/水库.png
new file mode 100644
index 0000000..a060456
Binary files /dev/null and b/public/assets/icon/水库.png differ
diff --git a/src/models/map/index.js b/src/models/map/index.js
index 9fd9833..8659aa5 100644
--- a/src/models/map/index.js
+++ b/src/models/map/index.js
@@ -163,16 +163,16 @@ const map = {
         });
       } else if (id === 0) {
         layerVisible = {
-          RealDrpLayer: true,
-          RealHDLayer: true,
+          RealDrpLayer: false,
+          RealHDLayer: false,
           RealSkLayer: false,
           PicStLayer: false,
           RivlLayer: true,
           YuwaiLayer: false,
           AdcdLayer: true,
           WataLayer: false,
-          RealSkLayerQ2: true,
-          RealHDLayerQ2: true,
+          RealSkLayerQ2: false,
+          RealHDLayerQ2: false,
         }
         Object.keys(DCPJ_TYPES).forEach(key => {
           layerVisible['Dcpj_' + key + 'Layer'] = false;
@@ -583,189 +583,6 @@ const map = {
         dispatch.map.setLayerSetting({ dom: false });
         // map.setLayoutProperty('卫星图', 'visibility', 'none');
       }
-      // if (id == 203) {
-      //   const skdata = [
-      //     {
-      //       "stcd": "61614200",
-      //       "type": "sk",
-      //       "hasRz": true,
-      //       "stnm": "浮桥河水库",
-      //       "adcd": "421181100000",
-      //       "wscd": null,
-      //       "importancy": 0,
-      //       "lgtd": 114.875,
-      //       "lttd": 31.166667,
-      //       "elev": 0,
-      //       "damel": 71.33,
-      //       "dsflz": 68.04,
-      //       "fsltdz": 64.89,
-      //       "ddz": 51.78,
-      //       "zcxsw": 64.89,
-      //       "drpTm": "2025-06-03T02:00:00.000Z",
-      //       "today": 0,
-      //       "h1": 5,
-      //       "h3": 6,
-      //       "h6": 7.5,
-      //       "h12": 8,
-      //       "h24": 9,
-      //       "h48": 26,
-      //       "drpState": 1,
-      //       "rz": 60.71,
-      //       "w": 162.8,
-      //       "a_fsltdz": -4.18,
-      //       "rzTm": "2025-06-03T02:00:00.000Z",
-      //       "rzWarning": 0,
-      //       "rzState": 1,
-      //       "aRz": -4.18
-      //     },
-      //     {
-      //       "stcd": "61613010",
-      //       "type": "sk",
-      //       "hasRz": true,
-      //       "stnm": "明山水库",
-      //       "adcd": "421181103000",
-      //       "wscd": null,
-      //       "importancy": 0,
-      //       "lgtd": 115.066667,
-      //       "lttd": 31.016667,
-      //       "elev": 0,
-      //       "damel": 98.7,
-      //       "dsflz": 96.07,
-      //       "fsltdz": 93,
-      //       "ddz": 78.02,
-      //       "zcxsw": 93,
-      //       "drpTm": "2025-06-03T02:00:00.000Z",
-      //       "today": 0,
-      //       "h1": 7,
-      //       "h3": 8.4,
-      //       "h6": 10.5,
-      //       "h12": 11.200000000000001,
-      //       "h24": 12.6,
-      //       "h48": 25.799999999999997,
-      //       "drpState": 1,
-      //       "rz": 84.43,
-      //       "w": 49.5,
-      //       "a_fsltdz": -8.569999999999993,
-      //       "rzTm": "2025-06-03T02:00:00.000Z",
-      //       "rzWarning": 0,
-      //       "rzState": 1,
-      //       "aRz": -8.57
-      //     },
-      //     {
-      //       "stcd": "61612610",
-      //       "type": "sk",
-      //       "hasRz": true,
-      //       "stnm": "三河口水库",
-      //       "adcd": "421181109000",
-      //       "wscd": null,
-      //       "importancy": 0,
-      //       "lgtd": 115.166667,
-      //       "lttd": 31.333333,
-      //       "elev": 0,
-      //       "damel": 156.8,
-      //       "dsflz": 154.99,
-      //       "fsltdz": 149,
-      //       "ddz": 124,
-      //       "zcxsw": 149,
-      //       "drpTm": "2025-06-03T02:00:00.000Z",
-      //       "today": 0,
-      //       "h1": 7,
-      //       "h3": 8.4,
-      //       "h6": 10.5,
-      //       "h12": 11.200000000000001,
-      //       "h24": 12.6,
-      //       "h48": 25.799999999999997,
-      //       "drpState": 1,
-      //       "rz": 141.45,
-      //       "w": 77.8,
-      //       "a_fsltdz": -7.550000000000011,
-      //       "rzTm": "2025-06-03T01:00:00.000Z",
-      //       "rzWarning": 0,
-      //       "rzState": 1,
-      //       "aRz": -7.55
-      //     },
-      //     {
-      //       "stcd": "61612700",
-      //       "type": "sk",
-      //       "hasRz": true,
-      //       "stnm": "碧绿河水库",
-      //       "adcd": "421181109000",
-      //       "wscd": null,
-      //       "importancy": 0,
-      //       "lgtd": 115.214444,
-      //       "lttd": 31.299722,
-      //       "elev": 0,
-      //       "damel": 142.9,
-      //       "dsflz": 139.08,
-      //       "fsltdz": 137,
-      //       "ddz": 105,
-      //       "zcxsw": 137,
-      //       "drpTm": "2025-06-03T02:00:00.000Z",
-      //       "today": 0,
-      //       "h1": 4,
-      //       "h3": 4.8,
-      //       "h6": 6,
-      //       "h12": 6.4,
-      //       "h24": 7.2,
-      //       "h48": 22.6,
-      //       "drpState": 1,
-      //       "rz": 119.6,
-      //       "w": 13.15,
-      //       "a_fsltdz": -17.400000000000006,
-      //       "rzTm": "2025-06-03T00:00:00.000Z",
-      //       "rzWarning": 0,
-      //       "rzState": 2,
-      //       "aRz": -17.4
-      //     }
-      //   ]
-      //   const layer = map.getLayer('关联站点')
-      //   if (layer) {
-      //     map.removeLayer('关联站点');
-      //     map.removeSource('关联站点');
-      //   }
-      //   map.addLayer({
-      //     'id': '关联站点',//+new Date().getTime(),
-      //     'type': 'symbol',
-      //     'source': {
-      //       'type': 'geojson',
-      //       'data': {
-      //         'type': 'FeatureCollection',
-      //         'features': [],
-      //       },
-      //     },
-      //     'layout': {
-      //       'icon-allow-overlap': true,
-      //       'text-allow-overlap': true,
-      //       'icon-image': '水库-离线',
-      //       'icon-size': [
-      //         'interpolate', ['linear'], ['zoom'],
-      //         10, 0.4,
-      //         14, 0.8,
-      //       ],
-      //       'text-allow-overlap': true,
-      //       'text-size': [
-      //         'interpolate', ['linear'], ['zoom'],
-      //         10, 10,
-      //         14, 14,
-      //       ],
-      //       'text-font': ['Roboto Black'],
-      //       'text-field': [
-      //         'step',
-      //         ['zoom'],
-      //         '',
-      //         12, ['get', 'stnm']
-      //       ],
-      //       'text-anchor': 'top',
-      //       'text-offset': [0, 1],
-
-      //     },
-      //     'paint': {
-      //       'text-color': '#fff'
-      //     },
-      //     'visibility': 'visible',
-      //   });
-      //   map.getSource('关联站点').setData(parseGeoJSON(skdata))
-      // }
 
       if(id!==200&&id!==203&&id!==205&&id!==206){
         const layer = map.getLayer('临时水库tz')
diff --git a/src/models/map/layout.js b/src/models/map/layout.js
index 49c640b..046f21c 100644
--- a/src/models/map/layout.js
+++ b/src/models/map/layout.js
@@ -13,10 +13,9 @@ export default function calcLayout(view, rightStack, hidePanels) {
     if (view === 0) {
       left = [
         { key: '天气' },
-        { key: '综述' },
-        { key: '预警', style: { height: '40%', flexGrow: 1 } },
+        // { key: '综述' },
+        { key: '防汛基本情况左侧', style: { height: '30rem',flexGrow: 1 } },
       ];
-      leftFullHeight = true;
     } else if (view === 8) {
       left = [
         { key: '天气' },
@@ -30,7 +29,6 @@ export default function calcLayout(view, rightStack, hidePanels) {
         // { key: '综述' },
         { key: '防汛基本情况左侧', style: { height: '30rem',flexGrow: 1 } },
       ];
-      // leftFullHeight = true;
     } else if (view === 1) {
       left = [
         { key: '天气' },
@@ -233,12 +231,7 @@ export default function calcLayout(view, rightStack, hidePanels) {
       if (view === 0) {
         right = [
           { key: '警报' },
-          { key: '防洪形势天气预报', style: { height: '18.5rem'} },
-          { key: '防洪形势水情', style: { height: '18.5rem'} },
-          // { key: '河道水位', style: { height: '10rem', flexGrow: 1 } },
-          { key: '防洪形势雨情', style: { height: '16rem', flexGrow: 1 } },
-          // { key: '工情', style: { height: '10rem', flexGrow: 1 } },
-          // { key: '今日值班' },
+          { key: '防汛基本情况右侧', style: { height: '50rem',flexGrow: 1 } },
         ];
         rightFullHeight = true;
       }else if (view === 8) {
diff --git a/src/views/Home/components/ActionDock/index.js b/src/views/Home/components/ActionDock/index.js
index 5907dc1..53c34e0 100644
--- a/src/views/Home/components/ActionDock/index.js
+++ b/src/views/Home/components/ActionDock/index.js
@@ -9,8 +9,8 @@ const VIEWS = [
   {
     id: 100, title: '防汛', img: '/assets/menu/防洪形势.png', children: [
       // { id: 0, title: '防洪形势', img: '/assets/menu/防洪形势.png' },
-      // { id: 8, title: '防洪形势', img: '/assets/menu/防洪形势.png' },
-      { id: 9, title: '防洪形势', img: '/assets/menu/防洪形势.png' },
+      { id: 8, title: '防洪形势', img: '/assets/menu/防洪形势.png' },
+      // { id: 9, title: '防洪形势', img: '/assets/menu/防洪形势.png' },
       { id: 1, title: '实时数据', img: '/assets/menu/实时数据.png' },
       { id: 2, title: '水利设施', img: '/assets/menu/水利设施.png' },
       { id: 5, title: '预报', img: '/assets/menu/降雨中心.png' },
@@ -93,7 +93,7 @@ export default function ActionDock({ }) {
         viewKey ?
           <BootstrapTooltip key={999} title={<Typography variant="h6"><span style={{ color: '#fff' }}>返回</span></Typography>}>
             <div className="dock-item" onClick={() => {
-              // dispatch.map.setView(o.id)  这里不知道用哪个，等问好在弄
+              dispatch.map.setView(0)  //这里不知道用哪个，等问好在弄
               setViewKey(null)
               dispatch.runtime.setScya(false)
               dispatch.runtime.setGwtc(false)
diff --git a/src/views/Home/panels/JbqkLeft/index.js b/src/views/Home/panels/JbqkLeft/index.js
index 02b72d0..77234d7 100644
--- a/src/views/Home/panels/JbqkLeft/index.js
+++ b/src/views/Home/panels/JbqkLeft/index.js
@@ -154,9 +154,49 @@ function DrpReal({ style }) {
 
       <CollapsePage type={'5'} name={'水利工程'} skType={skType} setSkType={setSkType} icon={'水利工程.png'}/>
       <Collapse in={skType==='5'}  timeout="auto" unmountOnExit>
-        <div style={{color:jbqkKey==='5'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 3rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}} onClick={()=>dispatch.runtime.setJbqkKey('5')}>水库</div>
+        <div style={{display:'flex',justifyContent:'flex-start',alignItems:'center', color:jbqkKey==='5'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 2rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}} onClick={()=>dispatch.runtime.setJbqkKey('5')}>
+          <img src={`${process.env.PUBLIC_URL}/assets/icon/水库.png`} width={15} height={15} alt="" style={{marginRight:'0.5rem'}}/>
+          水库
+        </div>
+        <div style={{display:'flex',justifyContent:'flex-start',alignItems:'center', color:jbqkKey==='9'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 2rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}}>
+          <img src={`${process.env.PUBLIC_URL}/assets/icon/水库.png`} width={15} height={15} alt="" style={{marginRight:'0.5rem'}}/>
+          水电站
+        </div>
+        <div style={{display:'flex',justifyContent:'flex-start',alignItems:'center', color:jbqkKey==='9'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 2rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}}>
+          <img src={`${process.env.PUBLIC_URL}/assets/icon/水库.png`} width={15} height={15} alt="" style={{marginRight:'0.5rem'}}/>
+          引水工程
+        </div>
+        <div style={{display:'flex',justifyContent:'flex-start',alignItems:'center', color:jbqkKey==='9'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 2rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}}>
+          <img src={`${process.env.PUBLIC_URL}/assets/icon/水库.png`} width={15} height={15} alt="" style={{marginRight:'0.5rem'}}/>
+          塘(堰)坝
+        </div>
       </Collapse>
 
+      <CollapsePage type={'6'} name={'易发灾害点'} skType={skType} setSkType={setSkType}/>
+      <Collapse in={skType==='6'}  timeout="auto" unmountOnExit>
+        <div style={{display:'flex',justifyContent:'flex-start',alignItems:'center', color:jbqkKey==='9'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 2rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}} onClick={()=>{}}>
+          <img src={`${process.env.PUBLIC_URL}/assets/icon/易涝点.png`} width={15} height={15} alt="" style={{marginRight:'0.5rem'}}/>
+          易涝点
+        </div>
+      </Collapse>
+
+      <CollapsePage type={'7'} name={'地质灾害点'} skType={skType} setSkType={setSkType}/>
+      <Collapse in={skType==='7'}  timeout="auto" unmountOnExit>
+        <div style={{display:'flex',justifyContent:'flex-start',alignItems:'center', color:jbqkKey==='9'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 2rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}} onClick={()=>{}}>
+          <img src={`${process.env.PUBLIC_URL}/assets/icon/地质灾害点.png`} width={15} height={15} alt="" style={{marginRight:'0.5rem'}}/>
+          地质灾害点
+        </div>
+      </Collapse>
+
+      <CollapsePage type={'8'} name={'典型灾害事件'} skType={skType} setSkType={setSkType}/>
+      <Collapse in={skType==='8'}  timeout="auto" unmountOnExit>
+        <div style={{display:'flex',justifyContent:'flex-start',alignItems:'center', color:jbqkKey==='9'?'rgb(80, 177, 249)':'#ffffff',fontSize:'1rem',lineHeight:'1rem',padding:'0.8rem 2rem',background:'rgba(255, 255, 255, 0.08)',cursor:'pointer'}} onClick={()=>{}}>
+          <img src={`${process.env.PUBLIC_URL}/assets/icon/典型灾害事件.png`} width={15} height={15} alt="" style={{marginRight:'0.5rem'}}/>
+          典型灾害事件
+        </div>
+      </Collapse>
+
+
       {/* {
         skTypeObj.map((item)=>
           (<>