diff --git a/public/assets/管网.png b/public/assets/管网.png
new file mode 100644
index 0000000..17ab79a
Binary files /dev/null and b/public/assets/管网.png differ
diff --git a/src/models/map/index.js b/src/models/map/index.js
index d3e50c0..3c5b52b 100644
--- a/src/models/map/index.js
+++ b/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 });
diff --git a/src/models/runtime/index.js b/src/models/runtime/index.js
index 45a61c4..8022fde 100644
--- a/src/models/runtime/index.js
+++ b/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 }
diff --git a/src/views/Home/InfoDlg/ShuichangguanwangDlg/index.js b/src/views/Home/InfoDlg/ShuichangguanwangDlg/index.js
index 7dde867..3552792 100644
--- a/src/views/Home/InfoDlg/ShuichangguanwangDlg/index.js
+++ b/src/views/Home/InfoDlg/ShuichangguanwangDlg/index.js
@@ -17,7 +17,9 @@ import DpCloseButton from '../../../../layouts/mui/DpCloseButton';
import ZrrPlan from './zrrPlan'
import Shuizhijc from './Shuizhijc'
import Jianceflow from './jianceflow'
+import Yxsj from './yxsj'
import Spjk from './spjk'
+import Jbxx from './jbxx'
import './index.less'
function SkDlg({ record, onClose }) {
const [value, setValue] = React.useState(0);
@@ -43,8 +45,8 @@ function SkDlg({ record, onClose }) {
- {value === 0 && }
- {value === 1 && }
+ {value === 0 && }
+ {value === 1 && }
{value === 2 && }
{value === 3 && }
diff --git a/src/views/Home/InfoDlg/ShuichangguanwangDlg/jbxx.js b/src/views/Home/InfoDlg/ShuichangguanwangDlg/jbxx.js
new file mode 100644
index 0000000..070dc76
--- /dev/null
+++ b/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 (
+
+
+ {'H24810001'}
+ {'2020-10-12'}
+ {'否'}
+ {'否'}
+ {1.4}
+ {}
+ {}
+ {}
+
+
+ )
+}
+
+export default SkInfo;
diff --git a/src/views/Home/InfoDlg/ShuichangguanwangDlg/yxsj.js b/src/views/Home/InfoDlg/ShuichangguanwangDlg/yxsj.js
new file mode 100644
index 0000000..4ee5484
--- /dev/null
+++ b/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 (
+
+
+
+
+
+ 序号
+ 压力
+ 流量(㎡)
+ 水质
+ 监测时间
+
+
+
+ {data.map((row,i) => (
+
+
+ {i+1}
+
+ {row.leakage}
+ {row.rate}
+ {'-'}
+ {moment().format('YYYY-MM-DD')}
+ {/* {rzRender(row.rz, row.grz)}
+ {rzRender(row.rz, row.wrz)} */}
+
+ ))}
+
+
+
+
+ )
+}
+
+export default SkInfo;
diff --git a/src/views/Home/index.js b/src/views/Home/index.js
index b8b7dd7..b038e6a 100644
--- a/src/views/Home/index.js
+++ b/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 &&
} */}
+ {
+ showGw &&
+ }
+
+
+