merge

package.json

@@ -160,7 +160,8 @@
     "vxe-table-plugin-export-xlsx": "^3.1.0",
     "xe-utils": "^3.5.14",
     "xlsx": "^0.18.5",
-    "xml-js": "^1.6.11"
+    "xml-js": "^1.6.11",
+    "vue3-cron-plus":"^0.1.9"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.4.4",

src/views/demo/workmanagement/airlinemanagement/index.vue

@@ -39,7 +39,7 @@ const flyToTherePosition = ref({
 
 
 const flyToThere = (e)=>{
-    console.log(e);
+    
 }
 const planListShow = ref(true);
 const workPlanFormShow = ref(false);

src/views/demo/workmanagement/workplan/components/createWorkPlan.vue

@@ -88,6 +88,13 @@
                             </div>
                          
                         </a-form-item> 
+
+
+                        <a-form-item ref="accuracy" label="设置时间" name="accuracy">
+                            <a-button type="primary" @click="handlerSetTime">选择时间</a-button>
+                        </a-form-item> 
+
+                    
                     </div>
                     
 
@@ -152,19 +159,51 @@
                 <a-button style="width:100%;" type="primary" @click="onSubmit">确定</a-button>
             </div>
         </div>
+
+
+        <Modal
+            title="设置时间"
+            :open="visible"
+            @ok="handleOk"
+            @cancel="handleCancel"
+            footer=""
+            :destroyOnClose="true"
+            wrapClassName="v-code-modal"
+            :width="650"
+        >
+            <vue3CronPlus @change="changeCron"
+                @close="togglePopover(false)"
+                max-height="400px"
+                i18n="cn">
+            </vue3CronPlus>
+        </Modal>
     </div>
+
 </template>
 <script lang="ts" setup>
 import { ref, defineEmits, defineProps, watch } from "vue";
 import { PlusOutlined,LeftOutlined,DeleteOutlined,MoreOutlined } from '@ant-design/icons-vue';
 import { addTask,editTask } from "@/api/sys/workplan";
 import { Modal, message } from 'ant-design-vue';
+import {vue3CronPlus} from 'vue3-cron-plus'
+import 'vue3-cron-plus/dist/index.css' // 引入样式
+
 const formRef = ref();
 const labelCol = { span: 24 };
 const wrapperCol = { span: 24 };
 const props = defineProps(["checkedAriLine","checkedDronePort","formData"]);
 
+const visible = ref(true);
 
+const handleOk = ()=>{
+
+}
+const handlerSetTime = ()=>{
+    visible.value = true;
+}
+const handleCancel = () => {
+    visible.value = false
+}
 
 // const submitForm = ref({
 //     taskName:null,               // 任务名称
@@ -181,6 +220,9 @@ const props = defineProps(["checkedAriLine","checkedDronePort","formData"]);
 //     taskAirLineName : null,
 //     taskDronePortName : null,
 // })
+
+
+
 const submitForm = ref({
   "id": null,
   "taskName": null,
@@ -356,6 +398,14 @@ const resetForm = () => {
     emit("cancleCraete");
     formRef.value.resetFields();
 };
+
+const changeCron = ()=>{
+
+}
+
+const togglePopover = (e)=> {
+
+}
 </script>
 
 <style scoped>

src/views/demo/workmanagement/workplan/components/map.vue

@@ -1254,19 +1254,19 @@ const loadChangGuangLayer = ()=>{
 
         let position = mars3d.LngLatPoint.fromCartesian(e.position);
 
-        emits('flyToThere', position);
+
 
         let mark = graphicLayer.getGraphicById('flytothere');
 
         if (mark) {
-        graphicLayer.removeGraphic(mark);
+            graphicLayer.removeGraphic(mark);
         }
 
         // 无人机点
         const graphic = new mars3d.graphic.BillboardEntity({
         id: 'flytothere-uav',
         name: '标点',
-        position: [position._lng, position._lat, position._alt],
+        position: [position._lng, position._lat, position._alt+80],
         style: {
             image: '/map/uav-mark.png',
             scale: 0.3,
@@ -1310,7 +1310,7 @@ const loadChangGuangLayer = ()=>{
         let connectLine = new mars3d.graphic.PolylineEntity({
         id: 'flytothere-line',
         positions: [
-            [position._lng, position._lat, position._alt],
+            [position._lng, position._lat, position._alt+80],
             [position._lng, position._lat, 0],
         ],
         style: {
@@ -1322,6 +1322,10 @@ const loadChangGuangLayer = ()=>{
         uavGraphicLayer.addGraphic(graphic);
         stickGraphicLayer.addGraphic(stickGraphic);
         uavGraphicLayer.addGraphic(connectLine);
+
+        // 获取无人机的坐标并返回
+        let flyToPosition = mars3d.LngLatPoint.fromCartesian(graphic.position);
+        emits('flyToThere', flyToPosition);
     };
 
     // 移动贴地点
@@ -1402,8 +1406,6 @@ const loadChangGuangLayer = ()=>{
         const latitude = mars3d.Cesium.Math.toDegrees(cartographic.latitude);
         const height = cartographic.height; // 高度（米）
 
-        console.log(longitude, latitude, height);
-
         emits('flyToThere', { _lng: longitude, _lat: latitude, _alt: height });
 
         let line = uavGraphicLayer.getGraphicById('flytothere-line');
@@ -1594,6 +1596,7 @@ const loadChangGuangLayer = ()=>{
         graphicLayer.addGraphic(startGraphic);
         }
     };
+
     //   设置无人机轨迹
     const setUAVPosition = () => {
         let point = graphicLayer.getGraphicById('set-uav');

src/views/demo/workmanagement/workplan/index.vue

@@ -57,7 +57,7 @@ const flyToTherePosition = ref({
 
 
 const flyToThere = (e)=>{
-    console.log(e);
+    
 }
 const planListShow = ref(true);
 const workPlanFormShow = ref(false);