Merge branch 'master' of http://10.0.41.100:3000/lishenfeng/tsg-web

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')

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'){

src/views/Home/homePanelsLayoutPage/myImg.js

@@ -25,7 +25,7 @@ const MyImg = ({ record }) => {
   return (
     <div style={{
       flexGrow: 1,
-      height: '36vh',
+      height: '33vh',
       overflow: 'hidden',
       position: 'relative',
       backgroundColor: "#eff3f6",

src/views/Home/panels/forecastPanels/meteorology/radar/player.tsx

@@ -39,7 +39,7 @@ const Player: React.FC<IProps> = ({ 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<IProps> = ({ 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<IProps> = ({ 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<IProps> = ({ 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<IProps> = ({ 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<IProps> = ({ activeKey, badgeType, tm, ts }) => {
 
         deleteLayer("radarImage");
 
-        mapObj.addLayer(sateCloudLayer);
+        mapObj && mapObj.addLayer(sateCloudLayer);
       }
     }
   }, [radarImgData, mapObj, num, activeKey]);//radarImgData, mapObj, channelVariables, num

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)

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 editBtn = role?.rule?.find(item => item.menuName == "编辑")  || true;
-  const viewBtn = role?.rule?.find(item => item.menuName == "查看");
+  const viewBtn = role?.rule?.find(item => item.menuName == "查看")  || true;
-  const delBtn = role?.rule?.find(item => item.menuName == "删除");
+  const delBtn = role?.rule?.find(item => item.menuName == "删除")  || true;
   const checkType = {
     1: "低风险",
     2: "一般风险",