合并

src/models/map/index.js

@@ -544,10 +544,12 @@ const map = {
 
       if (id === 306) {
         dispatch.map.setLayerSetting({ dom: false });
-        map.setLayoutProperty('管网图', 'visibility', 'visible');
+        dispatch.runtime.setShowGw(true)
+        // map.setLayoutProperty('管网图', 'visibility', 'visible');
       } else {
+        dispatch.runtime.setShowGw(false)
         // dispatch.map.setLayerSetting({dom: true});
-        map.setLayoutProperty('管网图', 'visibility', 'none');
+        // map.setLayoutProperty('管网图', 'visibility', 'none');
       }
       if (id === 503 || id == 501 || id == 504 || id == 505 || id == 506 || id == 507) {
         dispatch.map.setLayerSetting({ dom: false });

src/models/runtime/index.js

@@ -56,6 +56,7 @@ function initState() {
       "rzState": 1,
       "aRz": -4.18
     },
+    showGw:false,
   }
 }
 
@@ -87,7 +88,10 @@ const runtime = {
       return { ...state, skType: props }
     },
     setSkObj(state, props) {
-      return { ...state, skObj: props }
+      return { ...state, skObj: props } 
+    },
+    setShowGw(state, props) {
+      return { ...state, showGw: props }
     },
     setLogoDisplaying(state, val) {
       return { ...state, logoDisplaying: val }

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

@@ -17,11 +17,13 @@ import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
 import ZrrPlan from './zrrPlan'
 import Shuizhijc from './loushun'
 import Jianceflow from './jianceflow'
+import Yxsj from './yxsj'
 import Spjk from './spjk'
 
 
 
 import Bjjl from './Bjjl'
+import Jbxx from './jbxx'
 import './index.less'
 function SkDlg({ record, onClose }) {
   const [value, setValue] = React.useState(0);
@@ -47,8 +49,8 @@ function SkDlg({ record, onClose }) {
           <DpCloseButton onClick={onClose} />
         </DpAppBar>
         <div style={{ padding: '2rem', height: '50rem' }}>
-          {value === 0 && <ShuiyuandiInfo record={record} />}
-          {value === 1 && <Shuizhijc record={record} />}
+          {value === 0 && <Jbxx record={record} />}
+          {value === 1 && <Yxsj record={record} />}
           {value === 2 && <Bjjl record={record} />}
           {value === 3 && <Shuizhijc record={record} />}
         </div>

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

@@ -0,0 +1,32 @@
+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 }) {
+  let { data } = useRequest(() => skInfo(record));
+  data = data || {};
+
+
+  return (
+    <div>
+      <Grid container size="small">
+        <DescriptionItem label="管网编号">{'H24810001'}</DescriptionItem>
+        <DescriptionItem label="建设年代">{'2020-10-12'}</DescriptionItem>
+        <DescriptionItem label="是否主管网">{'否'}</DescriptionItem>
+        <DescriptionItem label="上下游连接节点">{'否'}</DescriptionItem>
+        <DescriptionItem label="管径">{1.4}</DescriptionItem>
+        <DescriptionItem label="供水村镇">{}</DescriptionItem>
+        <DescriptionItem label="管道长度">{}</DescriptionItem>
+        <DescriptionItem label="供水户数">{}</DescriptionItem>
+      </Grid>
+    </div>
+  )
+}
+
+export default SkInfo;

src/views/Home/InfoDlg/ShuichangguanwangDlg/yxsj.js

@@ -0,0 +1,64 @@
+import { Grid } from '@material-ui/core';
+import React from 'react';
+
+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 moment from 'moment';
+
+function SkInfo({ record }) {
+    const data = [
+        { stnm: '福田镇中心区', leakage: '1258.6', supply: '3526.8', rate: 35.6 },
+        { stnm: '木子店镇区', leakage: '986.3', supply: '2832.7', rate: 34.8 },
+        { stnm: '龙池桥镇区', leakage: '1485.5', supply: '4482.5', rate: 33.1 },
+        { stnm: '宋埠镇区', leakage: '1284.8', supply: '4029.5', rate: 31.9 },
+        { stnm: '黄土岗镇区', leakage: '186.2', supply: '698.2', rate: 26.7 },
+        { stnm: '铁门岗镇区', leakage: '984.2', supply: '3994.4', rate: 24.6 },
+        { stnm: '乘马岗镇区', leakage: '300.6', supply: '1250.5', rate: 24.0 },
+        { stnm: '白果镇区', leakage: '1129.0', supply: '6422.6', rate: 17.6 },
+        { stnm: '张家畈镇区', leakage: '444.8', supply: '2661.8', rate: 16.7 },
+        { name: '顺河镇区', leakage: '749.3', supply: '4490.1', rate: 16.7 }
+      ];
+
+
+  return (
+    <div>
+      <TableContainer style={{ height: '80%', marginTop: '10px' }}>
+        <Table size="small" stickyHeader>
+          <TableHead>
+            <TableRow >
+              <DpTableCell style={{ minWidth: '4rem' }} align="center">序号</DpTableCell>
+              <DpTableCell style={{ minWidth: '4rem' }} align="center">压力</DpTableCell>
+              <DpTableCell style={{ minWidth: '4rem' }} align="center">流量(㎡)</DpTableCell>
+              <DpTableCell align="center" style={{ minWidth: '4rem' }}>水质</DpTableCell>
+              <DpTableCell align="center" style={{ minWidth: '4rem' }}>监测时间</DpTableCell>
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {data.map((row,i) => (
+              <DpTableRow key={row.id}>
+                <DpTableCell align="center">
+                  <div
+                    className="table-ellipsis cursor-pointer"
+                  >{i+1}</div>
+                </DpTableCell>
+                <DpTableCell align="center">{row.leakage}</DpTableCell>
+                <DpTableCell align="center">{row.rate}</DpTableCell>
+                <DpTableCell align="center">{'-'}</DpTableCell>
+                <DpTableCell align="center">{moment().format('YYYY-MM-DD')}</DpTableCell>
+                {/* {rzRender(row.rz, row.grz)}
+                {rzRender(row.rz, row.wrz)} */}
+              </DpTableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </TableContainer>
+    </div>
+  )
+}
+
+export default SkInfo;

src/views/Home/index.js

@@ -22,6 +22,7 @@ export default function Demo1() {
   const yyRes = useSelector(s => s.runtime.yyObj);
   const isSc = useSelector(s => s.runtime.scya);
   const wg = useSelector(s => s.runtime.shkshObj)
+  const showGw = useSelector(s => s.runtime.showGw)
   console.log('wg', wg);
 
 
@@ -49,6 +50,12 @@ export default function Demo1() {
         isSc && <img src={`${process.env.PUBLIC_URL}/assets/scdd.jpg`} alt="" style={{ zIndex: 0.1, position: 'absolute', width: '100%' }} />
       } */}
 
+      {
+        showGw && <img src={`${process.env.PUBLIC_URL}/assets/管网.png`} alt="" style={{ zIndex: 0.1, position: 'absolute', width: '100vw',height:'101vh' }} />
+      }
+
+      
+
 
       <div className="bottom">
         <ActionDock />