水库修改细节

src/views/Home/InfoDlg/AllSkDlg/index.js

@@ -0,0 +1,109 @@
+import React from 'react';
+import DpTab from '../../../../layouts/mui/DpTab';
+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 DpAppBar from '../../../../layouts/mui/DpAppBar';
+import { useDispatch, useSelector } from 'react-redux';
+import DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop';
+import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
+
+function HDStDlg({ record, onClose }) {
+  const [value, setValue] = React.useState(0);
+  const dispatch = useDispatch();
+
+  const data = {
+    "stcd": "716129061",
+    "type": "sk",
+    "hasRz": true,
+    "stnm": "仰天窝水库",
+    "adcd": "421181201000",
+    "wscd": null,
+    "importancy": 0,
+    "lgtd": 115.106667,
+    "lttd": 31.126389,
+    "elev": 0,
+    "damel": 325.08,
+    "dsflz": 324.18,
+    "fsltdz": 323.5,
+    "ddz": 319.5,
+    "zcxsw": 323.5,
+    "drpTm": "2025-04-11T05:00:00.000Z",
+    "today": 0,
+    "h1": 0,
+    "h3": 0,
+    "h6": 0,
+    "h12": 0,
+    "h24": 0,
+    "h48": 0,
+    "drpState": 2,
+    "rz": 325.16,
+    "w": 0.132,
+    "a_fsltdz": 4.660000000000025,
+    "rzTm": "2025-04-11T05:00:00.000Z",
+    "rzWarning": 1,
+    "rzState": 2,
+    "pic": [
+        {
+            "stcd": "716129061",
+            "tm": "2023-03-12T06:05:00.000Z",
+            "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129061/20230312140500.jpg"
+        },
+        {
+            "stcd": "716129061",
+            "tm": "2023-03-12T07:25:00.000Z",
+            "url": "http://223.75.53.106:8891/skjgimages/2023/0312/716129062/20230312152500.jpg"
+        }
+    ],
+    "layer": "RealSkLayer",
+    "layerPop": "RealSkPop",
+    "aRz": 4.66,
+    "strarz": "4.66"
+}
+
+  const flyTo = (row) => {
+    onClose()
+    dispatch?.runtime.setInfoDlg({ layerId: 'RealSkLayer', properties: row })
+    // const { lgtd, lttd } = row;
+    // if (lgtd && lttd) {
+    //   // dispatch.runtime.setFeaturePop({ type: 'RealSkPop', properties: row, coordinates: [row.lgtd, row.lttd] });
+    //   dispatch.runtime.setCameraTarget({
+    //     center: [lgtd, lttd + 0.005],
+    //     zoom: 15,
+    //     pitch: 50,
+    //     bearing: 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="水库" />
+          </DpTabs>
+          <DpCloseButton onClick={onClose} />
+        </DpAppBar>
+      <div style={{position:'relative'}}>
+        <img  src={process.env.PUBLIC_URL+'/assets/13291750658674_.pic.jpg'} style={{width:'100%',marginTop:'0rem'}}/>
+        <div style={{position:'absolute',width:'4rem',height:'20px',background:'transparent',top:'9rem',left:'8rem',cursor:'pointer',zIndex:999}} 
+        onClick={()=>flyTo(data)}
+        ></div>
+      </div>
+      </DialogContent>
+      <div className="boxfoot"></div>
+    </Dialog>
+  )
+}
+
+export default React.memo(HDStDlg);

src/views/Home/InfoDlg/index.js

@@ -47,6 +47,7 @@ import ShuiBengDlg from './ShuiBengDlg'
 import ShuichangguanwangDlg from './ShuichangguanwangDlg';
 import FlowjcDlg from './FlowjcDlg'
 import EditFaDlg from './EditFaDlg'
+import AllSkDlg from './AllSkDlg'
 function InfoDlg() {
   const infoDlg = useSelector(getInfoDlg);
   const dispatch = useDispatch();
@@ -152,6 +153,8 @@ function InfoDlg() {
     return <FlowjcDlg record={properties} onClose={handleClose} />
   }else if (layerId === 'editFaLayer') {
     return <EditFaDlg record={properties} onClose={handleClose} />
+  }else if (layerId === 'allSkFaLayer') {
+    return <AllSkDlg record={properties} onClose={handleClose} />
   }
   
 

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

@@ -184,11 +184,11 @@ function RealSkTip({ record, dispatch,view }) {
       <div className="featuretip-title">
         <div className="name">{record.stnm}
         {record.stnm == '浮桥河水库' ?
-          record?.setView&&view===200?
+          record?.setView&&view===207?
           <span style={{cursor:'pointer',color:'#50b1f9',marginLeft:20}} onClick={()=>{
             dispatch.map.setView(203)
             sessionStorage.setItem('lastCenter',JSON.stringify(record))
-          }}>  进入水库模块</span>
+          }}>  进入此水库</span>
               : null :
             record.stnm == '小玉潭水库' ?
               <span style={{ cursor: 'pointer', color: '#50b1f9',marginLeft:20 }} onClick={openSw}>

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

@@ -155,7 +155,7 @@ export default function Title() {
           </div>
       </div>:null
       }
-      {
+      {/* {
         (view===203||view===205||view===206)?
         <div style={{position:'absolute',left:'27.8rem',top:'7.6rem',transform:'translate(0px, 0px)',display:'flex',flexDirection:'column'}}>
         {
@@ -198,7 +198,7 @@ export default function Title() {
           )
         }
         </div>:null
-      }
+      } */}
     </div>
   )
 }

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

@@ -2,14 +2,25 @@ import clsx from 'clsx';
 import React from 'react';
 import PanelBox from '../../components/PanelBox';
 import ARzSk from './ARzSk';
+import { useDispatch, useSelector } from 'react-redux';
+
 
 export default function Warn({ style }) {
+  const dispatch = useDispatch();
 
   return (
     <PanelBox
       style={style}
       title="超汛限水库"
       color="green"
+
+      extra={
+        <>
+          <div style={{cursor:'pointer',color:'#1890ff'}} onClick={()=>{
+            dispatch?.runtime.setInfoDlg({ layerId: 'allSkFaLayer', properties: {} })
+          }}>详情</div>
+        </>
+      }
     >
       <ARzSk />
     </PanelBox>

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

@@ -61,16 +61,16 @@ function HDReal({ style }) {
       <div style={{ display: 'flex', padding: '10px 5px',marginLeft:30, justifyContent: 'space-between', flexWrap: 'wrap' }}>
         <div>
           <img src={`${process.env.PUBLIC_URL}/assets/s3.png`} alt="" style={{ width: 180,cursor:'pointer' }}  onClick={handleBxDlg}/>
-          <img src={`${process.env.PUBLIC_URL}/assets/s2.png`} alt="" style={{ width: 180 }} />
-        </div>
-
-        <div style={{ margin: '5px 0' }}>
-          <img src={`${process.env.PUBLIC_URL}/assets/s1.png`} alt="" style={{ width: 180 }} />
           <img src={`${process.env.PUBLIC_URL}/assets/s4.png`} alt="" style={{ width: 180 }} />
         </div>
 
-        <div >
+        <div style={{ margin: '5px 0' }}>
           <img src={`${process.env.PUBLIC_URL}/assets/s5.png`} alt="" style={{ width: 180 }} />
+          <img src={`${process.env.PUBLIC_URL}/assets/s1.png`} alt="" style={{ width: 180 }} />
+        </div>
+
+        <div >
+          <img src={`${process.env.PUBLIC_URL}/assets/s2.png`} alt="" style={{ width: 180 }} />
           <img src={`${process.env.PUBLIC_URL}/assets/s6.png`} alt="" style={{ width: 180 }} />
         </div>
           <img src={`${process.env.PUBLIC_URL}/assets/s7.png`} alt="" style={{ width: 180,marginTop:5 }} />