Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-04 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a

 applications/drone-command/src/components/map-container/device-map-container.vue

@@ -49,11 +49,10 @@
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import { buildEllipsePositions } from '@/utils/cesium/shapeTools'
import { AREA_TYPE_STYLE_MAP, BUFFER_LEVEL_STYLES, DEFAULT_AREA_STYLE } from '@ztzf/constants'
import { fwAreaDivideListApi } from '@/views/areaManage/partition/partitionApi'

import { fwDefenseSceneManageListApi } from '@/views/areaManage/sceneManage/sceneManageApi'
import { newAreaDivideList, newDefenseSceneManageList } from '@/api/dataCockpit/index'

import { cockpitAggregationApi } from '@/api/dataCockpit'
import { newCockpitAggregationApi } from '@/api/dataCockpit'
import layerControlIcon from '@/assets/images/dataCockpit/layerControl.png'
import equipmentIcon from '@/assets/images/dataCockpit/map/equipment.png'
import offlineEquipmentIcon from '@/assets/images/dataCockpit/map/offline-equipment.png'
@@ -1142,7 +1141,7 @@
const loadPartitions = async () => {
   if (!viewer) return
   try {
      const res = await fwAreaDivideListApi({
      const res = await newAreaDivideList({
         isSetSceneManage: 1,
         flyTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
      })
@@ -1295,7 +1294,7 @@

const loadAggregation = async () => {
   try {
      const res = await cockpitAggregationApi({
      const res = await newCockpitAggregationApi({
         effectiveRangeKmIsNotNull: 1
      })
      renderAggregation(res?.data?.data ?? [])
@@ -1306,7 +1305,7 @@

const loadCommandPosts = async () => {
   try {
      const res = await fwDefenseSceneManageListApi({
      const res = await newDefenseSceneManageList({
         time: dayjs().format('YYYY-MM-DD HH:mm:ss')
      })
      renderCommandPosts(res?.data?.data ?? [])