diff --git a/src/models/map/layout.js b/src/models/map/layout.js index cb9b28a..ba890c8 100644 --- a/src/models/map/layout.js +++ b/src/models/map/layout.js @@ -262,20 +262,20 @@ export default function calcLayout(view, rightStack, hidePanels) { ]; } else if (view === 301) { right = [ - { key: '警报' }, + // { key: '警报' }, { key: '水厂生产情况',style: { height: '15rem', flexGrow: 1 } }, { key: '对比分析', style: { height: '19rem' } }, { key: '报警统计',style: { height: '19rem',flexGrow: 1 } }, ]; } else if (view === 302) { right = [ - { key: '警报' }, + // { key: '警报' }, { key: '水厂水质监测',style: { height: '16rem'} }, { key: '报警分析',style: { height: '18rem'} }, ]; } else if (view === 303) { right = [ - { key: '警报' }, + // { key: '警报' }, { key: '安防监控', style: { height: '14rem', flexGrow: 1 } }, { key: '电耗分析', style: { height: '19rem', flexGrow: 1 } }, { key: '药耗分析', style: { height: '21rem', flexGrow: 1 } }, diff --git a/src/views/Home/MapCtrl/mapstyle/realsklayer.js b/src/views/Home/MapCtrl/mapstyle/realsklayer.js index c18b96d..2af3c84 100644 --- a/src/views/Home/MapCtrl/mapstyle/realsklayer.js +++ b/src/views/Home/MapCtrl/mapstyle/realsklayer.js @@ -149,7 +149,14 @@ export default class RealSkLayer extends BaseLayer { zcxsw: 231, }] } - ms.setData(parseGeoJSON(data)); + const list = data.filter(o=>{ + if(o.stnm==='青山垸水库'||o.stnm==='七角尖水库'||o.stnm==='杨树庵水库'||o.stnm==='石鼓庙水库'||o.stnm==='张家凹水库'||o.stnm==='大坳水库'){ + return false + }else{ + return true + } + }) + ms.setData(parseGeoJSON(list)); return true; }