From 64f29d34ceb5ebf26f1d95d9f0b72bfea0377c1d Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 06 Feb 2026 14:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-wx/src/subPackages/deviceRegistration/add.vue | 2 +-
uniapps/work-wx/src/api/index.js | 8 ++++++++
uniapps/work-wx/src/subPackages/flightApplication/add.vue | 39 ++++++++++++++++++++++++++++-----------
3 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/uniapps/work-wx/src/api/index.js b/uniapps/work-wx/src/api/index.js
index b577013..de5a321 100644
--- a/uniapps/work-wx/src/api/index.js
+++ b/uniapps/work-wx/src/api/index.js
@@ -103,6 +103,14 @@
})
}
+// 飞行计划提交
+export const flightPlanSubmitApi = id => {
+ return request({
+ url: `/webservice/flightPlan/submit/${id}`,
+ method: 'post',
+ })
+}
+
// 选择航线
export const flightRoutePageInfoApi = data => {
return request({
diff --git a/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue b/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
index 08034e4..ad09c8a 100644
--- a/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
+++ b/uniapps/work-wx/src/subPackages/deviceRegistration/add.vue
@@ -153,7 +153,7 @@
v-model="formParams.regionText"
disabled
disabledColor="#ffffff"
- placeholder="请选择(树状结构选择行政区划)"
+ placeholder="请选择"
border="none"
></u-input>
<template #right>
diff --git a/uniapps/work-wx/src/subPackages/flightApplication/add.vue b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
index ec51e8f..e9b2d81 100644
--- a/uniapps/work-wx/src/subPackages/flightApplication/add.vue
+++ b/uniapps/work-wx/src/subPackages/flightApplication/add.vue
@@ -456,7 +456,8 @@
aircraftInfoPageInfoOfMyApi,
pilotInfoPageInfoOfMyApi,
droneFlightTaskApi,
- uploadFileApi
+ uploadFileApi,
+ flightPlanSubmitApi
} from '@/api/index'
import { ref, computed, onMounted } from 'vue'
import dayjs from 'dayjs'
@@ -771,20 +772,36 @@
const submitForm = async () => {
await formRef.value.validate()
isSubmitDisabled.value = true
- formParams.value.pilotId = formParams.value.pilotId.join(',')
- formParams.value.spacecraftId = formParams.value.spacecraftId.join(',')
+ formParams.value.pilotId = formParams.value.pilotId?.join(',') || ''
+ formParams.value.spacecraftId = formParams.value.spacecraftId?.join(',') || ''
flightPlanSaveApi(formParams.value).then(res => {
if (res.data.code === 200) {
isSubmitDisabled.value = true
- uni.showToast({
- title: '提交成功',
- icon: 'success',
- duration: 2000
- })
- // 跳转申请列表页
- uni.navigateTo({
+ // uni.showToast({
+ // title: '提交成功',
+ // icon: 'success',
+ // duration: 2000
+ // })
+ // 提交飞行计划
+ flightPlanSubmitApi(res.data.data.id).then(res => {
+ if (res.data.code === 200) {
+ uni.showToast({
+ title: '提交成功',
+ icon: 'success',
+ duration: 2000
+ })
+ // 跳转申请列表页
+ uni.navigateTo({
url: '/subPackages/flightApplication/index',
- })
+ })
+ } else {
+ uni.showToast({
+ title: res.msg || '提交失败',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
} else {
uni.showToast({
title: res.msg || '提交失败',
--
Gitblit v1.9.3