diff --git a/package.json b/package.json index 6272289..105ebf4 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", - "DroneCtrl": "1.0.1", + "DroneCtrl": "1.0.2", "axios": "^1.13.2", "element-plus": "^2.12.0", "gcoord": "^1.0.7", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d9adf3f..c9f9014 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ importers: specifier: ^1.0.1 version: 1.0.1 DroneCtrl: - specifier: 1.0.1 - version: 1.0.1 + specifier: 1.0.2 + version: 1.0.2 axios: specifier: ^1.13.2 version: 1.13.2 @@ -245,8 +245,8 @@ packages: '@vueuse/shared@9.13.0': resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==} - DroneCtrl@1.0.1: - resolution: {integrity: sha512-3ibzb0sXZGXAkbSTg4Zb8heTx6ASBkWaI2yAO8V+4/Y2ygULruPCzb8o3c89wWlnfQQ/AALWlNmkpVV/ezBujQ==} + DroneCtrl@1.0.2: + resolution: {integrity: sha512-EQWN1q8S4mN64gMlBQkQyJIYSBVE75YLPsYI+L/67TPypOyGWnI/kxCYMPY1hNVB8sIxJO0Z3DU3wlKxwg4Qiw==} async-validator@4.2.5: resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} @@ -770,7 +770,7 @@ snapshots: - '@vue/composition-api' - vue - DroneCtrl@1.0.1: {} + DroneCtrl@1.0.2: {} async-validator@4.2.5: {} diff --git a/src/App.vue b/src/App.vue index 1b478b0..472bcdb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -262,15 +262,16 @@ const initWebSocket = () => { // 起飞处理 const handleTakeoff = () => { // 检查是否已有围栏 - if (fences.value.length === 0) { - ElMessage.warning('请先绘制电子围栏后再起飞') - return - } + // if (fences.value.length === 0) { + // ElMessage.warning('请先绘制电子围栏后再起飞') + // return + // } - // 如果未连接,先连接 - if (!wsConnected.value) { - initWebSocket() - } + // // 如果未连接,先连接 + // if (!wsConnected.value) { + // initWebSocket() + // } + ctrl.TakeoffAndAutoExecTask({}); // 设置飞行状态 isFlying.value = true diff --git a/src/utils/request.js b/src/utils/request.js index e67a9c9..ed7957c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -98,6 +98,7 @@ function upload(url, params) { } // export let host = `${window.location.protocol}//${window.location.host}`; +// export let host = "http://192.168.43.97:5678"; export let host = "http://192.168.3.81:5678"; export const getConfig = () => { diff --git a/vite.config.js b/vite.config.js index 01fe5bd..b3001e7 100644 --- a/vite.config.js +++ b/vite.config.js @@ -5,4 +5,7 @@ import vue from '@vitejs/plugin-vue' export default defineConfig({ plugins: [vue()], base: "/web/", + optimizeDeps: { + exclude: ['DroneCtrl'] + } })