提交修改

public/mapbox/sprite@2x.json

@@ -288,7 +288,7 @@
     "visible": true
   },
   "变形监测": {
-    "width": 32,
+    "width": 26,
     "height": 32,
     "x": 0,
     "y": 288,

src/models/map/layout.js

@@ -196,7 +196,8 @@ export default function calcLayout(view, rightStack, hidePanels) {
         ];
       } else if (view === 205) {
         right = [
-          { key: '警报' },
+          { key: '预演方案', style: { height: '30%', flexGrow: 1 } },
+          { key: '预演结果', style: { height: '70%', flexGrow: 1 } },
         ];
       } else if (view === 206) {
         right = [

src/views/Home/InfoDlg/ByjcDlg/descstyle.js

@@ -0,0 +1,104 @@
+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

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

@@ -0,0 +1,45 @@
+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 DpBackgroundDrop from '../../../../layouts/mui/DpBackdrop';
+import DpTabs from '../../../../layouts/mui/DpTabs';
+import DpTab from '../../../../layouts/mui/DpTab';
+import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
+import DpAppBar from '../../../../layouts/mui/DpAppBar';
+
+import Page from './index2'
+
+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="基本信息" />
+          {/* <DpTab label="基本信息" /> */}
+                      {/* <DpTab label="视频信息" /> */}
+          
+        </DpTabs>
+        <DpCloseButton onClick={onClose} />
+      </DpAppBar>
+
+      <Page record={record}/>
+      </DialogContent>
+      <div className="boxfoot"></div>
+    </Dialog>
+  )
+}
+
+export default React.memo(HDStDlg);

src/views/Home/InfoDlg/ByjcDlg/index2.js

@@ -0,0 +1,34 @@
+import { Grid } from '@material-ui/core';
+import React from 'react';
+import useRequest from '../../../../utils/useRequest';
+import { skInfo } from '../../../../models/_/search';
+import { adnmCun, adnmZhen } from '../../../../models/_/adcd';
+import { Person } from '@material-ui/icons';
+import DescriptionItem from '../../components/DescrptionItem';
+
+
+
+function SkInfo({record}) {
+  return (
+    <div>
+      <Grid container size="small">
+        <DescriptionItem label="水库名称">{record?.res_nm}</DescriptionItem>
+        <DescriptionItem label="水库类型">平原区水库</DescriptionItem>
+        <DescriptionItem label="工程规模">小（2）型</DescriptionItem>
+        <DescriptionItem label="危险等级">无</DescriptionItem>
+        <DescriptionItem label="危害总处数">0</DescriptionItem>
+        <DescriptionItem label="总监测点数">25</DescriptionItem>
+        <DescriptionItem label="有白蚁">0</DescriptionItem>
+        <DescriptionItem label="无白蚁">1</DescriptionItem>
+        <DescriptionItem label="其他动物危害处数">0</DescriptionItem>
+        <DescriptionItem label="致险总处数">0</DescriptionItem>
+        <DescriptionItem label="渗漏总处数">0</DescriptionItem>
+        <DescriptionItem label="穿坝总处数">0</DescriptionItem>
+        <DescriptionItem label="跌窝总处数">0</DescriptionItem>
+        <DescriptionItem label="填报状态">未填报</DescriptionItem>
+      </Grid>
+    </div>
+  )
+}
+
+export default SkInfo;

src/views/Home/InfoDlg/ByjcDlg/jbxx.js

@@ -0,0 +1,98 @@
+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)

src/views/Home/InfoDlg/index.js

@@ -27,6 +27,7 @@ import SqDlg from './SqDlg';
 import LlqdDlg from './LlqdDlg';
 import LlsbDlg from './LlsbDlg';
 import BxjcDlg from './BxjcBlg'
+import ByjcDlg from './ByjcDlg'
 import PdfDlg from './PdfDlg'
 
 function InfoDlg() {
@@ -97,7 +98,7 @@ function InfoDlg() {
   }else if (layerId === 'SljcLayer') {
     return <BxjcDlg record={properties} onClose={handleClose} />
   }else if (layerId === 'ByjcLayer') {
-    return <BxjcDlg record={properties} onClose={handleClose} />
+    return <ByjcDlg record={properties} onClose={handleClose} />
   }else if (layerId === 'PdfLayer') {
     return <PdfDlg record={properties} onClose={handleClose} />
   } 

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

@@ -14,13 +14,13 @@ const VIEWS = [
     { id: 4, title: '降雨中心', img: '/assets/menu/预警分析.png' },
     { id: 5, title: '天气预报', img: '/assets/menu/降雨中心.png' },
   ] },
-  { id: 200, title: '水库', img: '/assets/menu/实时数据.png',children:[
+  { id: 200, title: '水库', img: '/assets/menu/水库专题.png',children:[
-    { id: 201, title: '雨情监测', img: '/assets/menu/降雨中心.png' },
+    { id: 201, title: '雨情监测', img: '/assets/menu/雨情监测.png' },
-    { id: 202, title: '水情监测', img: '/assets/menu/水利设施.png' },
+    { id: 202, title: '水情监测', img: '/assets/menu/水情监测.png' },
-    { id: 203, title: '安全监测', img: '/assets/menu/降雨中心.png' },
+    { id: 203, title: '安全监测', img: '/assets/menu/安全监测.png' },
-    { id: 204, title: '视频监控', img: '/assets/menu/辅助决策.png' },
+    { id: 204, title: '视频监视', img: '/assets/menu/视频监视.png' },
-    { id: 205, title: '防汛调度', img: '/assets/menu/辅助决策.png' },
+    { id: 205, title: '防汛调度', img: '/assets/menu/防汛调度.png' },
-    { id: 206, title: '水库管理', img: '/assets/menu/病险水库.png' },
+    { id: 206, title: '水库管理', img: '/assets/menu/水库管理.png' },
   ] },
   { id: 300, title: '水厂', img: '/assets/menu/水利设施.png',children:[
     { id: 301, title: '供水态势', img: '/assets/menu/降雨中心.png' },
@@ -33,14 +33,14 @@ const VIEWS = [
     // 决策支持与报表
   ] },
   {
-    id: 400, title: '灌区', img: '/assets/menu/预警分析.png', children: [
+    id: 400, title: '灌区', img: '/assets/menu/灌区专题.png', children: [
-      { id: 501, title: '灌区监测', img: '/assets/menu/防洪形势.png' },
+      { id: 501, title: '灌区监测', img: '/assets/menu/灌区监测.png' },
-      { id: 504, title: '水旱灾害防御', img: '/assets/menu/水利设施.png' },
+      { id: 504, title: '水旱灾害防御', img: '/assets/menu/水旱灾害防御.png' },
-    // { id: 502, title: '预警信息管理', img: '/assets/menu/实时数据.png' },
+    // { id: 502, title: '预警信息管理', img: '/assets/menu/预警信息管理.png' },
-    { id: 503, title: '水资源调度', img: '/assets/menu/病险水库.png' },
+    { id: 503, title: '水资源调度', img: '/assets/menu/水资源调度.png' },
-    { id: 505, title: '量测水管理', img: '/assets/menu/辅助决策.png' },
+    { id: 505, title: '量测水管理', img: '/assets/menu/量测水管理.png' },
-    { id: 506, title: '水政管理', img: '/assets/menu/预警分析.png' },
+    { id: 506, title: '水政管理', img: '/assets/menu/水政管理.png' },
-    { id: 507, title: '工程管理', img: '/assets/menu/降雨中心.png' },
+    { id: 507, title: '工程管理', img: '/assets/menu/工程管理.png' },
     // 图层控制
     // 灌区监测
     // 预警信息管理
@@ -109,7 +109,7 @@ export default function ActionDock({ }) {
               }
             }}>
               <div className={clsx('button', { active: view === o.id })}>
-                <img src={o.img} />
+                <img width={32} height={32} src={o.img} />
               </div>
             </div>
           </BootstrapTooltip>

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

@@ -1478,23 +1478,21 @@ function DrpReal({ style }) {
           <Table size="small" stickyHeader>
             <TableHead>
               <TableRow>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">序号</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">仓库名称</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">水库名称</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">仓库地址</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">行政区</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">测点</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">垂直位移</DpTableCell>
               </TableRow>
             </TableHead>
             <TableBody>
-              {data1.map((row,index) => (
+              {/* {data1.map((row,index) => (
                 <DpTableRow key={row.stcd}>
                   <DpTableCell align="center">{index+1}</DpTableCell>
                   <DpTableCell align="center">{row.res_nm}</DpTableCell>
-                  <DpTableCell align="center">{row.town_nm}</DpTableCell>
-                  <DpTableCell align="center">{row.cd_nm}</DpTableCell>
-                  <DpTableCell align="center">{row.du_value}</DpTableCell>
                 </DpTableRow>
-              ))}
+              ))} */}
+              <DpTableRow>
+                <DpTableCell align="center">麻城市应急物资储备中心</DpTableCell>
+                <DpTableCell align="center">麻城市京广大道与金交汇处</DpTableCell>
+              </DpTableRow>
             </TableBody>
           </Table>:null
         }
@@ -1503,15 +1501,14 @@ function DrpReal({ style }) {
           <Table size="small" stickyHeader>
             <TableHead>
               <TableRow>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">序号</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">队伍名称</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">水库名称</DpTableCell>
+                <DpTableCell style={{ minWidth: '5rem' }} align="center">人员总数</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">行政区</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">地址</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">测点</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">管理单位</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">渗压水位</DpTableCell>
               </TableRow>
             </TableHead>
             <TableBody>
-              {data2.map((row,index) => (
+              {/* {data2.map((row,index) => (
                 <DpTableRow key={row.stcd}>
                   <DpTableCell align="center">{index+1}</DpTableCell>
                   <DpTableCell align="center">{row.res_nm}</DpTableCell>
@@ -1519,7 +1516,13 @@ function DrpReal({ style }) {
                   <DpTableCell align="center">{row.cd_nm}</DpTableCell>
                   <DpTableCell align="center">{row.value}</DpTableCell>
                 </DpTableRow>
-              ))}
+              ))} */}
+              <DpTableRow>
+                <DpTableCell align="center">乡镇应急救援中队</DpTableCell>
+                <DpTableCell align="center">20</DpTableCell>
+                <DpTableCell align="center">麻城市京广大道与金交汇处</DpTableCell>
+                <DpTableCell align="center">麻城市水利局</DpTableCell>
+              </DpTableRow>
             </TableBody>
           </Table>:null
         }
@@ -1553,15 +1556,14 @@ function DrpReal({ style }) {
           <Table size="small" stickyHeader>
             <TableHead>
               <TableRow>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">序号</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">安置点名称</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">水库名称</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">容纳人数</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">行政区</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">地址</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">测点</DpTableCell>
+                <DpTableCell style={{ maxWidth: '20%' }} align="center">管理单位</DpTableCell>
-                <DpTableCell style={{ maxWidth: '20%' }} align="center">状态</DpTableCell>
               </TableRow>
             </TableHead>
             <TableBody>
-              {data4.map((row,index) => (
+              {/* {data4.map((row,index) => (
                 <DpTableRow key={row.stcd}>
                   <DpTableCell align="center">{index+1}</DpTableCell>
                   <DpTableCell align="center">{row.res_nm}</DpTableCell>
@@ -1569,7 +1571,13 @@ function DrpReal({ style }) {
                   <DpTableCell align="center">{row.res_nm}</DpTableCell>
                   <DpTableCell align="center">{row?.children?.[0]?.termite_status==='y'?'有白蚁':'无白蚁'}</DpTableCell>
                 </DpTableRow>
-              ))}
+              ))} */}
+              <DpTableRow>
+                <DpTableCell align="center">阎家河镇</DpTableCell>
+                <DpTableCell align="center">1800</DpTableCell>
+                <DpTableCell align="center">麻城市京广大道与金交汇处</DpTableCell>
+                <DpTableCell align="center">麻城市水利局</DpTableCell>
+              </DpTableRow>
             </TableBody>
           </Table>:null
         }

src/views/Home/panels/WeatherForcast/WF.js

@@ -49,11 +49,17 @@ function WF() {
   }, [contourSetting]);
 
   const genWeatherContour24H = () => {
+    dispatch.runtime.setYyfa({yy:''})
     dispatch.shyjview.showWeather24h();
+    const map = window.__mapref
+    map.setLayoutProperty('热力图', 'visibility', 'none');
   }
 
   const genWeatherContourRadar = () => {
+    dispatch.runtime.setYyfa({yy:''})
     dispatch.shyjview.showWeatherRadar();
+    const map = window.__mapref
+    map.setLayoutProperty('热力图', 'visibility', 'none');
   }
 
   const setIndexH24 = (index) => {

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

@@ -10,6 +10,9 @@ export default function WeatherForcast({ style }) {
   const closeLayer = () => {
     dispatch.runtime.setLayerSetting({ contour: null, dem: undefined });
     dispatch.map.setLayerVisible({ ContourLayer: false });
+    dispatch.runtime.setYyfa({yy:''})
+    const map = window.__mapref
+    map.setLayoutProperty('热力图', 'visibility', 'none');
   }
 
   return (