From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 414 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 248 insertions(+), 166 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index 91c7626..e546c27 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -1,132 +1,165 @@
<template>
- <el-dialog v-model="visible" :title="titleEnum[dialogMode]" :close-on-click-modal="false" width="80%">
- <div class="bodyBox">
- <div class="leftMap ztzf-cesium" id="mapContainer"></div>
- <div class="rightInfo">
- <div v-if="readonly">
- <el-row>
- <el-col :span="24">
- <div>场景名称: {{ formData.sceneName }}</div>
- </el-col>
- <el-col :span="24">
- <div>指挥点位置: {{ formatLocation(formData) }}</div>
- </el-col>
- <el-col :span="24">
- <div>场景类型: {{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
- </el-col>
- <el-col :span="24">
- <div>防控负责人: {{ formData.defenseLeader }}</div>
- </el-col>
- <el-col :span="24">
- <div>防控负责人电话: {{ formData.leaderPhone }}</div>
- </el-col>
- <el-col :span="24">
- <div>设备模式: {{ getDictLabel(formData.deviceMode, dictObj.deviceMode) }}</div>
- </el-col>
- <el-col :span="24">
- <div>关联区域: {{ formatAreaNames() }}</div>
- </el-col>
- <el-col :span="24">
- <div>防控面积: {{ formatDefenseArea(formData.defenseArea) }}</div>
- </el-col>
- </el-row>
+ <el-dialog class="command-page-map-view-dialog" v-model="visible" :show-close="false" :close-on-click-modal="false">
+ <div class="dialog-container">
+ <div class="left-container">
+ <CommonCesiumMap
+ ref="mapRef"
+ class="leftMap command-cesium"
+ :active="visible"
+ :flat-mode="false"
+ :terrain="true"
+ :layer-mode="4"
+ :boundary="false"
+ />
+ </div>
+ <div class="right-container">
+ <div class="header">
+ <span>{{ titleEnum[dialogMode] }}</span>
+
+ <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
</div>
- <el-form v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly" label-width="100px">
+
+ <div class="content" v-if="readonly">
+ <div class="detail-title">场景详情</div>
<el-row>
<el-col :span="24">
- <el-form-item label="场景名称" prop="sceneName">
- <el-input v-model="formData.sceneName" maxlength="50" placeholder="请输入" clearable />
- </el-form-item>
+ <div class="label">场景名称</div>
+ <div class="val">{{ formData.sceneName }}</div>
</el-col>
<el-col :span="24">
- <el-form-item label="指挥点位置" prop="longitude">
- <div>{{ formatLocation(formData) }}</div>
- </el-form-item>
+ <div class="label">指挥点位置</div>
+ <div class="val">{{ formatLocation(formData) }}</div>
</el-col>
<el-col :span="24">
- <el-form-item label="场景类型" prop="sceneType">
- <el-select v-model="formData.sceneType" placeholder="请选择" clearable>
- <el-option
- v-for="item in dictObj.sceneType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
- </el-form-item>
+ <div class="label">场景类型</div>
+ <div class="val">{{ getDictLabel(formData.sceneType, dictObj.CommandSceneType) }}</div>
</el-col>
<el-col :span="24">
- <el-form-item label="防控负责人" prop="defenseLeader">
- <el-input v-model="formData.defenseLeader" maxlength="50" placeholder="请输入" clearable />
- </el-form-item>
+ <div class="label">负责人</div>
+ <div class="val">{{ formData.defenseLeader }}</div>
</el-col>
<el-col :span="24">
- <el-form-item label="防控负责人电话" prop="leaderPhone">
- <el-input v-model="formData.leaderPhone" maxlength="50" placeholder="请输入" clearable />
- </el-form-item>
+ <div class="label">负责人电话</div>
+ <div class="val">{{ formData.leaderPhone }}</div>
</el-col>
<el-col :span="24">
- <el-form-item label="设备模式" prop="deviceMode">
- <el-select v-model="formData.deviceMode" placeholder="请选择" clearable>
- <el-option
- v-for="item in dictObj.deviceMode"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
- </el-form-item>
+ <div class="label">设备模式</div>
+ <div class="val">{{ getDictLabel(formData.deviceMode, dictObj.deviceMode) }}</div>
</el-col>
<el-col :span="24">
- <el-form-item label="防控面积" prop="defenseArea">
- <div>{{ formatDefenseArea(formData.defenseArea) }}</div>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="关联区域" prop="areaDivideIds">
- <el-table
- ref="areaTableRef"
- :data="areaList"
- row-key="id"
- @selection-change="handleAreaSelectionChange"
- >
- <el-table-column type="selection" width="55" />
- <el-table-column prop="areaName" label="区域名称" />
- <el-table-column prop="areaType" label="区域类型">
- <template v-slot="{ row }">
- {{ getDictLabel(row.areaType, dictObj.areaType) }}
- </template>
- </el-table-column>
- </el-table>
- </el-form-item>
+ <div class="label">防控面积</div>
+ <div class="val">{{ formatDefenseArea(formData.defenseArea) }}</div>
</el-col>
</el-row>
+
+ <div class="detail-title">关联区域</div>
+ <div class="command-table-container">
+ <div class="command-table-content">
+ <el-table class="command-table" ref="areaTableRef" :data="areaList" row-key="id">
+ <el-table-column prop="areaName" label="区域名称" />
+ <el-table-column prop="areaType" label="区域类型">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.areaType, dictObj.areaType) }}
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+ </div>
+
+ <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly"
+ label-width="96px">
+ <el-form-item label="场景名称" prop="sceneName">
+ <el-input class="command-input" v-model="formData.sceneName" maxlength="50"
+ placeholder="请输入" clearable />
+ </el-form-item>
+ <el-form-item label="指挥点位置" prop="longitude">
+ <div class="val">{{ formatLocation(formData) }}</div>
+ </el-form-item>
+ <el-form-item label="场景类型" prop="sceneType">
+ <el-select class="command-select" popper-class="command-select-popper"
+ v-model="formData.sceneType" placeholder="请选择" clearable>
+ <el-option v-for="item in dictObj.CommandSceneType" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="负责人" prop="defenseLeader">
+ <el-input class="command-input" v-model="formData.defenseLeader" maxlength="50"
+ placeholder="请输入" clearable />
+ </el-form-item>
+ <el-form-item label="负责人电话" prop="leaderPhone">
+ <el-input class="command-input" v-model="formData.leaderPhone" maxlength="50"
+ placeholder="请输入" clearable />
+ </el-form-item>
+ <el-form-item label="设备模式" prop="deviceMode">
+ <el-select class="command-select" popper-class="command-select-popper"
+ v-model="formData.deviceMode" placeholder="请选择" clearable>
+ <el-option v-for="item in dictObj.deviceMode" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="防控面积" prop="defenseArea">
+ <div class="val">{{ formatDefenseArea(formData.defenseArea) }}</div>
+ </el-form-item>
+
+ <div class="search-table-container">
+ <div class="search-box">
+ <div class="label">
+ 关联区域
+ </div>
+
+ <el-input class="command-input" v-model="searchName" placeholder="请输入"
+ clearable></el-input>
+ </div>
+
+ <el-form-item prop="areaDivideIds" label-width="0">
+ <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" :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 }">
+ {{ getDictLabel(row.areaType, dictObj.areaType) }}
+ </template>
+ </el-table-column>
+ </el-table>
+ </el-form-item>
+ </div>
</el-form>
+
+ <div class="footer">
+ <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ readonly ? '关闭' : '取消' }}</el-button>
+ <el-button color="#284FE3" v-if="!readonly" type="primary" :loading="submitting"
+ :disabled="submitting" @click="handleSubmit">
+ 确定
+ </el-button>
+ </div>
</div>
</div>
- <template #footer>
- <el-button @click="handleCancel">{{ readonly ? '关闭' : '取消' }}</el-button>
- <el-button v-if="!readonly" type="primary" :loading="submitting" :disabled="submitting" @click="handleSubmit">
- 确定
- </el-button>
- </template>
</el-dialog>
</template>
<script setup>
-import { computed, inject, nextTick, onMounted, ref } from 'vue'
+import { Close } from '@element-plus/icons-vue'
+
+import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDefenseSceneDetailApi, fwDefenseSceneSubmitApi } from './sceneConfigApi'
-import { fieldRules, getDictLabel } from '@ztzf/utils'
-import { PublicCesium } from '@/utils/cesium/publicCesium'
+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'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
const initForm = () => ({
sceneName: '', // 场景名称
sceneType: '', // 场景类型
- defenseLeader: '', // 防控负责人
- leaderPhone: '', // 防控负责人电话
+ defenseLeader: '', // 负责人
+ leaderPhone: '', // 负责人电话
deviceMode: '', // 设备模式
areaDivideIds: '', // 关联区域ID
areaCount: 0, // 区域数量
@@ -144,9 +177,15 @@
const readonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
const areaTableRef = ref(null)
+const searchName = ref('')
const areaList = ref([]) // 关联区域列表
-const selectedAreaRows = ref([])
+const selectedAreaRows = ref([]) //选中列表
const dictObj = inject('dictObj')
+const mapRef = ref(null)
+const route = useRoute()
+let viewer
+let redPointEntity
+let leftClickBound = false
const rules = {
sceneName: fieldRules(true, 50),
@@ -155,16 +194,16 @@
leaderPhone: fieldRules(true, 50),
deviceMode: fieldRules(true),
longitude: fieldRules(true),
- areaDivideIds: fieldRules(true),
+ areaDivideIds: fieldRules(false),
}
// 关闭弹框
-function handleCancel() {
+function handleCancel () {
visible.value = false
}
// 提交新增/编辑
-async function handleSubmit() {
+async function handleSubmit () {
const isValid = await formRef.value?.validate().catch(() => false)
if (!isValid) return
submitting.value = true
@@ -174,6 +213,11 @@
formData.value.areaCount = ids.length
formData.value.defenseArea = calcDefenseArea(selectedAreaRows.value)
await fwDefenseSceneSubmitApi(formData.value)
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '场景配置管理'}-${dialogMode.value === 'add' ? '新增' : '编辑'}`,
+ type: 1,
+ })
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
emit('success')
@@ -183,45 +227,100 @@
}
// 加载详情
-async function loadDetail() {
+async function loadDetail () {
if (!formData.value.id) return
const res = await fwDefenseSceneDetailApi({ id: formData.value.id })
formData.value = res?.data?.data ?? initForm()
}
// 获取区域列表
-async function getAreaList() {
+async function getAreaList () {
if (areaList.value.length) return
- const res = await fwAreaDivideListApi()
+ const res = await fwAreaDivideListApi({ filterSelected: 1, sceneId: formData.value.id })
areaList.value = res?.data?.data ?? []
}
// 关联区域变更
-function handleAreaSelectionChange(rows) {
- selectedAreaRows.value = rows
- const ids = rows.map(item => item.id)
+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(rows)
+ formData.value.defenseArea = calcDefenseArea(selectedRows)
}
-function calcDefenseArea(rows) {
+// 渲染面
+function renderingSurface () {
+ console.log(geometricSource, 11111111)
+
+ if (!geometricSource) {
+ initMap()
+ }
+ if (!geometricSource) return
+ geometricSource && geometricSource.entities.removeAll()
+ selectedAreaRows.value.forEach(item => {
+ if (item.geom) {
+ const pointList = geomAnalysis(item.geom)
+ const result = pointList.map(item => [item.longitude, item.latitude]).flat()
+ geometricSource.entities?.add({
+ customType: 'control_group',
+ position: Cesium.Cartesian3.fromDegrees(result[0], result[1]),
+ polyline: {
+ positions: Cesium.Cartesian3.fromDegreesArray(result),
+ clampToGround: true,
+ width: 3,
+ material: Cesium.Color.RED,
+ },
+ })
+ }
+ })
+}
+
+watch(() => selectedAreaRows.value, renderingSurface)
+
+function calcDefenseArea (rows) {
const total = rows.reduce((sum, item) => sum + (Number(item.areaSize) || 0), 0)
return _.round(total, 2)
}
-function getAreaIdList() {
- if (!formData.value.areaDivideIds) return []
- return formData.value.areaDivideIds.split(',').filter(Boolean)
+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() {
+// 同步关联区域
+function syncAreaSelection () {
if (!areaTableRef.value) return
areaTableRef.value.clearSelection()
- const ids = new Set(getAreaIdList())
const rows = []
+ 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 (ids.has(row.id)) {
+ if (arr.includes(String(row.id))) {
areaTableRef.value.toggleRowSelection(row, true)
rows.push(row)
}
@@ -232,43 +331,35 @@
formData.value.defenseArea = calcDefenseArea(rows)
}
-function formatAreaNames() {
- const rows = selectedAreaRows.value.length ? selectedAreaRows.value : getAreaRowsByIds()
- return rows.map(item => item.areaName).join(', ')
-}
-
-function getAreaRowsByIds() {
- const ids = new Set(getAreaIdList().map(String))
- return areaList.value.filter(item => ids.has(String(item.id)))
-}
-
-function formatDefenseArea(value) {
+function formatDefenseArea (value) {
if (value == null || value === '') return ''
return `${value}k㎡`
}
// 格式化指挥点位置
-function formatLocation(row) {
+function formatLocation (row) {
if (row?.longitude == null || row?.latitude == null) return ''
return `${_.round(row.longitude, 6)}, ${_.round(row.latitude, 6)}`
}
+let geometricSource
// 初始化地图实例
-function initMap() {
- const publicCesiumInstance = new PublicCesium({
- dom: 'mapContainer',
- flatMode: false,
- terrain: true,
- layerMode: 4,
- boundary: false,
- })
- if (!readonly.value) {
- publicCesiumInstance.addLeftClickEvent(null, LeftClickEvent)
+function initMap () {
+ if (viewer) return
+ const map = mapRef.value?.getMap()
+ if (!map?.viewer) return
+ viewer = map.viewer
+ if (!readonly.value && !leftClickBound) {
+ map.publicCesium?.addLeftClickEvent?.(null, LeftClickEvent)
+ leftClickBound = true
}
- viewer = publicCesiumInstance.getViewer()
+ if (!geometricSource) {
+ geometricSource = new Cesium.CustomDataSource('geometricSource')
+ viewer.dataSources.add(geometricSource)
+ }
}
-function LeftClickEvent(click) {
+function LeftClickEvent (click) {
const pos = click.position
const cartesian3 = viewer.camera.pickEllipsoid(pos, viewer.scene.globe.ellipsoid)
if (!cartesian3) return
@@ -280,23 +371,31 @@
setMapPoint(formData.value.longitude, formData.value.latitude)
}
-function setMapPoint(longitude, latitude) {
+function setMapPoint (longitude, latitude) {
if (!viewer || longitude == null || latitude == null) return
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,
- outlineColor: Cesium.Color.BLACK,
- outlineWidth: 2,
+ backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
+ backgroundPadding: new Cesium.Cartesian2(5, 5),
+ showBackground: true,
style: Cesium.LabelStyle.FILL_AND_OUTLINE,
- verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
- pixelOffset: new Cesium.Cartesian2(0, -12),
+ 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),
},
})
} else {
@@ -305,11 +404,8 @@
}
}
-let viewer
-let redPointEntity
-
// 打开弹框
-async function open({ mode, row } = {}) {
+async function open ({ mode, row } = {}) {
dialogMode.value = mode || 'add'
formData.value = dialogMode.value === 'add' ? initForm() : row
selectedAreaRows.value = []
@@ -334,18 +430,4 @@
})
</script>
-<style scoped lang="scss">
-.bodyBox {
- display: flex;
- height: 600px;
- .leftMap {
- width: 70%;
- height: 100%;
- }
- .rightInfo {
- width: 30%;
- height: 100%;
- overflow: auto;
- }
-}
-</style>
+<style scoped lang="scss"></style>
--
Gitblit v1.9.3