diff --git a/public/map/mark.png b/public/map/mark.png new file mode 100644 index 0000000..f042799 Binary files /dev/null and b/public/map/mark.png differ 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 @@