From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/api/job/task.js | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/src/api/job/task.js b/src/api/job/task.js
index 67e1eb3..f6a28a1 100644
--- a/src/api/job/task.js
+++ b/src/api/job/task.js
@@ -1,4 +1,5 @@
import request from '@/axios'
+import { v4 as uuidv4 } from 'uuid'
// 任务总数统计
export const totalJobNum = params => {
@@ -10,26 +11,47 @@
}
// 其他任务统计
export const jobStatistics = data => {
+ let requestParams = {
+ ...data,
+ status_list: data.status
+ }
+
+ delete requestParams.status
+
return request({
url: '/drone-device-core/wayline/waylineJobInfo/jobStatistics',
method: 'post',
- data: data,
+ data: requestParams,
})
}
// 行业任务统计
export const industryJobNumPieChart = data => {
+ let requestParams = {
+ ...data,
+ status_list: data.status
+ }
+
+ delete requestParams.status
+
return request({
url: '/drone-device-core/wayline/waylineJobInfo/industryJobNumPieChart',
method: 'post',
- data: data,
+ data: requestParams,
})
}
// 时间任务统计
export const jobNumBar = data => {
+ let requestParams = {
+ ...data,
+ status_list: data.status
+ }
+
+ delete requestParams.status
+
return request({
url: '/drone-device-core/wayline/waylineJobInfo/jobNumBar',
method: 'post',
- data: data,
+ data: requestParams,
})
}
// 事件任务统计
@@ -152,6 +174,13 @@
data,
})
}
+// 任务管理-返航使用该接口，可以多个
+export const returnHomeCluster = sns => {
+ return request({
+ url: `/drone-device-core/dp/home/${sns}/drc/returnHomes`,
+ method: 'post',
+ })
+}
export const deptsByAreaCode = params => {
return request({
@@ -195,3 +224,35 @@
method: 'get',
})
}
+
+export const getSFDictionaryTree = (params) => {
+ return request({
+ url: '/blade-system/dict-biz/dictionary-tree',
+ method: 'get',
+ params: {
+ ...params,
+ },
+ });
+ };
+
+// 生成固定uuid
+const uuid = uuidv4()
+// 轮询刷新
+export const statusChangedApi = (params = {}) => {
+ return request({
+ url: '/drone-device-core/manage/api/v1/devices/statusChanged',
+ method: 'get',
+ params: {
+ uuid,
+ intervalTime: 4,
+ ...params,
+ },
+ })
+}
+export const getJobsAllFiles = data => {
+ return request({
+ url: `/blade-resource/attach/aiImagesPage?current=1&size=9999`,
+ method: 'post',
+ data: data,
+ })
+}
\ No newline at end of file
--
Gitblit v1.9.3