From 0089ee22fe3600f5ea5abc1d8092838b22e44a5e Mon Sep 17 00:00:00 2001
From: qzc <qzc@cloudowr.com>
Date: Thu, 12 Jun 2025 15:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/icon/典型灾害事件.png     | Bin 0 -> 1829 bytes
 public/assets/icon/地质灾害点.png        | Bin 0 -> 1530 bytes
 public/assets/icon/易涝点.png              | Bin 0 -> 1625 bytes
 public/assets/icon/水库.png                 | Bin 0 -> 1568 bytes
 src/models/map/index.js                       | 191 +-----------------
 src/models/map/layout.js                      |  13 +-
 src/views/Home/components/ActionDock/index.js |   6 +-
 src/views/Home/panels/JbqkLeft/index.js       |  42 +++-
 8 files changed, 51 insertions(+), 201 deletions(-)
 create mode 100644 public/assets/icon/典型灾害事件.png
 create mode 100644 public/assets/icon/地质灾害点.png
 create mode 100644 public/assets/icon/易涝点.png
 create mode 100644 public/assets/icon/水库.png

diff --git a/public/assets/icon/典型灾害事件.png b/public/assets/icon/典型灾害事件.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fda8bb08b3a9a7be4abfccb1319e86b96cf6893
GIT binary patch
literal 1829
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
T@Zry$00000NkvXXu0mjfNb!Xn

literal 0
HcmV?d00001

diff --git a/public/assets/icon/地质灾害点.png b/public/assets/icon/地质灾害点.png
new file mode 100644
index 0000000000000000000000000000000000000000..afd5001623921ebd32e83308d34be0984ae71b01
GIT binary patch
literal 1530
zcmV<W1qJ$vP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)v`IukRA@uhT3t+BMHD`>3oIgKLE2p^1zG88HJG+3vGpegB^ukt!1`i+5+5uv
z@vn)RCPq#CiN-cj-zqP~r`8wQYHUdpN@I$sp+eK9iVbX~;+BQNQfOJAd&hi}%+2Mp
zKlf)@w)1wEnK|b>=bQ7Lxfe#dQQ8qI&8K)XIh>mvoVIY{4f;9Rd}hQ>D~tw6iJzka
zXXp5C-&L)BrhTaB2sJ1UeuOwxWYb9#wxXOX`^Ezs+vOS+z`Eejen#vw6PvB#R2Gah
z`vP!401%O9yj$zhQ=U8MRAg=yolIkz@mC{FwTBouU*O<>>S=SPaRW7WkJ7xta}xxk
zm_uO?FmK1uTb!{k^<IuO`RM%%*QjmidTs&$eH`p_<_U%l6Y-Wr01*B9lUFD*AJ0t?
zjCC?kaJZj{wj=_8-;R#V(wqI`%K-E}T}4$zd30fVff`Sbt`@*303;+iC?p3Qgrjo6
zaR88`<@Yf<5x%)9APfP}M|p2;34L5wt~&hf<r#YS+(d2y0RKHMr=St&gt2pd5!Ja}
zs>5wV(=@%P<R$=AB19WN9`E|slA|sMTd{JSmO|cRA?j+Vq&jzjD5(HsW;9pcN#E3a
zC^&k9f}^t;KP!d+K$VX?QX!(a>*xQL9OzVFKs^YeJKv#BLnc4HIH}UnOfVA7H3R?)
z+aLA{?xVeUv3E&BnA8V=26+8QR+_DVF$}<8oKIa(RucHEJ<!RFVqQ<<2B8(&fh?k8
z$%0_TY3&-r0I&#$86_0s%FSDJaBwQ6BXAz)M^XscgY#IMsbLBL9640)QE4H2r9IWf
z<Z<QE(UF;DZO5Z)3&kPMB=0R}KrTG~#ND*5%te8oFrA&8r@m*ZgjQf6${(D+Mwez6
zGZo~N`<Tjr-0A$Y)xzQXj{ie1R2Qo{0p24^D4DH&k=z6T2mju6kDv-VRYV`Z;qHLn
zzJF{z`Pby9?P5_BGLa?I8GxYSV4`_Llu?<G4X88#fLfr~!NDjU_-iU*7GA1ZLtkuO
zD>C)T#YtO-+B5(}4&o#;06=gUfY6mn&DeIAOJqTRqeEpvc?I1t>}rB(05JOAgJtxF
zzf^54<TEmYs3Iev7M}HOwk!ZLHD-j-mJ(|hOOf&vIz?-7X=YJm0nhR*Kr@g9{9QY=
zT7utE$$puLSw8TVG5~9`KZ0>Mp`{Wc50J<L$}9v=dm)l%z)EwdM`{@WHu`$&I)aEv
z>PRY~R{}MpqnHaSX@MXBJrl8{Z8j=fEY8!m;kE$CEZ{~4rTqysayjYwp0FBmv>vbf
zOI4u*khbCJl(a#iIK16U*B2FP`E4xaO9fj1aF7vo+?n6Lzl_i}Xq}ho2Ax`K-SnE@
zt@cHr-hsiXWkB>TII7)4og+!lh%EqUv0Y9^e@xBOEBBTpbY5#2wAfqg7IS5T2O!Xb
zvs3e8D!`6BSF^-nT&j`{TL92foEn=G_k=`|Pi9mP1X>X|6IMY$XFwwiStK$JKnhYM
z78e4htujVyB7l5US1t+xUJC3+NuFJ#cQ%z#Bz8+2{B$qXEN1|BU9<ycBA*BtDAT^(
zE6OtN2`I^C?hBRyAWA2~H!MY74+J0}gwPUX5<xNgn#M8!q~E9!Bb35^Xc9q9@P1G4
z)wCLbeJukp;#9IZh;)hOO@*9SU6dziiHvBQ!&J7?0<hz#-L*zuS>`kV1R&MDA|-|F
zMlW0IlV%`W4%oE=0MO~B+HH5&Y^`S$!zZQ=BHo-Wn;Esk=vQ`oeIH&5pELFqEB`UH
z$*J&u;#8Q?=wx9t&Xk?v)xhnU1=b#E_PwnBtAXd(a4&J%k%hoz!o=kT&bCGazNiYI
zraM$PH$xwCh40UVg_YZbwJ&hm2j_*5=?!^*2<_kswGwfBJ6`tvc;y^Rx$^)K8{jPd
g-FVZ+PVLP90Rq2L$&Y#WS^xk507*qoM6N<$f|$m)C;$Ke

literal 0
HcmV?d00001

diff --git a/public/assets/icon/易涝点.png b/public/assets/icon/易涝点.png
new file mode 100644
index 0000000000000000000000000000000000000000..154a7d6da4032a18c3315fa446f3bbc231a46fb7
GIT binary patch
literal 1625
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
Xz<gS!`BOxX00000NkvXXu0mjfVC4Oy

literal 0
HcmV?d00001

diff --git a/public/assets/icon/水库.png b/public/assets/icon/水库.png
new file mode 100644
index 0000000000000000000000000000000000000000..a060456586c1328a2b2f3d1535f43353701874c0
GIT binary patch
literal 1568
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
S#un@V0000<MNUMnLSTYaKJpF#

literal 0
HcmV?d00001

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)=>
           (<>