From 0462839304fe548e27768614dda3a625b68489aa Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 04 Feb 2026 15:11:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/api/dataCockpit/index.js |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/applications/drone-command/src/api/dataCockpit/index.js b/applications/drone-command/src/api/dataCockpit/index.js
index f08ac7f..6432650 100644
--- a/applications/drone-command/src/api/dataCockpit/index.js
+++ b/applications/drone-command/src/api/dataCockpit/index.js
@@ -2,7 +2,7 @@
  * @Author       : yuan
  * @Date         : 2026-01-09 11:14:04
  * @LastEditors  : yuan
- * @LastEditTime : 2026-01-26 09:38:16
+ * @LastEditTime : 2026-02-03 17:21:56
  * @FilePath     : \applications\drone-command\src\api\dataCockpit\index.js
  * @Description  : 
  * Copyright 2026 OBKoro1, All Rights Reserved. 
@@ -78,7 +78,17 @@
 export const cockpitAggregationApi = (params) => {
 	return request({
 		url: '/drone-fw/device/fwDevice/statisticalDeviceOut',
-		method: 'get'
+		method: 'get',
+		params
+	})
+}
+
+// 最新 --- 数据驾驶舱地图聚合
+export const newCockpitAggregationApi = (params) => {
+	return request({
+		url: '/drone-fw/cockpit/dataCockpit/statisticalDeviceOut',
+		method: 'get',
+		params
 	})
 }
 
@@ -90,3 +100,21 @@
 		params
 	})
 }
+
+// 查list --- 区域
+export const newAreaDivideList = params => {
+	return request({
+		url: `/drone-fw/cockpit/dataCockpit/areaDivideList`,
+		method: 'get',
+		params,
+	})
+}
+
+// 查list
+export const newDefenseSceneManageList = params => {
+	return request({
+		url: `/drone-fw/cockpit/dataCockpit/defenseSceneManageList`,
+		method: 'get',
+		params,
+	})
+}
\ No newline at end of file

--
Gitblit v1.9.3