diff --git a/public/assets/scdd.jpg b/public/assets/scdd.jpg new file mode 100644 index 0000000..4f5130e Binary files /dev/null and b/public/assets/scdd.jpg differ diff --git a/src/models/map/layout.js b/src/models/map/layout.js index 6ab7a8d..5f3ab3c 100644 --- a/src/models/map/layout.js +++ b/src/models/map/layout.js @@ -96,7 +96,27 @@ export default function calcLayout(view, rightStack, hidePanels) { { key: '日供水量',style: { height: '16rem', flexGrow: 1 } }, { key: '供水覆盖率',style: { height: '16rem', flexGrow: 1 } }, ]; - } else if (view === 501) { + }else if (view === 305) { + left = [ + { key: '供水量统计', style: { height: '30rem', flexGrow: 1 } }, + { key: '取水量统计', style: { height: '40rem', flexGrow: 1 } }, + ]; + leftFullHeight = true; + } + else if (view === 306) { + left = [ + { key: '管线', style: { height: '30rem', flexGrow: 1 } }, + { key: '数量及里程分布', style: { height: '40rem', flexGrow: 1 } }, + { key: '管网监测数据', style: { height: '40rem', flexGrow: 1 } }, + ]; + leftFullHeight = true; + } + else if (view === 307) { + left = [ + { key: '预案库管理', style: { height: '40rem', flexGrow: 1 } }, + ]; + leftFullHeight = true; + }else if (view === 501) { left = [ { key: '雨量监测',style: { height: '33%', flexGrow: 1 } }, { key: '水情监测', style: { height: '33%', flexGrow: 1 } }, @@ -209,7 +229,20 @@ export default function calcLayout(view, rightStack, hidePanels) { { key: '供水监控', style: { flexGrow: 1 } }, rightFullHeight = true ]; - } else if (view === 501) { + }else if (view === 305) { + right = [ + { key: '电耗统计', style: { height: '100%', flexGrow: 1 } }, + ]; + rightFullHeight = true; + } + else if (view === 306) { + right = [ + { key: '漏损排行榜', style: { height: '50%', flexGrow: 1 } }, + { key: '最小流量', style: { height: '50%', flexGrow: 1 } }, + ]; + rightFullHeight = true; + } + else if (view === 501) { right = [ { key: '水质监测',style: { height: '33%', flexGrow: 1 } }, { key: '土壤墒情监测', style: { height: '33%', flexGrow: 1 } }, diff --git a/src/models/runtime/index.js b/src/models/runtime/index.js index f3ee764..3586aae 100644 --- a/src/models/runtime/index.js +++ b/src/models/runtime/index.js @@ -13,9 +13,10 @@ function initState() { featurePops: [], layerSetting: { }, - yyObj:{}, + yyObj: {}, + gwobj:undefined, markers: {}, // type -> [{ id, lgtd, lttd, elev }] - + scya:undefined, warnresp: {}, warnrespTick: 1, } @@ -30,6 +31,12 @@ const runtime = { setYyfa(state, props) { return { ...state, yyObj: props } }, + setGwtc(state, props) { + return { ...state, gwobj: props } + }, + setScya(state, props) { + return { ...state, scya: props } + }, setLogoDisplaying(state, val) { return { ...state, logoDisplaying: val } }, diff --git a/src/views/Home/InfoDlg/LayersDlg/index.js b/src/views/Home/InfoDlg/LayersDlg/index.js index f06dfa9..2406128 100644 --- a/src/views/Home/InfoDlg/LayersDlg/index.js +++ b/src/views/Home/InfoDlg/LayersDlg/index.js @@ -29,7 +29,7 @@ import SbLayer from '../../MapCtrl/mapstyle/sblayer'; import QdLayer from '../../MapCtrl/mapstyle/qdlayer'; import ShuizhiLayer from '../../MapCtrl/mapstyle/shuizhilayer'; import TrsqLayer from '../../MapCtrl/mapstyle/trsqlayer'; - +import ScjcLayer from '../../MapCtrl/mapstyle/scjclayer' @@ -142,6 +142,9 @@ function LayersDlg({ onClose }) {
+ viewKey ?
+
+
>
- }
+ }
+
+ {
+ isSc &&
+ }