From b6fa2446e75aa8fc91169a1723cd9246d5014bfd Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 04 Feb 2026 09:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/resource/components/DrawPolygon.vue | 2 +-
applications/drone-command/src/api/job/task.js | 8 ++++++++
applications/drone-command/src/utils/cesium/useBoundary.js | 2 +-
applications/drone-command/env/.env.production | 1 -
uniapps/work-wx/README.md | 2 +-
uniapps/work-wx/package.json | 2 +-
uniapps/work-wx/src/manifest.json | 2 +-
applications/drone-command/env/.env | 10 ----------
applications/drone-command/src/api/patchManagement/index.js | 11 ++++++++++-
9 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/applications/drone-command/env/.env b/applications/drone-command/env/.env
index fc813f9..d97d213 100644
--- a/applications/drone-command/env/.env
+++ b/applications/drone-command/env/.env
@@ -1,13 +1,3 @@
-/*
- * @Author : yuan
- * @Date : 2026-01-07 14:58:30
- * @LastEditors : yuan
- * @LastEditTime : 2026-02-03 15:43:33
- * @FilePath : \applications\drone-command\env\.env
- * @Description :
- * Copyright 2026 OBKoro1, All Rights Reserved.
- * 2026-01-07 14:58:30
- */
#接口地址
VITE_APP_API=/api
diff --git a/applications/drone-command/env/.env.production b/applications/drone-command/env/.env.production
index 9e761d6..5659bad 100644
--- a/applications/drone-command/env/.env.production
+++ b/applications/drone-command/env/.env.production
@@ -1,4 +1,3 @@
-
NODE_ENV='production'
#生产环境配置
diff --git a/applications/drone-command/src/api/job/task.js b/applications/drone-command/src/api/job/task.js
index 88d3dc2..c209719 100644
--- a/applications/drone-command/src/api/job/task.js
+++ b/applications/drone-command/src/api/job/task.js
@@ -198,6 +198,14 @@
})
}
+export const getDeviceRegionCount = params => {
+ return request({
+ url: '/drone-device-core/manage/api/v1/devices/getDeviceRegionCount',
+ method: 'get',
+ params,
+ })
+}
+
// 获取区域全部
export const getRegionTreeAll = params => {
return request({
diff --git a/applications/drone-command/src/api/patchManagement/index.js b/applications/drone-command/src/api/patchManagement/index.js
index 5b999f1..8de4525 100644
--- a/applications/drone-command/src/api/patchManagement/index.js
+++ b/applications/drone-command/src/api/patchManagement/index.js
@@ -111,4 +111,13 @@
method: 'get',
params,
})
-}
\ No newline at end of file
+}
+
+// 更新图斑数据
+export const sdfwUpdate = params => {
+ return request({
+ url: `/drone-device-core/patches/api/v1/Patches/sdfwUpdate`,
+ method: 'put',
+ data: params,
+ })
+}
diff --git a/applications/drone-command/src/utils/cesium/useBoundary.js b/applications/drone-command/src/utils/cesium/useBoundary.js
index 053ddd6..abddf39 100644
--- a/applications/drone-command/src/utils/cesium/useBoundary.js
+++ b/applications/drone-command/src/utils/cesium/useBoundary.js
@@ -4,7 +4,7 @@
import * as Cesium from 'cesium'
import { PolyGradientMaterial } from '@/utils/cesium/Material'
import { useStore } from 'vuex'
-import { getDeviceRegion, getDeviceRegionCount } from '@/api/home/aggregation'
+import { getDeviceRegion, getDeviceRegionCount } from '@/api/job/task'
import userStore from '@/store/modules/user'
import { areaCodeToArr, getContourByCode, getDockPolyLine, getLnglatAltitude } from '@/utils/cesium/mapUtil'
import getBaseConfig from '@/buildConfig/config'
diff --git a/applications/drone-command/src/views/resource/components/DrawPolygon.vue b/applications/drone-command/src/views/resource/components/DrawPolygon.vue
index 59428dd..ee8dfe1 100644
--- a/applications/drone-command/src/views/resource/components/DrawPolygon.vue
+++ b/applications/drone-command/src/views/resource/components/DrawPolygon.vue
@@ -6,7 +6,7 @@
import * as Cesium from 'cesium';
import { ElMessage } from 'element-plus';
-import { sdfwUpdate } from '@/api/home/territory';
+import { sdfwUpdate } from '@/api/patchManagement';
let curPolygonPosition = [];
let savePolygonPosition = [];
diff --git a/uniapps/work-wx/README.md b/uniapps/work-wx/README.md
index 758c6f4..9521249 100644
--- a/uniapps/work-wx/README.md
+++ b/uniapps/work-wx/README.md
@@ -1,4 +1,4 @@
-# 掌控智飞
+# 低空经济服务
```
npm install pnpm -g
diff --git a/uniapps/work-wx/package.json b/uniapps/work-wx/package.json
index 3d14bb7..043632b 100644
--- a/uniapps/work-wx/package.json
+++ b/uniapps/work-wx/package.json
@@ -2,7 +2,7 @@
"name": "work-wx",
"type": "module",
"version": "1.5.0",
- "description": "掌控智飞",
+ "description": "低空经济服务",
"private": true,
"author": {
"name": "ztzf"
diff --git a/uniapps/work-wx/src/manifest.json b/uniapps/work-wx/src/manifest.json
index f570eb0..9cc08cd 100644
--- a/uniapps/work-wx/src/manifest.json
+++ b/uniapps/work-wx/src/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "掌控智飞",
+ "name" : "低空经济服务",
"appid" : "__UNI__0981D7F",
"description" : "",
"versionName" : "1.0.0",
--
Gitblit v1.9.3