From 50d545d920ba21e64e3f48b2c6256aaf5ada9107 Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Wed, 25 Jun 2025 08:39:57 +0800
Subject: [PATCH] merge

---
 public/map/mark.png                           | Bin 0 -> 653 bytes
 src/api/sys/workplan.ts                       |  11 +
 src/components/CloudQueryContent/index.vue    |   2 +-
 src/components/MapboxMaps/MapComponent.vue    |   5 +-
 .../default/header/components/CloudQuery.vue  |   2 +-
 .../workplan/components/airLineList.vue       |  26 ++-
 .../workplan/components/airPoint.vue          |  83 +++++--
 .../workplan/components/airPolygon.vue        | 211 ++++++++++++++----
 .../workplan/components/map.vue               | 108 +++++++--
 .../demo/workmanagement/workplan/index.vue    |  19 +-
 .../workplan/waylineConfig/index.ts           |  27 +++
 .../workplan/waylineConfig/wayline.json       |  66 +++---
 12 files changed, 430 insertions(+), 130 deletions(-)
 create mode 100644 public/map/mark.png

diff --git a/public/map/mark.png b/public/map/mark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0427997816e98565fab7a9da0765a144c1790e1
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006)Nkl<ZcmeE~
zfl<Oh5Jmq{33h@F2ptHOh?RgHfDM3^5F2s5Pk;dplfQSDj5FqDR^#P%_rKju7#yMG
zn%NvvTSePNJ4CaS@p^|Rd%?^m(Z;3HmI0u!sU2WgMPc)3lW5l>c|AeE5{4ZNhX^r`
z#(m_hJOEac!YK^!i6Jau*fpfDbO2VJ0=&X+wT?j$#=6~?|4IXx+U__Ga+;Qd>|i2<
zAD~V&X_4f=oe1Fr;LJ0TU!LZ{*v@Cd2T;$vCMNZifv;Nmg`fk}qmwGj<2S|^o>d1O
zfbCVI=ALup(g0>Aw=`G##b3;+0XSNE5s-T!=F|WJ%D*<zvc#MkK;EZqi_*KdrLp}t
z0M*?(b$3I`sdk_{nVFGQ0I3?8T7J4qIsYzzVGm(x00D18tg=T&_)r3B0Gq&SNG(;8
z3TG<RInlN>07fya(bqD_xpaW{@Cu-hE>x&<L0LKgqd6+W<4G2<@c8)vSQ*0-T`k5I
zXa6k02S6`E0P>7NUwhB!oWuG7=(!CGuv)w>VT`p6k13(j0GNrL2w>8j2fG4eFcxDb
zSULccabCCK;na<aTe9(Cr7vU1PQMT40i5Hpf)vAQavXrB4?aFO>tn^YAz%~MD6q-^
zoQ1HOH4I0K5cM5G@wuV#Oubv=XIX%2Ne16YA#HUBkfz7&H2}CvR@h<aK;eSA!wns9
zm#nbE(1F4Qb%z@|&{(n_H-`@NSnS4BLkAkm!p#vr`KxQ|vIG1=!|w!1|7}pgzX1RM
n|Np{Cl0g6f00v1!K~w_(uTq){rzsO{00000NkvXXu0mjfxxyhT

literal 0
HcmV?d00001

diff --git a/src/api/sys/workplan.ts b/src/api/sys/workplan.ts
index f50fa4c..8efac8b 100644
--- a/src/api/sys/workplan.ts
+++ b/src/api/sys/workplan.ts
@@ -7,6 +7,8 @@ enum Api{
     AddTask = '/api/Manage/AddTask',
     EditTask = '/api/Manage/EditTask',
     DeleteTask = '/api/Manage/DeleteTask',
+    ExecuteFlyTask = '/api/Manage/ExecuteFlyTask',
+    PendingFlyTask = '/api/Manage/PendingFlyTask',
 
     // 无人机
     GetUavPageList = '/api/Manage/GetUavPageList',
@@ -37,6 +39,15 @@ export function deleteTask(params){
     return defHttp.post({ url: Api.DeleteTask+"?id="+params.id, params });
 }
 
+export function executeFlyTask(params){
+  return defHttp.post({ url: Api.ExecuteFlyTask+"?taskId="+params.id, params });
+}
+
+export function pendingFlyTask(params){
+  return defHttp.post({ url: Api.PendingFlyTask+"?taskId="+params.id, params });
+}
+
+
 // 无人机
 export function getUavPageList(params) {
   return defHttp.get({ url: Api.GetUavPageList, params });
diff --git a/src/components/CloudQueryContent/index.vue b/src/components/CloudQueryContent/index.vue
index 09f9502..dd00f31 100644
--- a/src/components/CloudQueryContent/index.vue
+++ b/src/components/CloudQueryContent/index.vue
@@ -23,7 +23,7 @@
   import { ref, onMounted, defineEmits, defineProps } from 'vue';
   import Icon from '@/components/Icon/Icon.vue';
   import CloudQueryModal from './CloudQueryModal/index.vue';
-  import { useCloudQueryStore } from '@/store/modules/cloudquery';
+  // import { useCloudQueryStore } from '@/store/modules/cloudquery';
   import { LoadCloudQueryById } from '@/api/demo/cloudQuery';
 
   const useCloudQuery = useCloudQueryStore();
diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue
index 9a935de..663d836 100644
--- a/src/components/MapboxMaps/MapComponent.vue
+++ b/src/components/MapboxMaps/MapComponent.vue
@@ -335,7 +335,10 @@
   import { getAppEnvConfig } from '@/utils/env';
 
   import { message, Modal } from 'ant-design-vue';
-  import { useCloudQueryStore } from '@/store/modules/cloudquery';
+  // import { useCloudQueryStore } from '@/store/modules/cloudquery';
+  const useCloudQueryStore = function(){
+    return {};
+  }
   // 地类分割
   import { splitAndCalTubanArea,splitTubanBackYuan } from '@/api/sys/layerManagement';
   import { CalTubanAreaModel } from '@/api/sys/model/layerModel';
diff --git a/src/layouts/default/header/components/CloudQuery.vue b/src/layouts/default/header/components/CloudQuery.vue
index 4f5ad57..b332a1a 100644
--- a/src/layouts/default/header/components/CloudQuery.vue
+++ b/src/layouts/default/header/components/CloudQuery.vue
@@ -46,7 +46,7 @@
   import { Tooltip } from 'ant-design-vue';
   import { useI18n } from '@/hooks/web/useI18n';
   import { CloudOutlined } from '@ant-design/icons-vue';
-  import { useCloudQueryStore } from '@/store/modules/cloudquery';
+  // import { useCloudQueryStore } from '@/store/modules/cloudquery';
   import { getAppEnvConfig } from '@/utils/env';
   import { useMessage } from '@/hooks/web/useMessage';
   import axios from 'axios';
diff --git a/src/views/demo/workmanagement/workplan/components/airLineList.vue b/src/views/demo/workmanagement/workplan/components/airLineList.vue
index a611fd7..90b4ac6 100644
--- a/src/views/demo/workmanagement/workplan/components/airLineList.vue
+++ b/src/views/demo/workmanagement/workplan/components/airLineList.vue
@@ -78,7 +78,7 @@
                     </div>
                 </div>
                 <div class="ari-line" v-for="(item,index) in ariLineList" :key="index" 
-                        @click="checkAriLine(item)"
+                       
                     >
                     <div class="title">
                         <div style="flex:1;">
@@ -91,12 +91,15 @@
                                 <MoreOutlined />
                                 <template #overlay>
                                     <a-menu>
-                                    <a-menu-item>
-                                        <a href="javascript:;">编辑</a>
-                                    </a-menu-item>
-                                    <a-menu-item @click="deletePlan(item.id)">
-                                        <a href="javascript:;">删除</a>
-                                    </a-menu-item>
+                                        <a-menu-item  @click="checkAriLine(item)" >
+                                            <a href="javascript:;">选择</a>
+                                        </a-menu-item>
+                                        <a-menu-item>
+                                            <a href="javascript:;">编辑</a>
+                                        </a-menu-item>
+                                        <a-menu-item @click="deletePlan(item.id)">
+                                            <a href="javascript:;">删除</a>
+                                        </a-menu-item>
                                     </a-menu>
                                 </template>
                             </a-dropdown>
@@ -106,7 +109,12 @@
                         <img src="/public/iocn/uav.png" alt="">
                         {{item.uavId}}
                     </div>
-                    <div class="time">更新时间：{{item.createTime}}</div>
+                    <div class="time">
+                        <div>
+                            更新时间：{{item.createTime}}
+                        </div>
+                    </div>
+                    
                 </div> 
             </div>
         </div>
@@ -446,6 +454,8 @@
 .ari-line .time{
     font-size: 12px;
     color:#ccc;
+    display:flex;
+    line-height:24px;
 }
 
 .import-airline{
diff --git a/src/views/demo/workmanagement/workplan/components/airPoint.vue b/src/views/demo/workmanagement/workplan/components/airPoint.vue
index 05581b8..955c9b2 100644
--- a/src/views/demo/workmanagement/workplan/components/airPoint.vue
+++ b/src/views/demo/workmanagement/workplan/components/airPoint.vue
@@ -1,17 +1,17 @@
 <template>
     <div class="containner">
         <div class="title">
-            <LeftOutlined />
+            <LeftOutlined @click="backPage" />
             <div>航点航线</div>
             <SaveOutlined @click="saveAirLine"/>
 
-            <a-button type="primary" @click="areaOptionsShow = !areaOptionsShow">
+            <a-button type="primary" size="middle" @click="areaOptionsShow = !areaOptionsShow">
                 航线设置
-                <DownOutlined />
+                <ControlOutlined />
             </a-button>
 
             <div style="flex:1;">
-                <a-input  size="middle" placeholder="航线名称" />
+                <a-input  size="middle" v-model:value="submitForm.airLineName" placeholder="航线名称" />
             </div>
             
         </div>
@@ -200,19 +200,20 @@
             
            
         </div>
+
     </div>
 </template>
 <script lang="ts" setup>
 import {ref,defineEmits,defineProps} from 'vue'
-import { SaveOutlined,LeftOutlined,AppstoreOutlined,DownOutlined} from '@ant-design/icons-vue';
+import { SaveOutlined,LeftOutlined,AppstoreOutlined,DownOutlined,ControlOutlined} from '@ant-design/icons-vue';
 
 import { XMLParser, XMLBuilder } from 'fast-xml-parser';
 
-import {uploadXmlFile} from '@/api/sys/workplan';
-
+import {uploadXmlFile,addAirLine} from '@/api/sys/workplan';
+import { Modal, message } from 'ant-design-vue';
 import {missionConfigOptions,folderConfigOptions}  from '../waylineConfig/index.ts';
 
-const emits = defineEmits(["setFlyPoint","checkPoint"])
+const emits = defineEmits(["setFlyPoint","checkPoint","exitDraw"])
 
 const props = defineProps(["airPoints","airInfo","polygonAirForm"])
 
@@ -350,11 +351,11 @@ const handlerPointInfo = ()=>{
             "executeHeight": item.alt,
             "waypointSpeed": 10,
             "waypointHeadingParam": {
-                "waypointHeadingMode": "followWayline",
-                "waypointHeadingAngle": 0,
-                "waypointPoiPoint": "0.000000,0.000000,0.000000",
+                "waypointHeadingMode": "followWayline",             // 飞行器偏航角模式 ：
+                "waypointHeadingAngle": 0,                          // 飞行器偏航角 [-180, 180] 当且仅当“wpml:waypointHeadingMode”为“smoothTransition”时必需
+                "waypointPoiPoint": "0.000000,0.000000,0.000000",   // 兴趣点    仅当wpml:waypointHeadingMode为towardPOI时必需
                 "waypointHeadingAngleEnable": 0,
-                "waypointHeadingPathMode": "followBadArc",
+                "waypointHeadingPathMode": "followBadArc",          // 飞行器偏航角转动方向
                 "waypointHeadingPoiIndex": 0
             },
             "waypointTurnParam": {
@@ -407,9 +408,9 @@ const handlerPointInfo = ()=>{
                     }
                 ]
             },
-            "waypointGimbalHeadingParam": {
-                "waypointGimbalPitchAngle": 0,
-                "waypointGimbalYawAngle": 0
+            "waypointGimbalHeadingParam": {              // 云台参数
+                "waypointGimbalPitchAngle": 0,           // 云台 垂直俯仰角参数 [-90, -30]
+                "waypointGimbalYawAngle": 0              // 云台 水平偏航角度
             },
             "isRisky": 0,
             "waypointWorkType": 0
@@ -430,6 +431,11 @@ const waylinesJson = ref(
     }
 )
 
+// 退出绘制
+const backPage = ()=>{
+    emits("exitDraw")
+}
+
 // 保存航线
 const saveAirLine = ()=>{
 
@@ -449,9 +455,8 @@ const saveAirLine = ()=>{
 
     console.log("xmlString3",xmlString3);
 
-    alert(xmlString3);
-    return null;
 
+return null;
     handlerCreateFile(xmlString3);
 }
 
@@ -475,12 +480,31 @@ const handlerPrefixWpml = (obj) => {
             }
         }
         obj[key] = newAttrs;
-
     }
   }
   return obj;
 }
 
+
+// 保存表单
+const submitForm = ref({
+    "id": "",
+    "airLineName": null, 
+    "airLineType": "waypoint",
+    "uavId": "",
+    "flyToFirstPointMode": "", 
+    "safeTakeoffAltitude": 0, 
+    "safeTakeoffSpeed": 0,  
+    "globalRouteSpeed": 0, 
+    "taskCompletionAction": "", 
+    "outOfControlOption": "",
+    "typeOfOutOfControlAction": "",
+    "globalWayPointType": "",
+    "ptzControlMode": "",
+    "aircraftYawAngleMode": "",
+    "wpml": ""
+})
+
 // 生成xml文件
 const handlerCreateFile =async (content)=>{
 
@@ -489,16 +513,29 @@ const handlerCreateFile =async (content)=>{
     // 创建FormData对象用于上传
     const formData = new FormData();
 
-    console.log("blob",blob);
-
     formData.append('xmlFile', blob);
     
 
     let res = await uploadXmlFile(formData);
 
-      if(res){
+    if(res){
 
-      }
+        submitForm.value.wpml = res.path;
+
+        let addAirLineRes =await addAirLine(submitForm.value);
+
+        if(addAirLineRes){
+            
+            message.success("操作成功！");
+            backPage();
+        }else{
+            message.error("操作失败！");
+        }
+
+    }else{
+        message.error("操作失败！");
+
+    }
 
 }
 
@@ -516,7 +553,7 @@ const handlerCreateFile =async (content)=>{
     color:#ffffff;
     display:flex;
     gap:12px;
-    line-height:24px;
+    line-height:32px;
 }
 
 .area-info{
diff --git a/src/views/demo/workmanagement/workplan/components/airPolygon.vue b/src/views/demo/workmanagement/workplan/components/airPolygon.vue
index a7c2bbf..606cead 100644
--- a/src/views/demo/workmanagement/workplan/components/airPolygon.vue
+++ b/src/views/demo/workmanagement/workplan/components/airPolygon.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="containner">
         <div class="title">
-            <LeftOutlined />
+            <LeftOutlined @click="backPage" />
             <div>面状航线</div>
             <SaveOutlined/>
 
@@ -32,7 +32,8 @@
             
         </div>
 
-        <div class="area-options">
+        <div class="area-options" >
+
             <div class="item">
                 <div class="label">参考起飞点</div>
                 <div class="content">
@@ -42,76 +43,120 @@
                     </a-button>
                 </div>
             </div>
+
+            
+
             <div class="item flex-column">
-                <div class="label">选择镜头</div>
+                <div class="label">飞向首航点模式</div>
                 <div class="content">
-                    <a-radio-group  button-style="solid" v-model:value="props.polygonAirForm.lensMode">
-                        <a-radio-button :value="1">红外</a-radio-button>
-                        <a-radio-button :value="2">可见光</a-radio-button>
-                      </a-radio-group>
+                    <div class="radio-box">
+                        <div v-for="(item,index) in missionConfigOptions.flyToWaylineMode" :key="index"
+                            :class=" missionConfig.flyToWaylineMode == item.value ? 'radio-item-active':'radio-item'" 
+                            @click="missionConfig.flyToWaylineMode = item.value"
+                            >
+                            {{item.label}}
+                        </div>
+                    </div>
+                </div>
+                <div class="description">
+                    <img src="/map/flyToWaylineMode.png" alt="">
                 </div>
             </div>
-            <div class="item flex-column">
-                <div class="label">采集方式</div>
+
+            <div class="item">
+                <div class="label">安全起飞高度</div>
                 <div class="content">
-                    <a-radio-group  button-style="solid" v-model:value="props.polygonAirForm.gatherMode">
-                        <a-radio-button :value="1">正射采集</a-radio-button>
-                        <a-radio-button :value="2">倾斜采集</a-radio-button>
-                      </a-radio-group>
+                    <a-input style="width:100px;"  placeholder="" v-model:value="missionConfig.takeOffSecurityHeight"></a-input>
                 </div>
+                <div class="unit"> m</div>
             </div>
+
             <div class="item">
-                <div class="label">智能摆动拍摄</div>
+                <div class="label">全局航线过渡速度</div>
+                <div class="content">
+                    <a-input style="width:100px;" placeholder="" v-model:value="missionConfig.globalTransitionalSpeed"></a-input>
+                </div>
+                <div class="unit"> m/s</div>
             </div>
-            <div class="item flex-column">
-                <div class="label">航线高度模式</div>
+
+            <div class="item">
+                <div class="label">全局返航高度</div>
                 <div class="content">
-                    <a-radio-group  button-style="solid" v-model:value="props.polygonAirForm.heightMode">
-                        <a-radio-button :value="1">海拔高度</a-radio-button>
-                        <a-radio-button :value="2">相对起点高度</a-radio-button>
-                        <a-radio-button :value="3">相对地形高度</a-radio-button>
-                      </a-radio-group>
-                    
-                      <div style="margin-top:12px;">
-                        <a-input-number v-model:value="props.polygonAirForm.height" :min="1" :max="100000" />
-                      </div>
+                    <a-input style="width:100px;" placeholder="" v-model:value="missionConfig.droneInfo.droneEnumValue"></a-input>
                 </div>
+                <div class="unit"> m</div>
+            </div>
 
-                
+
+            <div class="item flex-column">
+                <div class="label">航线结束动作</div>
+                <div class="content">
+                    <div class="radio-box">
+                        <div v-for="(item,index) in missionConfigOptions.finishAction" :key="index"
+                            :class=" missionConfig.finishAction == item.value ? 'radio-item-active':'radio-item'" 
+                            @click="missionConfig.finishAction = item.value"
+                            >
+                            {{item.label}}
+                        </div>
+                    </div>
+                </div>
             </div>
-            <div class="item">
-                <div class="label">全局航线速度</div>
+
+            <div class="item flex-column">
+                <div class="label">失控是否继续执行航线</div>
                 <div class="content">
-                    <a-input-number style="width:160px" v-model:value="props.polygonAirForm.speed" :min="1" :max="20" />
+                    <div class="radio-box">
+                        <div v-for="(item,index) in missionConfigOptions.exitOnRCLost" :key="index"
+                            :class=" missionConfig.exitOnRCLost == item.value ? 'radio-item-active':'radio-item'" 
+                            @click="missionConfig.exitOnRCLost = item.value"
+                            >
+                            {{item.label}}
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="item">
-                <div class="label"> 主航线角度</div>
+
+            <div class="item flex-column" v-if="missionConfig.exitOnRCLost == 'executeLostAction'">
+                <div class="label">失控动作类型</div>
                 <div class="content">
-                    <a-input-number width="160px" v-model:value="props.polygonAirForm.angle" :min="0" :max="180" />
+                    <div class="radio-box">
+                        <div v-for="(item,index) in missionConfigOptions.executeRCLostAction" :key="index"
+                            :class=" missionConfig.executeRCLostAction == item.value ? 'radio-item-active':'radio-item'" 
+                            @click="missionConfig.executeRCLostAction = item.value"
+                            >
+                            {{item.label}}
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="item">
-                <div class="label"> 高程优化</div>
+
+            <div class="item flex-column">
+                <div class="label">高度模式</div>
+                <div class="content">
+                    <div class="radio-box">
+                        <div v-for="(item,index) in folderConfigOptions.executeHeightMode" :key="index"
+                            :class=" folder.executeHeightMode == item.value ? 'radio-item-active':'radio-item'" 
+                            @click="folder.executeHeightMode = item.value"
+                            >
+                            {{item.label}}
+                        </div>
+                    </div>
+                </div>
+                <div class="description">
+                    <img src="/map/executeHeightMode.png" alt="">
+                </div>
             </div>
+            
+
             <div class="item">
-                <div class="label"> 完成动作</div>
-                   
+                <div class="label">全局航线飞行速度</div>
                 <div class="content">
-
-                    <a-select
-                        ref="select"
-                        style="width:160px;"
-                        v-model:value="props.polygonAirForm.complete"
-                        >
-                        <a-select-option :value="1">自动返航</a-select-option>
-                        <a-select-option :value="2">返回航线起始点悬停</a-select-option>
-                        <a-select-option :value="3">退出航线模式</a-select-option>
-                        <a-select-option :value="4">原地降落</a-select-option>
-                    </a-select>
+                    <a-input style="width:100px;" placeholder="" v-model:value="folder.autoFlightSpeed"></a-input>
                 </div>
-                    
+                <div class="unit"> m/s</div>
             </div>
+
+            
             
            
         </div>
@@ -120,7 +165,9 @@
 <script lang="ts" setup>
 import {ref,defineEmits,defineProps} from 'vue'
 import { SaveOutlined,LeftOutlined } from '@ant-design/icons-vue';
-const emits = defineEmits(["setFlyPoint"])
+import {missionConfigOptions,folderConfigOptions}  from '../waylineConfig/index.ts';
+
+const emits = defineEmits(["setFlyPoint","exitDraw"])
 
 const props = defineProps(["airInfo","polygonAirForm"])
 
@@ -135,6 +182,46 @@ const setFlyPoint = ()=>{
     emits("setFlyPoint");
 }
 
+// 航线基本信息
+const missionConfig = ref(
+    {
+        "flyToWaylineMode": "safely",
+        "finishAction": "goHome",
+        "exitOnRCLost": "executeLostAction",
+        "executeRCLostAction": "goBack",
+        "takeOffSecurityHeight": 20,
+        "globalTransitionalSpeed": 15,
+        "globalRTHHeight": 100,
+        "droneInfo": {
+            "droneEnumValue": 100,
+            "droneSubEnumValue": 1
+        },
+        "waylineAvoidLimitAreaMode": 0,
+        "payloadInfo": {
+            "payloadEnumValue": 99,
+            "payloadSubEnumValue": 2,
+            "payloadPositionIndex": 0
+        }
+    }
+)
+
+// 航点基本信息
+const folder = ref({
+    "templateId": 0,
+    "executeHeightMode": "WGS84",
+    "waylineId": 0,
+    "distance": 410.047576904297,
+    "duration": 80.3239784240723,
+    "autoFlightSpeed": 10,
+    "Placemark": []
+})
+
+
+// 退出绘制
+const backPage = ()=>{
+    emits("exitDraw")
+}
+
 </script>
 <style scoped>
 .container{
@@ -195,6 +282,32 @@ const setFlyPoint = ()=>{
     gap:10px;
 }
 
+
+.radio-box{
+    width:100%;
+    display: flex;
+    overflow: hidden;
+    border:0.5px solid #3B4154 ;
+    font-size:12px;
+}
+.radio-box .radio-item{
+    flex:1;
+    color:#8A92A6 ;
+    text-align: center;
+    background:#222738 ;
+    cursor:pointer;
+
+}
+
+.radio-box .radio-item-active{
+    flex:1;
+    color:#fff;
+    text-align: center;
+    background:#3A57E8 ;
+    cursor:pointer;
+}
+
+
 ::v-deep .ant-radio-group {
     display: block;
     width: 100%;
diff --git a/src/views/demo/workmanagement/workplan/components/map.vue b/src/views/demo/workmanagement/workplan/components/map.vue
index a9f626d..d50fbe9 100644
--- a/src/views/demo/workmanagement/workplan/components/map.vue
+++ b/src/views/demo/workmanagement/workplan/components/map.vue
@@ -3,12 +3,12 @@
 
          <!-- 航点航线 -->
         <div v-if="props.airRoute.airLineType == '航点航线'" class="air-container">
-            <airPoint :airPoints="airPoints" @setFlyPoint="setFlyPoint" :airInfo="lineInfo" :polygonAirForm="polygonAirForm" @checkPoint="checkPoint"></airPoint>
+            <airPoint :airPoints="airPoints" @setFlyPoint="setFlyPoint" @exitDraw="exitDraw" :airInfo="lineInfo" :polygonAirForm="polygonAirForm" @checkPoint="checkPoint"></airPoint>
         </div>
 
         <!-- 航面航线 -->
         <div v-if="props.airRoute.airLineType == '面状航线'" class="airpolygon-container">
-            <airPolygon @setFlyPoint="setFlyPoint" :airInfo="airInfo" :polygonAirForm="polygonAirForm"></airPolygon>
+            <airPolygon @setFlyPoint="setFlyPoint" :airInfo="airInfo" :polygonAirForm="polygonAirForm" @exitDraw="exitDraw"></airPolygon>
         </div>
 
         <!-- 航点航线配置 -->
@@ -19,7 +19,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-import {ref,onMounted,defineProps,watch} from 'vue'
+import {ref,onMounted,defineProps,watch,defineEmits} from 'vue'
 import { message } from 'ant-design-vue';
 import { GeojsonToWkt } from '@/components/MapboxMaps/src/WktGeojsonTransform';
 import {buildUUID} from '@/utils/uuid'
@@ -32,7 +32,7 @@ import * as turf from '@turf/turf'
 import airPolygon from './airPolygon.vue'
 import airPointConfig from './airPointConfig.vue'
 
-const props = defineProps(["airRoute"]);
+const props = defineProps(["airRoute","flyToTherePosition"]);
 
 watch(
     ()=> props.airRoute,
@@ -41,6 +41,8 @@ watch(
     }
 )
 
+const emits = defineEmits(["exitDraw","flyToThere"])
+
 
 
 
@@ -74,6 +76,8 @@ const checkPoint = (e)=>{
 let map: mars3d.Map; // 地图对象
 let graphicLayer:mars3d.layer.GraphicLayer;
 
+let uavGraphicLayer:mars3d.layer.GraphicLayer;
+
 // 面航线图层
 let polygonGraphicLayer:mars3d.layer.GraphicLayer;
 
@@ -81,6 +85,19 @@ let polygonLineGraphicLayer:mars3d.layer.GeoJsonLayer;
 
 let graphic = null;
 
+
+const exitDraw = () => {
+    // 清空数据
+    graphicLayer ? graphicLayer.clear() : null;
+    polygonGraphicLayer ? polygonGraphicLayer.clear() : null;
+    polygonLineGraphicLayer ? polygonLineGraphicLayer.clear() : null;
+    airPoints.value = [];
+
+    props.airRoute.airLineType = null;
+    airPointConfigShow.value = false;
+    emits("exitDraw");
+}
+
 // 航点航线信息
 const lineInfo = ref({
     count:0,
@@ -346,7 +363,7 @@ const initMap = ()=>{
 
         graphicLayer.bindContextMenu([
             {
-                text: "删除航点",
+                text: "删除",
                 icon: "fa fa-camera-retro", // 支持 font-class 的字体方式图标
                 callback: (e) => {
                     deleteAirPoint(e);
@@ -375,6 +392,14 @@ const initMap = ()=>{
 // 绑定地图右键菜单
 const handlerBindMapMenus = ()=>{
     const mapContextmenuItems = [
+        {
+            text: "飞行到此处",
+            icon: "fa fa-camera-retro", // 支持 font-class 的字体方式图标
+            callback: (e) => {
+
+                flyToThere(e);
+            }
+        },
         {
             text: "添加航点",
             icon: "fa fa-camera-retro", // 支持 font-class 的字体方式图标
@@ -443,8 +468,8 @@ const handlerDrawPoint = (e) => {
         style: {
             angle1: 30,   // 椎体夹角1
             angle2: 30,   // 椎体夹角2
-            length: 50,  // 椎体长度
-            rayEllipsoid: true,
+            length: 10,   // 椎体长度
+            rayEllipsoid: false,
             color: "rgba(0,255,255,0.3)",
             outline: true,
             topShow: true,
@@ -452,12 +477,9 @@ const handlerDrawPoint = (e) => {
             flat: true,
             cameraHpr: true,
             heading: 0,
-            pitch: 180,
-            roll: 0,   // 
-            clippingPlanes: [{
-                distance: 0, // 设置裁剪平面在地表（0高度）
-                normal: new Cesium.Cartesian3(0, 0, -1) // 法向量向下（隐藏地表以下部分）
-            }]
+            pitch: 90,                   // 俯仰角 0 - 360度
+            roll: 0, 
+           
         }
     })
     graphicLayer.addGraphic(rectSensor)
@@ -901,6 +923,66 @@ const deleteAirPoint = (e)=>{
     // 更新航线
     handlerDrawLine()
 
+
+
+}
+
+// 飞行到此处
+const flyToThere = (e) => {
+
+    if(!uavGraphicLayer){
+        uavGraphicLayer = new mars3d.layer.GraphicLayer({
+            isAutoEditing: true // 是否自动激活编辑
+        });
+        map.addLayer(uavGraphicLayer);
+
+        uavGraphicLayer.bindContextMenu([
+
+        ])
+    }
+
+    let position = mars3d.LngLatPoint.fromCartesian(e.position);
+
+    emits("flyToThere",position)
+
+    let mark = graphicLayer.getGraphicById("flytothere");
+
+    if(mark){
+        graphicLayer.removeGraphic(mark);
+    }
+
+    // 航点
+    const graphic = new mars3d.graphic.BillboardEntity({
+        id:"flytothere",
+        name: "标点",
+        position: [position._lng,position._lat,position._alt],
+        style: {
+            image: "/map/start-point.png",
+            scale: 0.5,
+            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+            verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+            label: {
+                text: "标点",
+                font_size: 14,
+                color: "#ffffff",
+                outline: true,
+                outlineColor: "#000000",
+                pixelOffsetY: -40
+            }
+        },
+    })
+
+
+    const pointEdit = new mars3d.thing.MatrixMove2({
+        position: graphic.position
+    })
+    map.addThing(pointEdit)
+
+    pointEdit.on(mars3d.EventType.change, (event) => {
+        graphic.position = event.position
+    })
+
+    uavGraphicLayer.addGraphic(graphic);
 }
 </script>
 
diff --git a/src/views/demo/workmanagement/workplan/index.vue b/src/views/demo/workmanagement/workplan/index.vue
index 09ca163..b7e0c8d 100644
--- a/src/views/demo/workmanagement/workplan/index.vue
+++ b/src/views/demo/workmanagement/workplan/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <div style="width:100%;height: calc( 100vh - 80px);" >
-            <Map :airRoute="airRoute"></Map>
+            <Map :airRoute="airRoute" @exitDraw="exitDraw" @flyToThere="flyToThere"></Map>
         </div>
 
         <!-- 工作计划列表 -->
@@ -43,6 +43,15 @@ import AirPolygon from './components/airPolygon.vue';
 
 const airRoute = ref({})
 
+const flyToTherePosition = ref({
+    lng:null,
+    lat:null,
+    alt:null,
+})
+
+const flyToThere = (e)=>{
+    console.log(e);
+}
 const planListShow = ref(true);
 const workPlanFormShow = ref(false);
 const ariLineShow = ref(false);
@@ -116,4 +125,12 @@ const successCreatePlan = ()=>{
     aircraftShow.value = false;
     planListShow.value = true;
 }
+
+
+// 保存航线后退出
+const exitDraw = ()=>{
+    planListShow.value = false;
+    workPlanFormShow.value = true;
+    ariLineShow.value = true;
+}
 </script>
diff --git a/src/views/demo/workmanagement/workplan/waylineConfig/index.ts b/src/views/demo/workmanagement/workplan/waylineConfig/index.ts
index e3e779f..e9ebfdb 100644
--- a/src/views/demo/workmanagement/workplan/waylineConfig/index.ts
+++ b/src/views/demo/workmanagement/workplan/waylineConfig/index.ts
@@ -114,4 +114,31 @@ export const folderConfigOptions = {
             value:"realTimeFollowSurface"
         }
     ]
+}
+
+
+// 飞行器信息
+export const pointConfigOptions = {
+    waypointHeadingMode:[                // 飞行器偏航角模式
+        {
+            label:"沿航线方向",
+            value:"followWayline"
+        },{
+            label:"手动控制",
+            value:"manually"
+        },{
+            label:"锁定当前偏航角",
+            value:"smoothTransition"
+        },{
+            label:"自定义",
+            value:"smoothTransition",
+        },{
+            label:"朝向兴趣点",
+            value:"towardPOI",
+        }
+    ],
+    waypointHeadingPathMode:[             // 飞行器偏航角转动方向
+
+    ],
+                
 }
\ No newline at end of file
diff --git a/src/views/demo/workmanagement/workplan/waylineConfig/wayline.json b/src/views/demo/workmanagement/workplan/waylineConfig/wayline.json
index 15ae31f..9d0a11b 100644
--- a/src/views/demo/workmanagement/workplan/waylineConfig/wayline.json
+++ b/src/views/demo/workmanagement/workplan/waylineConfig/wayline.json
@@ -129,40 +129,40 @@
                             "actionTriggerType": "reachPoint"
                             },
                             "action": [
-                            {
-                                "actionId": 0,
-                                "actionActuatorFunc": "rotateYaw",
-                                "actionActuatorFuncParam": {
-                                "aircraftHeading": 0,
-                                "aircraftPathMode": "counterClockwise"
+                                {
+                                    "actionId": 0,
+                                    "actionActuatorFunc": "rotateYaw",
+                                    "actionActuatorFuncParam": {
+                                    "aircraftHeading": 0,
+                                    "aircraftPathMode": "counterClockwise"
+                                    }
+                                },
+                                {
+                                    "actionId": 1,
+                                    "actionActuatorFunc": "gimbalRotate",
+                                    "actionActuatorFuncParam": {
+                                    "gimbalHeadingYawBase": "north",
+                                    "gimbalRotateMode": "absoluteAngle",
+                                    "gimbalPitchRotateEnable": 1,
+                                    "gimbalPitchRotateAngle": 0,
+                                    "gimbalRollRotateEnable": 0,
+                                    "gimbalRollRotateAngle": 0,
+                                    "gimbalYawRotateEnable": 0,
+                                    "gimbalYawRotateAngle": 0,
+                                    "gimbalRotateTimeEnable": 0,
+                                    "gimbalRotateTime": 0,
+                                    "payloadPositionIndex": 0
+                                    }
+                                },
+                                {
+                                    "actionId": 2,
+                                    "actionActuatorFunc": "zoom",
+                                    "actionActuatorFuncParam": {
+                                    "focalLength": 24,
+                                    "isUseFocalFactor": 0,
+                                    "payloadPositionIndex": 0
+                                    }
                                 }
-                            },
-                            {
-                                "actionId": 1,
-                                "actionActuatorFunc": "gimbalRotate",
-                                "actionActuatorFuncParam": {
-                                "gimbalHeadingYawBase": "north",
-                                "gimbalRotateMode": "absoluteAngle",
-                                "gimbalPitchRotateEnable": 1,
-                                "gimbalPitchRotateAngle": 0,
-                                "gimbalRollRotateEnable": 0,
-                                "gimbalRollRotateAngle": 0,
-                                "gimbalYawRotateEnable": 0,
-                                "gimbalYawRotateAngle": 0,
-                                "gimbalRotateTimeEnable": 0,
-                                "gimbalRotateTime": 0,
-                                "payloadPositionIndex": 0
-                                }
-                            },
-                            {
-                                "actionId": 2,
-                                "actionActuatorFunc": "zoom",
-                                "actionActuatorFuncParam": {
-                                "focalLength": 24,
-                                "isUseFocalFactor": 0,
-                                "payloadPositionIndex": 0
-                                }
-                            }
                             ]
                         },
                         "waypointGimbalHeadingParam": {