Merge remote-tracking branch 'origin/master'

张含笑

2026-01-22 fefcc01cec5a6ec86ddefb6f0a0946eda0896eb2

 applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue

@@ -116,7 +116,7 @@
                     <el-table class="command-table" ref="areaTableRef"
                        :data="areaList.filter(item => item.areaName.includes(searchName))" row-key="id"
                        @selection-change="handleAreaSelectionChange">
                        <el-table-column type="selection" width="55" />
                        <el-table-column type="selection" width="55" :reserve-selection="true" />
                        <el-table-column prop="areaName" show-overflow-tooltip label="区域名称" />
                        <el-table-column prop="areaType" show-overflow-tooltip label="区域类型">
                           <template v-slot="{ row }">
@@ -149,8 +149,9 @@
import { fieldRules, geomAnalysis, getDictLabel } from '@ztzf/utils'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import * as Cesium from 'cesium'
import { fwAreaDivideListApi } from '../partition/partitionApi'
import { fwAreaDivideDetailApi, fwAreaDivideListApi } from '../partition/partitionApi'
import { DrawPolygon } from '@/utils/cesium/DrawPolygon'
import commandPost from '@/assets/images/dataCockpit/legend/command-post.png'

const initForm = () => ({
   sceneName: '', // 场景名称
@@ -232,15 +233,23 @@
}

// 关联区域变更
function handleAreaSelectionChange (rows) {
   selectedAreaRows.value = rows
   formData.value.areaDivideIds = rows.map(item => item.id)
   formData.value.areaCount = rows.length
   formData.value.defenseArea = calcDefenseArea(rows)
async function handleAreaSelectionChange (rows) {
   const selectedRows = await ensureAreaGeom(rows)
   selectedAreaRows.value = selectedRows
   const ids = selectedRows.map(item => item.id)
   formData.value.areaDivideIds = ids.join(',')
   formData.value.areaCount = ids.length
   formData.value.defenseArea = calcDefenseArea(selectedRows)
}

// 渲染面
function renderingSurface () {
   console.log(geometricSource, 11111111)

   if (!geometricSource) {
      initMap()
   }
   if (!geometricSource) return
   geometricSource && geometricSource.entities.removeAll()
   selectedAreaRows.value.forEach(item => {
      if (item.geom) {
@@ -267,14 +276,43 @@
   return _.round(total, 2)
}

async function ensureAreaGeom (rows) {
   const missingRows = rows.filter(row => row?.id && !row.geom)
   if (!missingRows.length) return rows
   const detailList = await Promise.all(
      missingRows.map(row =>
         fwAreaDivideDetailApi({ id: row.id })
            .then(res => res?.data?.data)
            .catch(() => null)
      )
   )
   const detailMap = new Map(
      detailList.filter(Boolean).map(item => [String(item.id), item])
   )
   if (!detailMap.size) return rows
   areaList.value = areaList.value.map(item => {
      const detail = detailMap.get(String(item.id))
      return detail ? { ...item, ...detail } : item
   })
   return rows.map(item => {
      const detail = detailMap.get(String(item.id))
      return detail ? { ...item, ...detail } : item
   })
}

// 同步关联区域
function syncAreaSelection () {
   if (!areaTableRef.value) return
   areaTableRef.value.clearSelection()
   const rows = []
   const arr = formData.value.areaDivideIds.split(',')
   const areaDivideIds = formData.value.areaDivideIds
   const arr = Array.isArray(areaDivideIds)
      ? areaDivideIds.map(item => String(item))
      : String(areaDivideIds || '')
         .split(',')
         .filter(Boolean)
   areaList.value.forEach(row => {
      if (arr.includes(row.id)) {
      if (arr.includes(String(row.id))) {
         areaTableRef.value.toggleRowSelection(row, true)
         rows.push(row)
      }
@@ -330,23 +368,25 @@
   if (!redPointEntity) {
      redPointEntity = viewer.entities.add({
         position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
         point: {
            color: Cesium.Color.RED,
            pixelSize: 10,
         billboard: {
            image: commandPost, // 这里替换为你的图片路径或变量 deviceZcImg
            width: 40,
            height: 56,
            verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
         },
         label: {
            text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
            font: '14px',
            fillColor: Cesium.Color.WHITE,
            backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
            backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
            backgroundPadding: new Cesium.Cartesian2(5, 5),
            pixelOffset: new Cesium.Cartesian2(0, -20),
            showBackground: true,
            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
            verticalOrigin: Cesium.VerticalOrigin.CENTER,
            outlineWidth: 1,
            outlineColor: Cesium.Color.WHITE,
            pixelOffset: new Cesium.Cartesian2(0, -72),
            eyeOffset: new Cesium.Cartesian3(0, 0, -20),
         },
      })