From 247e4378bf9bcc9339543a3bac5197f20059c66a Mon Sep 17 00:00:00 2001 From: lishenfeng Date: Tue, 8 Oct 2024 11:31:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat():=20=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/rcgl/xcxj/xjwtcl/index.js | 2 +- src/views/rcgl/xcxj/xjxpz/index.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/rcgl/xcxj/xjwtcl/index.js b/src/views/rcgl/xcxj/xjwtcl/index.js index b968344f0..226a929fd 100644 --- a/src/views/rcgl/xcxj/xjwtcl/index.js +++ b/src/views/rcgl/xcxj/xjwtcl/index.js @@ -13,7 +13,7 @@ import {CrudOpRender_text} from '../../../../components/crud/CrudOpRender'; const url = "http://223.75.53.141:9102/test.by-lyf.tmp" const Page = () => { const role = useSelector(state => state.auth.role); - const viewBtn = role?.rule?.find(item => item.menuName == "详情"); + const viewBtn = role?.rule?.find(item => item.menuName == "详情") || true; const refModal = useRef(); const [searchVal, setSearchVal] = useState(false) const [tabs, setTabsChange] = useState(0) diff --git a/src/views/rcgl/xcxj/xjxpz/index.js b/src/views/rcgl/xcxj/xjxpz/index.js index fe2b0ea33..c31ff4dbd 100644 --- a/src/views/rcgl/xcxj/xjxpz/index.js +++ b/src/views/rcgl/xcxj/xjxpz/index.js @@ -16,9 +16,9 @@ const Page = () => { const role = useSelector(state => state.auth.role); console.log(role); - const editBtn = role?.rule?.find(item => item.menuName == "编辑"); - const viewBtn = role?.rule?.find(item => item.menuName == "查看"); - const delBtn = role?.rule?.find(item => item.menuName == "删除"); + const editBtn = role?.rule?.find(item => item.menuName == "编辑") || true; + const viewBtn = role?.rule?.find(item => item.menuName == "查看") || true; + const delBtn = role?.rule?.find(item => item.menuName == "删除") || true; const checkType = { 1: "低风险", 2: "一般风险", From 426a9931dad54e6109f34c7938f0501ca6d3db3e Mon Sep 17 00:00:00 2001 From: qzc Date: Tue, 8 Oct 2024 17:14:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/fhxs/index.js | 12 +++++++++++- src/views/Home/homePanelsLayoutPage/index.js | 2 +- src/views/Home/homePanelsLayoutPage/myImg.js | 2 +- .../forecastPanels/meteorology/radar/player.tsx | 14 +++++++------- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/views/Home/fhxs/index.js b/src/views/Home/fhxs/index.js index 69674276e..527dabd19 100644 --- a/src/views/Home/fhxs/index.js +++ b/src/views/Home/fhxs/index.js @@ -19,13 +19,23 @@ const Page = ({showPanels}) => { const [data,setData] = useState({})//水库 useEffect(()=>{ - dispatch.map.setLayerVisible({ ShuiKuLayer: true }) + // dispatch.map.setLayerVisible({ ShuiKuLayer: true }) + dispatch.map.setLayerVisible({ HdswLayer: true }) getData() return ()=>{ dispatch.map.setLayerVisible({ ShuiKuLayer: false }) + dispatch.map.setLayerVisible({ HdswLayer: false }) } },[]) + useEffect(()=>{ + if(myKey==='2'){ + dispatch.map.setLayerVisible({ ShuiKuLayer: true }) + }else{ + dispatch.map.setLayerVisible({ ShuiKuLayer: false }) + } + },[myKey]) + useEffect(()=>{ if(mapObj){ setMyKey('1') diff --git a/src/views/Home/homePanelsLayoutPage/index.js b/src/views/Home/homePanelsLayoutPage/index.js index d58285db9..1661c7485 100644 --- a/src/views/Home/homePanelsLayoutPage/index.js +++ b/src/views/Home/homePanelsLayoutPage/index.js @@ -126,7 +126,7 @@ const HomePage = ({showPanels}) => { dispatch.runtime.setHome() setCheckedObj({ key:'11', label:'预警', labelRight:'预警', icon:'yujing' }) }else if(a==='2'){ - // setShowTable(true) + setShowTable(true) // dispatch.runtime.setHome() setCheckedObj({ key:'21', label:'巡查巡检', labelRight:'工程巡检', icon:'shuiku' }) }else if(a==='3'){ diff --git a/src/views/Home/homePanelsLayoutPage/myImg.js b/src/views/Home/homePanelsLayoutPage/myImg.js index c7a0af21d..283589344 100644 --- a/src/views/Home/homePanelsLayoutPage/myImg.js +++ b/src/views/Home/homePanelsLayoutPage/myImg.js @@ -25,7 +25,7 @@ const MyImg = ({ record }) => { return (
= ({ activeKey, badgeType, tm, ts }) => { const onSearchClick = (val:any) => { setSelectTime(moment(val).format("YYYYMMDD")); - mapObj.getLayers().getArray().forEach((layer:any)=> { + mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> { if( (layer.values_.name) && (layer.values_.name).indexOf("radarImage") !== -1 ){ layer.setOpacity(0); layer.setSource(null); @@ -105,7 +105,7 @@ const Player: React.FC = ({ activeKey, badgeType, tm, ts }) => { return ()=>{ dispatch.runtime.closeFeaturePopAll() - mapObj.getLayers().getArray().forEach((layer:any)=> { + mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> { if( (layer?.values_.name) && (layer?.values_.name)?.indexOf("radarImage") !== -1 ){ layer.dispose(); } @@ -138,7 +138,7 @@ const Player: React.FC = ({ activeKey, badgeType, tm, ts }) => { useEffect(() => { //console.log("110",badgeType); if(badgeType === 1){ - mapObj.getView().setZoom(9); + mapObj && mapObj.getView().setZoom(9); setTooltipOpen(true); } }, [badgeType]); @@ -146,7 +146,7 @@ const Player: React.FC = ({ activeKey, badgeType, tm, ts }) => { const setIndex = (index:any) => { setNum(index); - mapObj.getLayers().getArray().forEach((layer:any)=> { + mapObj && mapObj.getLayers().getArray().forEach((layer:any)=> { if( (layer.values_.name) && (layer.values_.name).indexOf("radarImage") !== -1 ){ layer.dispose(); } @@ -176,11 +176,11 @@ const Player: React.FC = ({ activeKey, badgeType, tm, ts }) => { // @ts-ignore const deleteLayer = (layerId) => { // @ts-ignore - var layer = mapObj.getLayers().getArray().find(function(layer) { + var layer = mapObj && mapObj.getLayers().getArray().find(function(layer) { return layer.get('id') === layerId; }); if (layer) { - mapObj.removeLayer(layer); + mapObj && mapObj.removeLayer(layer); } }; @@ -223,7 +223,7 @@ const Player: React.FC = ({ activeKey, badgeType, tm, ts }) => { deleteLayer("radarImage"); - mapObj.addLayer(sateCloudLayer); + mapObj && mapObj.addLayer(sateCloudLayer); } } }, [radarImgData, mapObj, num, activeKey]);//radarImgData, mapObj, channelVariables, num