fix: '底图组件显示bug修复'

src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx

@@ -198,7 +198,8 @@ const Map = props => {
   const [keepNameCustomPointExtent, setKeepNameCustomPointExtent] = useState(''); // 保存方案初始自定义区域
 
   useEffect(() => {
-    GetWebSiteConfig({ client: 'sandbox' }).then(res => {
+    GetWebSiteConfig({ client: 'sandbox' })
+      .then(res => {
         let setttings = {};
         if (res.data.length === 0) {
           res.data.layers = [defaultMap];
@@ -224,8 +225,6 @@ const Map = props => {
         });
         let list = {};
         list.layers = dalist;
-      console.log(list);
-      debugger;
         setFirstList({ ...list });
         setTimeout(() => {
           form.setFieldsValue({
@@ -243,11 +242,9 @@ const Map = props => {
           setKeepNameArea(setttings.areaName);
 
           setKeepBorderArea(setttings.customPointExtent);
-        console.log(setttings.customPointExtent);
           if (setttings.customPointExtent) {
             let aa = JSON.parse(setttings.customPointExtent);
             let data = {};
-          console.log(aa);
             if (aa && aa.type) {
               setKeepDraw(aa.geometry);
               setKeepNameCustomPointExtent(aa.geometry);
@@ -259,9 +256,7 @@ const Map = props => {
               });
               let hh = {};
               hh.rings = rings;
-            console.log(hh);
               data.geometry = geomUtils.toGeometry(hh);
-            console.log(data);
               setResultData({ ...data });
             }
           } else {
@@ -289,6 +284,21 @@ const Map = props => {
 
           setCanLoadMap(true);
         }, 0);
+      })
+      .catch(err => {
+        if (err.message.indexOf('timeout') !== -1) {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: '请求超时',
+          });
+        } else {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: err.message,
+          });
+        }
       });
     // 获取城市选择器列表
     window.AMap.plugin('AMap.DistrictSearch', () => {
@@ -310,7 +320,8 @@ const Map = props => {
   }, []);
 
   const getData = () => {
-    GetWebSiteConfig({ client: 'sandbox' }).then(res => {
+    GetWebSiteConfig({ client: 'sandbox' })
+      .then(res => {
         let setttings = {};
         if (res.data.length === 0) {
           res.data.layers = [defaultMap];
@@ -329,7 +340,6 @@ const Map = props => {
         });
         let list = {};
         list.layers = dalist;
-      console.log(dalist);
         // setFirstList({ ...list });
         setMapsettings(res.data);
         setSetttingsSave(res.data);
@@ -338,7 +348,6 @@ const Map = props => {
             setttings = item;
           }
         });
-      console.log(setttings);
         setTimeout(() => {
           form.setFieldsValue({
             areaName: setttings.areaName ? [setttings.areaName] : ['上海市'],
@@ -358,7 +367,6 @@ const Map = props => {
           if (setttings.customPointExtent) {
             let aa = JSON.parse(setttings.customPointExtent);
             let data = {};
-          console.log(aa);
             if (aa && aa.type) {
               setKeepDraw(aa.geometry);
               setKeepNameCustomPointExtent(aa.geometry);
@@ -370,7 +378,6 @@ const Map = props => {
               });
               let hh = {};
               hh.rings = rings;
-            console.log(hh);
               data.geometry = geomUtils.toGeometry(hh);
               setResultData({ ...data });
             }
@@ -399,6 +406,21 @@ const Map = props => {
 
           setCanLoadMap(true);
         }, 0);
+      })
+      .catch(err => {
+        if (err.message.indexOf('timeout') !== -1) {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: '请求超时',
+          });
+        } else {
+          notification.error({
+            message: '提示',
+            duration: 3,
+            description: err.message,
+          });
+        }
       });
     // 获取城市选择器列表
     window.AMap.plugin('AMap.DistrictSearch', () => {
@@ -421,7 +443,6 @@ const Map = props => {
 
   // 获取地图实例
   const getMapInfo = viewObject => {
-    console.log(areaFlag);
     // 切换方案清除自定义绘制管网;
     // const pipenetLayers = viewObject.map.layers.filter(item => {
     //   item.layerType && item.layerType == 'PipenetLayertest';
@@ -434,11 +455,7 @@ const Map = props => {
         viewObject.map.remove(item);
       }
     });
-
-    console.log(123);
     setMap(viewObject);
-    console.log(viewObject);
-    debugger;
     watchUtils.watch(viewObject, ['zoom'], newzoom => {
       // 鼠标滚动隐藏管网图
       viewObject.map.layers.find(layer => {
@@ -449,11 +466,9 @@ const Map = props => {
     });
     mapInfo.current = viewObject;
     if (form.getFieldsValue().exportScheme == 'pandagis') {
-      console.log(mapInfo.current.map.layers);
       let data = mapInfo.current.map.layers.find(
         item => item.layerType && item.layerType == 'PipenetLayertest',
       );
-      console.log(data);
       if (!data) {
         // 用户自定义创建的管网图
         let aa = '';
@@ -479,13 +494,11 @@ const Map = props => {
   const checkColor = color => {
     form.setFieldsValue({ backgroundColor: color });
     setColor(color);
-    console.log(color);
     mapRef.current.updateAreaColor(color);
   };
 
   // 表单修改后对地图进行配置
   const changeValue = changedFields => {
-    console.log(changedFields);
     if (changedFields.length === 0) {
       return;
     }
@@ -542,14 +555,14 @@ const Map = props => {
             i.layerType = 'PipenetLayer';
           }
         });
-        console.log(aa);
         // setFirstList({ ...aa });
         break;
       case 'schemename':
         setKeepDataDraw([]);
         setRadio1('');
 
-        GetWebSiteConfig({ client: 'sandbox' }).then(res => {
+        GetWebSiteConfig({ client: 'sandbox' })
+          .then(res => {
             setSchemeList(res.data);
             setMapsettings(res.data);
             setSetttingsSave(res.data);
@@ -571,12 +584,25 @@ const Map = props => {
                 item.layerType = 'PipenetLayer';
               }
             });
-          console.log(dalist);
             let list = {};
             list.layers = dalist;
-          console.log(list);
-          debugger;
-          setFirstList({ ...list });
+            mapRef.current.mapchange(dalist);
+            // setFirstList({ ...list });
+          })
+          .catch(err => {
+            if (err.message.indexOf('timeout') !== -1) {
+              notification.error({
+                message: '提示',
+                duration: 3,
+                description: '请求超时',
+              });
+            } else {
+              notification.error({
+                message: '提示',
+                duration: 3,
+                description: err.message,
+              });
+            }
           });
         setArea('');
         Drawtool.deactivate(false);
@@ -589,7 +615,6 @@ const Map = props => {
           if (item.schemename === changedFields[0].value) {
             item.layerType = 'PipenetLayer';
             setttings = item;
-            console.log(item);
             setSchemename(item);
             setName(item.id);
             setKeep(item);
@@ -666,7 +691,6 @@ const Map = props => {
         aa = 1;
         setLoad(false);
         setArea(data);
-        console.log(data);
         const geom1 = geomUtils.toGeometry({
           type: 'extent',
           xmin: data.rings[0][0][0],
@@ -689,7 +713,6 @@ const Map = props => {
 
   const saveCallBack = e => {
     setSaveFlag(1);
-    console.log(e);
     if (e.geometry && e.geometry.rings) {
       let geom1 = [];
       e.geometry.rings[0].forEach(i => {
@@ -740,7 +763,6 @@ const Map = props => {
     if (radio == 'arcgis') {
       let style = styleRef.current.stylesCompare();
       if (JSON.stringify(style.originalStyle) == JSON.stringify(style.newStyle)) {
-        console.log(123);
       } else {
         message.error('请先保存管网前端绘制方案');
         return;
@@ -779,24 +801,20 @@ const Map = props => {
         data.geometry = obj.customPointExtent;
       } else {
         data = obj.customPointExtent;
-        console.log(obj.customPointExtent);
       }
     } else if (keepDataDraw.length > 0) {
       data.type = keepType;
       data.geometry = keepDataDraw;
     } else if (keepBorderArea) {
-      console.log(keepBorderArea.constructor);
       if (keepBorderArea.constructor === Array) {
         data.type = keepType;
         data.geometry = keepBorderArea;
       } else if (keepBorderArea.constructor === Object) {
         data = keepBorderArea;
       }
-      console.log(keepBorderArea);
     } else {
       data = '';
     }
-    console.log(data);
     if (JSON.stringify(data) === '{}') {
       data = null;
     }
@@ -900,12 +918,10 @@ const Map = props => {
       Drawtool.deactivate();
       setRadio1(e.target.value);
     } else {
-      console.log(keepDraw);
       if (keepDraw) {
         let area1 = form.getFieldsValue().areaName;
         mapRef.current.changeAreaName(area1[area1.length - 1], keepDraw);
         let data = {};
-        console.log(keepType);
         data.type = keepType;
         let rings = [];
         keepDraw.map(i => {
@@ -913,7 +929,6 @@ const Map = props => {
         });
         let hh = {};
         hh.rings = rings;
-        console.log(hh);
         data.geometry = geomUtils.toGeometry(hh);
         setResultData({ ...data });
       }
@@ -935,7 +950,6 @@ const Map = props => {
         i.layerType = 'PipenetLayer';
       }
     });
-    console.log(aa);
     // setFirstList({ ...aa });
   };
 
@@ -946,7 +960,6 @@ const Map = props => {
   // 颜色选择
   const colorChange = value => {
     form.setFieldsValue({ boundColor: value.hex });
-    console.log(value.hex);
     mapRef.current.changeBoundColor(value.hex);
     setColorList(value.hex);
   };
@@ -1259,7 +1272,6 @@ const Map = props => {
         )}
         {radio1 == 1 && butState ? (
           <>
-            <span>{console.log(form.getFieldsValue().areaName)}</span>
             <EditAndDrawPanel
               view={mapInfo.current}
               editType={['POLYGON', 'EXTENT', 'CIRCLE']}