From e65bc708df863ee0c59b39039f7db93c3ed4bd5b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 15 Jan 2026 16:13:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 257 ++++++++++++++++++++++++++-------------------------
1 files changed, 132 insertions(+), 125 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index cc8f386..9b2bcfe 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -1,116 +1,137 @@
<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">
- <div>场景名称: {{ formData.sceneName }}</div>
- <div>指挥点位置: {{ formatLocation(formData) }}</div>
- <div>场景类型: {{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
- <div>防控负责人: {{ formData.defenseLeader }}</div>
- <div>防控负责人电话: {{ formData.leaderPhone }}</div>
- <div>设备模式: {{ getDictLabel(formData.deviceMode, dictObj.deviceMode) }}</div>
- <div>防控面积: {{ formatDefenseArea(formData.defenseArea) }}</div>
- <el-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>
+ <el-dialog class="ztzf-page-map-view-dialog" v-model="visible" :show-close="false" :close-on-click-modal="false">
+ <div class="dialog-container">
+ <div class="left-container">
+ <div class="leftMap ztzf-cesium" id="mapContainer"></div>
+ </div>
+ <div class="right-container">
+ <div class="header">
+ {{ titleEnum[dialogMode] }}
</div>
- <el-form v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly" label-width="100px">
+
+ <div class="dialog-container" 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.sceneType) }}</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">
- <div>
- <div>
- 关联区域
- <el-input v-model="searchName" placeholder="请输入" clearable></el-input>
- </div>
-
- <el-form-item prop="areaDivideIds" label-width="0">
- <el-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" 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>
+ <div class="label">防控面积</div>
+ <div class="val">{{ formatDefenseArea(formData.defenseArea) }}</div>
</el-col>
</el-row>
+
+ <div class="detail-title">关联区域</div>
+ <div class="ztzf-table-container">
+ <div class="ztzf-table-content">
+ <el-table class="ztzf-data-cockpit-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="ztzf-data-cockpit-search-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="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
+ 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>
+ <el-form-item label="负责人" prop="defenseLeader">
+ <el-input class="ztzf-data-cockpit-search-input" v-model="formData.defenseLeader" maxlength="50"
+ placeholder="请输入" clearable />
+ </el-form-item>
+ <el-form-item label="负责人电话" prop="leaderPhone">
+ <el-input class="ztzf-data-cockpit-search-input" v-model="formData.leaderPhone" maxlength="50"
+ placeholder="请输入" clearable />
+ </el-form-item>
+ <el-form-item label="设备模式" prop="deviceMode">
+ <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-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="ztzf-data-cockpit-search-input" v-model="searchName" placeholder="请输入"
+ clearable></el-input>
+ </div>
+
+ <el-form-item prop="areaDivideIds" label-width="0">
+ <el-table class="ztzf-data-cockpit-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" 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>
</el-form>
+
+ <div class="footer">
+ <el-button 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 { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDefenseSceneDetailApi, fwDefenseSceneSubmitApi } from './sceneConfigApi'
import { fieldRules, geomAnalysis, getDictLabel } from '@ztzf/utils'
@@ -122,8 +143,8 @@
const initForm = () => ({
sceneName: '', // 场景名称
sceneType: '', // 场景类型
- defenseLeader: '', // 防控负责人
- leaderPhone: '', // 防控负责人电话
+ defenseLeader: '', // 负责人
+ leaderPhone: '', // 负责人电话
deviceMode: '', // 设备模式
areaDivideIds: '', // 关联区域ID
areaCount: 0, // 区域数量
@@ -159,12 +180,12 @@
}
// 关闭弹框
-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
@@ -183,21 +204,21 @@
}
// 加载详情
-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({ filterSelected: 1, sceneId: formData.value.id })
areaList.value = res?.data?.data ?? []
}
// 关联区域变更
-function handleAreaSelectionChange(rows) {
+function handleAreaSelectionChange (rows) {
selectedAreaRows.value = rows
formData.value.areaDivideIds = rows.map(item => item.id)
formData.value.areaCount = rows.length
@@ -205,7 +226,7 @@
}
// 渲染面
-function renderingSurface() {
+function renderingSurface () {
geometricSource && geometricSource.entities.removeAll()
selectedAreaRows.value.forEach(item => {
if (item.geom) {
@@ -227,13 +248,13 @@
watch(() => selectedAreaRows.value, renderingSurface)
-function calcDefenseArea(rows) {
+function calcDefenseArea (rows) {
const total = rows.reduce((sum, item) => sum + (Number(item.areaSize) || 0), 0)
return _.round(total, 2)
}
// 同步关联区域
-function syncAreaSelection() {
+function syncAreaSelection () {
if (!areaTableRef.value) return
areaTableRef.value.clearSelection()
const rows = []
@@ -250,20 +271,20 @@
formData.value.defenseArea = calcDefenseArea(rows)
}
-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() {
+function initMap () {
const publicCesiumInstance = new PublicCesium({
dom: 'mapContainer',
flatMode: false,
@@ -279,7 +300,7 @@
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
@@ -291,7 +312,7 @@
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({
@@ -303,17 +324,17 @@
label: {
text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
font: '14px',
- fillColor: Cesium.Color.WHITE, // 文字颜色：白色
- backgroundColor: Cesium.Color.BLACK.withAlpha(0.45), //背景颜色
- backgroundPadding: new Cesium.Cartesian2(5, 5), // 水平/垂直内边距（像素）
- pixelOffset: new Cesium.Cartesian2(0, -20), // 可选：微调位置
- showBackground: true, // 确保背景显示（某些版本需要）
+ fillColor: Cesium.Color.WHITE,
+ backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
+ 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,
- eyeOffset: new Cesium.Cartesian3(0, 0, -20), // 负值更靠近相机（显示在前）
+ eyeOffset: new Cesium.Cartesian3(0, 0, -20),
},
})
} else {
@@ -323,7 +344,7 @@
}
// 打开弹框
-async function open({ mode, row } = {}) {
+async function open ({ mode, row } = {}) {
dialogMode.value = mode || 'add'
formData.value = dialogMode.value === 'add' ? initForm() : row
selectedAreaRows.value = []
@@ -348,18 +369,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