添-首页-地图-三个点位

pages/home/waterfallFlowBody/components/map/api/index.tsx

 import request, { Response } from "~/api/request";
 
 export interface PositioningInfoParams {
-  lat: number;
-  lon: number;
+  lat?: number;
+  lon?: number;
+  pageNo?:number,
+  pageSize?:number
 }
 
 export interface Entiy {
@@ -19,11 +21,46 @@ export interface ListPageJobInfoResp {
   locationList: Array<Entiy>;
 }
 
+export interface FlyerBitmapEntiy {
+  flyerName: string,
+  phoneNum: string,
+  lon: number,
+  lat: number,
+  distance: number
+}
+export interface UavBitmapEntiy {
+  uavName: string,
+  online: number,
+  lon: number,
+  lat: number,
+  distance: number,
+  id: string
+}
+export interface BitmapInfo<T> {
+  pageNo: number,
+  pageSize: number,
+  list: T[],
+  totalCount: number,
+  totalPage: number
+}
+
 export default {
-  //web-作业服务-分页
+  //web-首页-地图-全国点位
   listPositioningInfo: (
     params: PositioningInfoParams
   ): Promise<Response<ListPageJobInfoResp[]>> => {
     return request("/release/website/getWebsiteList", "get", params);
   },
+  //web-首页-地图-全国飞手
+  listFlyerBitmap: (
+    params: PositioningInfoParams
+  ): Promise<Response<BitmapInfo<FlyerBitmapEntiy>>> => {
+    return request("/release/website/flyer/bitmap", "get", params);
+  },
+  //web-首页-地图-全国无人机
+  listUavBitmap: (
+    params: PositioningInfoParams
+  ): Promise<Response<BitmapInfo<UavBitmapEntiy>>> => {
+    return request("/release/website/uav/bitmap", "get", params);
+  },
 };

pages/home/waterfallFlowBody/index.tsx

@@ -129,8 +129,6 @@ export default function WaterfallFlowBody() {
     index: number,
     option: []
   ) => {
-    console.log("跳转",value,index,option);
-    
     const [item] = option.filter((item: any) => item.name === value.value);
     routerPath(index, item);
   };
@@ -153,40 +151,52 @@ export default function WaterfallFlowBody() {
       let res4 = await Promise.all([listAllIndustry(), listAllAppType()]);
       //  let res4 = await Promise.all([deviceCategory(),deviceBrand(),deviceModel()])
       //  let res6 = await Promise.all([deviceCategory(),deviceBrand(),deviceModel()])
-
+      
       const resValuelist1 = res1
         .map((item, index) => {
-          return item.result?.map((it) => {
-            it.type = eqApiTypeList[index];
-            return it;
-          });
+          if (item.code === "200") {
+            return item.result?.map((it) => {
+              it.type = eqApiTypeList[index];
+              return it;
+            });
+          }
+          return {}
         })
         .flat();
+        
       const resValuelist2 = res2
         .map((item, index) => {
-          return item.result?.map((it) => {
-            it.type = mallApiTypeList[index];
-            return it;
-          });
+          if (item.code === "200") {
+            return item.result?.map((it) => {
+              it.type = mallApiTypeList[index];
+              return it;
+            });
+          }
+          return {}
         })
         .flat();
       const resValuelist3 = res3
         .map((item, index) => {
-          return item.result?.map((it) => {
-            it.type = flightApiTypeList[index];
-            it.name = it.name || it.skillsName || it.licenseType;
-            return it;
-          });
+          if (item.code === "200") {
+            return item.result?.map((it) => {
+              it.type = flightApiTypeList[index];
+              it.name = it.name || it.skillsName || it.licenseType;
+              return it;
+            });
+          }
+          return {}
         })
         .flat();
       const resValuelist4 = res4
         .map((item, index) => {
-          return item.result?.map((it) => {
-            it.type = jobApiTypeList[index];
-            console.log(it);
-            it.name = it.name || it.appName;
-            return it;
-          });
+          if (item.code === "200") {
+            return item.result?.map((it) => {
+              it.type = jobApiTypeList[index];
+              it.name = it.name || it.appName;
+              return it;
+            });
+          }
+          return {}
         })
         .flat();
 
@@ -222,7 +232,6 @@ export default function WaterfallFlowBody() {
         resValuelist4,
         list2Option,
       ];
-      console.log(optionList);
 
       setLeftDomList(
         columns.map((item, index) => {
@@ -333,6 +342,7 @@ export default function WaterfallFlowBody() {
   };
 
   const rightDom = (list: Array<NewsPageType>) => {
+    if(!list?.length) return;
     return (
       <div key={1009} className="right-box-item right-item">
         <div className="title">
@@ -364,6 +374,7 @@ export default function WaterfallFlowBody() {
   };
 
   const rightDom2 = (list: Array<NewsTenderType>) => {
+    if(!list.length) return;
     return (
       <div key={1008} className="right-box-item right-item-second">
         <div className="item-box">

pages/home/waterfallFlowBody/styled.tsx

@@ -102,6 +102,7 @@ export const Box = styled.div`
     }
   }
   .right-item {
+    background-color: #fff;
     border-radius: 6px;
     .title {
       display: flex;