From 5aa35dae07256c48a003dc464cd70969d0f70ff3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 18 Jul 2025 16:24:21 +0800
Subject: [PATCH] Merge branch 'test' into dev
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index dce80ad..f057127 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -78,7 +78,7 @@
class="ztzf-pagination"
popper-class="custom-pagination-dropdown"
background
- :page-sizes="[10, 20, 30, 40]"
+ :page-sizes="[10, 20, 30, 40,50,100]"
:size="size"
v-model:current-page="jobListParams.current"
v-model:page-size="jobListParams.size"
@@ -108,7 +108,7 @@
import SearchBox from '../SearchBox.vue'
import AddTask from './AddTask.vue'
// import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue'
-import { jobList, cancelJobs, taskReturnLines } from '@/api/job/task'
+import { jobList, cancelJobs, taskReturnLines, returnHomeCluster } from '@/api/job/task'
import { ElMessage } from 'element-plus'
import DeviceJobDetails from '../DeviceJobDetails.vue'
import CancelTaskDialog from '../CancelTaskDialog.vue'
@@ -215,7 +215,12 @@
}
// 返航
const turnBack = row => {
- taskReturnLines(row.device_sns).then(res => {
+ if (row.returnStatus === '待机') return
+
+ if (row.returnStatus === '自动返航') return ElMessage.success('无人机返航中')
+
+ if (row.returnStatus === '自动降落') return ElMessage.success('无人机降落中')
+ returnHomeCluster(row.device_sns).then(res => {
if (res.data.code !== 0) return
ElMessage.success('返航操作成功')
getJobList()
@@ -233,7 +238,7 @@
flex: 1;
margin: 0 10px 10px 10px;
background-color: #ffffff;
- padding: 20px;
+ padding: 10px 20px;
border-radius: 5px;
display: flex;
flex-direction: column;
--
Gitblit v1.9.3