fix: 统览重点区域调整

src/pages/SecurityServiceOverview/components/MapCantainer/EmphasisAreaMap/index.tsx

@@ -61,7 +61,7 @@ const EmphasisAreaMap: React.FC = () => {
   const [isBmap, setIsBmap] = useState(false);
   const MapRef = useRef<any>();
   const [leftTabKey, setLeftTabKey] = useState('1');
-  const [checkedKeys,setCheckedKeys]=useState(['aq', 'cswt'])
+  const [checkedKeys, setCheckedKeys] = useState(['aq', 'cswt'])
   // 事件详情弹窗
   const [detailModalOpt, setDetailModalOpt] = useState<any>({
     open: false,
@@ -69,6 +69,7 @@ const EmphasisAreaMap: React.FC = () => {
     eventId: '',
   });
   const [areaList, setAreaList] = useState<any>([])
+  const [allAreaMapData, setAllAreaMapData] = useState<any>([])
   const [searchParams, setSearchParams] = useState({
     parentTypeCode: 'dlql',
     lat: 30.680193,
@@ -162,10 +163,10 @@ const EmphasisAreaMap: React.FC = () => {
     }
     const res = await services.Physicalsign.getGroupObjectPhysicalSignIndex(params)
     console.log(res);
-    if(res.code === 200) {
+    if (res.code === 200) {
       setAreaList(res.data)
     }
-  } 
+  }
 
   useEffect(() => {
     getImportantAreaList()
@@ -194,6 +195,24 @@ const EmphasisAreaMap: React.FC = () => {
     },
   ];
 
+  const getObjectPolygon = async () => {
+    const params = {
+      physicalSignType: 1,
+      objectHierarchy: 19,
+    }
+    const res = await services.Physicalsign.getObjectPolygon(params)
+    if (res.code === 200) {
+      if (res.data?.length) {
+        console.log(res.data)
+        setAllAreaMapData(res.data)
+      }
+    }
+  }
+
+  useEffect(() => {
+    getObjectPolygon()
+  }, [])
+
 
   /** 标题渲染 */
   const titleRender = () => {
@@ -203,9 +222,8 @@ const EmphasisAreaMap: React.FC = () => {
         <span
           className={styles.tag}
           style={{
-            backgroundImage: `url(${
-              colorConfig[detailModalOpt?.riskLevelName]?.bg
-            })`,
+            backgroundImage: `url(${colorConfig[detailModalOpt?.riskLevelName]?.bg
+              })`,
             color: colorConfig[detailModalOpt?.riskLevelName]?.color,
           }}
         >
@@ -267,7 +285,7 @@ const EmphasisAreaMap: React.FC = () => {
         >
           {leftTabKey === '1' ? (
             <>
-              <CooglMap.CustomOverlay
+              {/* <CooglMap.CustomOverlay
                 position={p1}
                 onClick={() => {
                   dispatch.push('KeyAreaDetail', {
@@ -310,13 +328,41 @@ const EmphasisAreaMap: React.FC = () => {
                     style={{ borderColor: getColorByIndex(98.5) }}
                   ></div>
                 </div>
-              </CooglMap.CustomOverlay>
+              </CooglMap.CustomOverlay> */}
+              {
+                allAreaMapData?.map((item: any) => (
+                  <CooglMap.CustomOverlay
+                    position={[item?.centerX, item?.centerY]}
+                    onClick={() => {
+                      dispatch.push('KeyAreaDetail', {
+                        title: item.objectName,
+                        props: {
+                          objectId: item?.objectId,
+                          cqi: item?.qualitySign,
+                        },
+                      });
+                    }}
+                    key={item.objectId}
+                  >
+                    <div className={styles.indexMarker}>
+                      <div className={styles.markerContent}>
+                        { item?.objectName }
+                        <span style={{ color: getColorByIndex(item?.qualitySign) }}>{item?.qualitySign}</span>
+                      </div>
+                      <div
+                        className={styles.markerIcon}
+                        style={{ borderColor: getColorByIndex(item?.qualitySign) }}
+                      ></div>
+                    </div>
+                  </CooglMap.CustomOverlay>
+                ))
+              }
             </>
           ) : (
             <>
               {warnMark?.data?.items?.map((item: any, index: number) => {
                 const point = [Number(item?.x_pos), Number(item?.y_pos)];
-              
+
                 return (
                   <CooglMap.CustomOverlay
                     key={index}
@@ -331,9 +377,8 @@ const EmphasisAreaMap: React.FC = () => {
                   >
                     <img
                       data-event-key="set"
-                      src={require(`@/assets/images/SecurityServiceOverview/right/${
-                        colorConfig[item?.riskLevel]?.icon
-                      }.png`)}
+                      src={require(`@/assets/images/SecurityServiceOverview/right/${colorConfig[item?.riskLevel]?.icon
+                        }.png`)}
                       alt=""
                       style={{ width: 82, height: 82, zIndex: 999 }}
                     />
@@ -344,7 +389,7 @@ const EmphasisAreaMap: React.FC = () => {
                 return (
                   <CooglMap.Marker
                     key={index}
-                    onClick={() => {}}
+                    onClick={() => { }}
                     position={item.l}
                     icon={(iconList as any)[index + 1]}
                   ></CooglMap.Marker>
@@ -454,7 +499,7 @@ const EmphasisAreaMap: React.FC = () => {
               components: {
                 Tree: {
                   directoryNodeSelectedBg: '#1b4761',
-               
+
                 },
               },
             }}
@@ -464,13 +509,13 @@ const EmphasisAreaMap: React.FC = () => {
               defaultExpandAll
               onSelect={(e) => {
                 console.log(e);
-               
+
               }}
-               onCheck={(e)=>{
-                 
+              onCheck={(e) => {
+
                 setCheckedKeys(e)
-               }}
-               checkedKeys={checkedKeys}
+              }}
+              checkedKeys={checkedKeys}
               treeData={[
                 {
                   title: '安全风险',
@@ -542,8 +587,8 @@ const EmphasisAreaMap: React.FC = () => {
           </ConfigProvider>
         )}
       </div>
-         {/* 事件详情 */}
-         <Modal
+      {/* 事件详情 */}
+      <Modal
         open={detailModalOpt?.open}
         titleRender={titleRender}
         onCancel={() => {

src/pages/SecurityServiceOverview/components/MapCantainer/index.tsx

@@ -16,7 +16,8 @@ const MapContainer = () => {
       key: '2',
       img: require('@/assets/images/aqyztTab.png'),
       onclick: () => {
-        history.push('/securityServiceOverview');
+        // history.push('/securityServiceOverview');
+        window.open(`${window.location.origin}/cd-comprehensive/securityServiceOverview`, '_blank');
       },
     },
     {
@@ -28,8 +29,8 @@ const MapContainer = () => {
     },
   ];
   const Mpa = {
-    '1': <EmphasisAreaMap />,
-    '2': <DistrictMap />,
+    '1': <DistrictMap />,
+    '2': <EmphasisAreaMap />,
   };
   return (
     <div className={styles.container}>