Merge remote-tracking branch 'origin/caoyun'

pages/flyingHandService/api/index.tsx

@@ -29,16 +29,29 @@ export interface ListPageFlyingInfoResp {
 
 export interface SkillsType {
   type: string;
-  id: 1,
-  skillsName: string
+  id: number,
+  skillsName: string,
+  label:string | number,
+  value:string | number
 }
 
 export interface RegionResp {
-  "childInfo": RegionResp[] | null,
-  "id": number,
-  "level": number,
-  "name": string,
-  "pid": number
+  childInfo: RegionResp[] | null,
+  id: number,
+  level: number,
+  name: string,
+  pid: number
+}
+
+export interface PilotRegistrationParams {
+  city?: number,
+  drivingLicense?: number,
+  industryAppAuth?: Array<number>,
+  province?: number,
+  remark?: string,
+  telephone?: string,
+  uavLicenseLevelOne?: number,
+  uavLicenseLevelTwo?: number
 }
 
 export default {
@@ -55,4 +68,7 @@ export default {
   IndustryFlightSkills: (): Promise<Response<Array<SkillsType>>> => {
     return request('/release/curriculum/getIndustryFlightSkills');
   },
+  PilotRegistrations: (params:PilotRegistrationParams): Promise<Response<Array<SkillsType>>> => {
+    return request('/release/curriculum/pilotRegistration',"post",params);
+  },
 }
\ No newline at end of file

pages/flyingHandService/index.page.tsx

 import React, { useEffect, useState } from "react";
 import { Box } from "./styled";
 import Image from "next/image";
-import { Button, Select, Space, Pagination, Cascader, Modal } from "antd";
+import { Button, Select, Space, Pagination, Cascader, Modal , Form ,Input,Checkbox, message} from "antd";
+import type { CheckboxValueType } from 'antd/es/checkbox/Group';
 import Layout from "~/components/layout";
 import ContentBox from "~/components/contentBox";
 import api, { Flying, SkillsType, RegionResp } from "./api";
@@ -13,6 +14,7 @@ interface FilterInfoParams {
 }
 
 export default function FlyingHandService() {
+  const {Option} = Select
   const router = useRouter();
   const [list, setList] = useState([
     "https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/925072db-5872-44dd-8b71-e408ad3adf41.jpg",
@@ -163,7 +165,12 @@ export default function FlyingHandService() {
       setSkills(res.result || []);
     });
     api.IndustryFlightSkills().then((res) => {
-      setFlightSkillsList(res.result || []);
+      const list = res.result?.map((item)=>{
+        item.label = item.skillsName
+        item.value = item.id
+        return item
+      })
+      setFlightSkillsList(list || []);
     });
   }, []);
 
@@ -185,18 +192,29 @@ export default function FlyingHandService() {
   //报名
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [loading, setLoading] = useState(false);
-  const handleOk = () => {
+  const handleOk = async (values: any) => {
+      const value = form.getFieldsValue()
     setLoading(true);
-    setTimeout(() => {
+    try{
+      const res = await api.PilotRegistrations(value)
       setLoading(false);
       setIsModalOpen(false);
-    }, 3000);
+      form.resetFields()
+      message.success('报名成功')
+    }catch(e:any){
+      message.error(e.message)
+    }
   };
 
   const handleCancel = () => {
     setIsModalOpen(false);
   };
 
+  const [form] = Form.useForm();
+  const onChangeCheck = (checkedValues: CheckboxValueType[]) => {
+    console.log('checked = ', checkedValues);
+  };
+
   return (
     <Layout>
       <Box>
@@ -272,7 +290,7 @@ export default function FlyingHandService() {
           getContainer={false}
           footer={[
             <Button
-              style={{ width: "100%" }}
+              style={{ width: "100%" ,background: "linear-gradient(135deg, #278EFF 0%, #0052DA 100%)",height: 40 }}
               key="submit"
               type="primary"
               loading={loading}
@@ -282,9 +300,79 @@ export default function FlyingHandService() {
             </Button>,
           ]}
         >
-          <p>Some contents...</p>
-          <p>Some contents...</p>
-          <p>Some contents...</p>
+          <Form
+        form={form}
+        layout="vertical"
+        name="application"
+        initialValues={{ modifier: 'public' }}
+      >
+      <div style={{display:"flex",justifyContent:"space-between"}}>
+        <Form.Item style={{flex:1,marginRight:16}}
+            name="name"
+            rules={[{ required: true, message: 'Please input the title of collection!' }]}
+          >
+            <Input placeholder="姓名" />
+          </Form.Item>
+          <Form.Item style={{flex:1}} name="telephone">
+            <Input  placeholder="手机号" />
+          </Form.Item>
+      </div>
+       <Form.Item
+        name="city"
+        rules={[{ required: true, message: 'Please select gender!' }]}
+      >
+        <Cascader
+                allowClear
+                placeholder="地域"
+                className="selectItem"
+                size="large"
+                fieldNames={{
+                  label: "name",
+                  value: "id",
+                  children: "childInfo",
+                }}
+                options={secondDistrictInfo}
+                changeOnSelect
+              />
+      </Form.Item>
+       
+       <Form.Item
+        name="drivingLicense"
+        rules={[{ required: true, message: 'Please select gender!' }]}
+      >
+        <Select placeholder="是否有驾照">
+        <Option value="0">是</Option>
+          <Option value="1">否</Option>
+        </Select>
+      </Form.Item>
+      <Form.Item
+        name="uavLicenseLevelOne"
+        rules={[{ required: true, message: 'Please select gender!' }]}
+      >
+            <Cascader
+                allowClear
+                placeholder="是否有无人机执照"
+                className="selectItem"
+                size="large"
+                fieldNames={{
+                  label: "licenseType",
+                  value: "id",
+                  children: "childLicenses",
+                }}
+                options={skills}
+                changeOnSelect
+              />
+      </Form.Item>
+        <Form.Item name="industryAppAuth" label="行业应用认证（多选）" className="collection-create-form_last-form-item">
+        <Checkbox.Group
+          options={flightSkillsList}
+          onChange={onChangeCheck}
+        />
+        </Form.Item>
+        <Form.Item name="remark">
+            <Input  placeholder="备注" />
+          </Form.Item>
+         </Form>
         </Modal>
 
         <ContentBox

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);
   };
@@ -156,37 +154,49 @@ export default function WaterfallFlowBody() {
       
       const resValuelist1 = res1
         .map((item, index) => {
+          if (item.code === "200") {
             return item.result?.map((it) => {
               it.type = eqApiTypeList[index];
               return it;
             });
+          }
+          return {}
         })
         .flat();
+        
       const resValuelist2 = res2
         .map((item, index) => {
+          if (item.code === "200") {
             return item.result?.map((it) => {
               it.type = mallApiTypeList[index];
               return it;
             });
+          }
+          return {}
         })
         .flat();
       const resValuelist3 = res3
         .map((item, index) => {
+          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) => {
+          if (item.code === "200") {
             return item.result?.map((it) => {
               it.type = jobApiTypeList[index];
-            console.log(it);
               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;