From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue | 319 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 229 insertions(+), 90 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
index 64ac02f..88f41ae 100644
--- a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
@@ -1,7 +1,11 @@
<template>
- <el-dialog class="ztzf-page-view-dialog" v-model="visible" :title="titleEnum[dialogMode]">
+ <el-dialog
+ class="command-page-view-dialog"
+ v-model="visible"
+ :title="titleEnum[dialogMode]"
+ :close-on-click-modal="false"
+ >
<div class="detail-container" v-if="readonly">
- <div class="detail-title">派出所详情</div>
<el-row>
<el-col :span="12">
<div class="label">派出所名称</div>
@@ -12,97 +16,139 @@
<div class="val">{{ formData.contactPerson }}</div>
</el-col>
<el-col :span="12">
- <div class="label">位置</div>
- <div class="val">{{ formData.address }}</div>
- </el-col>
- <el-col :span="12">
<div class="label">联系方式</div>
<div class="val">{{ formData.contactPhone }}</div>
</el-col>
+ <el-col :span="12">
+ <div class="label">位置</div>
+ <div class="val">{{ formData.address }}</div>
+ </el-col>
</el-row>
</div>
- <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly"
- label-width="100px">
+ <el-form
+ class="dialog-form"
+ v-else
+ ref="formRef"
+ :model="formData"
+ :rules="rules"
+ :disabled="readonly"
+ label-width="100px"
+ >
<el-row>
- <el-col :span="12">
+ <el-col :span="24">
<el-form-item label="派出所名称" prop="stationName">
- <el-input class="ztzf-data-cockpit-search-input" v-model="formData.stationName" maxlength="50"
- placeholder="请输入" clearable />
+ <el-input
+ class="command-input"
+ v-model="formData.stationName"
+ maxlength="50"
+ placeholder="请输入"
+ clearable
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人" prop="contactPerson">
- <el-input class="ztzf-data-cockpit-search-input" v-model="formData.contactPerson" maxlength="50"
- placeholder="请输入" clearable />
+ <el-input
+ class="command-input"
+ v-model="formData.contactPerson"
+ maxlength="50"
+ placeholder="请输入"
+ clearable
+ />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系方式" prop="contactPhone">
- <el-input class="ztzf-data-cockpit-search-input" v-model="formData.contactPhone" maxlength="50"
- placeholder="请输入" clearable />
+ <el-input
+ class="command-input"
+ v-model="formData.contactPhone"
+ maxlength="50"
+ placeholder="请输入"
+ clearable
+ />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="位置" prop="longitude">
- <el-button @click="selectLocation" style="width: 100%">
- {{ formData.longitude }}, {{ formData.longitude }}, {{ formData.address }}
- </el-button>
+ <div class="location-container">
+ <div class="location-info" v-if="formData.longitude && formData.latitude">
+ 经度: {{ formData.longitude }}, 纬度: {{ formData.latitude }}
+ <span v-if="formData.address">, {{ formData.address }}</span>
+ </div>
+ <div class="location-info" v-else>请在地图上点击选择位置</div>
+ <div class="inline-map-container">
+ <CommonCesiumMap
+ ref="inlineMapRef"
+ class="inline-map command-cesium"
+ :active="visible && !readonly"
+ :flat-mode="false"
+ :terrain="true"
+ :layer-mode="4"
+ :boundary="false"
+ />
+ </div>
+ </div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #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 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>
</template>
-
- <el-dialog v-model="visible1" title="选择位置" destroy-on-close @closed="positionClosed">
- <div class="ztzf-cesium" id="mapContainer"></div>
- <template #footer>
- <el-button @click="handleMapCancel">取消</el-button>
- <el-button type="primary" @click="handleMapConfirm">确定</el-button>
- </template>
- </el-dialog>
</el-dialog>
</template>
<script setup>
-import { computed, nextTick, ref } from 'vue'
+import { computed, nextTick, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwPoliceStationDetailApi, fwPoliceStationSubmitApi } from './precinctInfoApi'
-import { fieldRules } from '@ztzf/utils'
-import { PublicCesium } from '@/utils/cesium/publicCesium'
+import { contactPhoneRules, fieldRules } from '@ztzf/utils'
+import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import * as Cesium from 'cesium'
import axios from 'axios'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
+import positionIcon from '@/assets/images/areaManage/positionIcon.png'
+import { MapTooltip } from '@ztzf/utils'
const initForm = () => ({
address: '', // 位置
contactPerson: '', // 联系人
contactPhone: '', // 联系方式
stationName: '', // 派出所名称
- longitude: 0,
- latitude: 0,
+ longitude: null,
+ latitude: null,
})
const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
const formData = ref(initForm()) // 表单数据
const visible = defineModel() // 弹框显隐
-const visible1 = ref(false) // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const readonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
-const tempLocation = ref({ longitude: null, latitude: null })
+const inlineMapRef = ref(null) // 内嵌地图引用
+const route = useRoute()
const rules = {
address: fieldRules(true, 50),
stationName: fieldRules(true, 50),
contactPerson: fieldRules(true, 50),
- contactPhone: fieldRules(true, 50),
+ contactPhone: contactPhoneRules(true, 50),
+ longitude: fieldRules(true),
}
// 关闭弹框
@@ -117,6 +163,11 @@
submitting.value = true
try {
await fwPoliceStationSubmitApi(formData.value)
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '派出所管理'}-${dialogMode.value === 'add' ? '新增' : '编辑'}`,
+ type: 1,
+ })
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
visible.value = false
emit('success')
@@ -132,40 +183,58 @@
formData.value = res?.data?.data ?? {}
}
+let viewer
+let redPointEntity
+let leftClickBound = false
+let mouseMoveBound = false
+let mapTooltip
+let publicCesium
+const tooltipEventKey = 'precinct-info-point-tip'
+const labelParams = {
+ font: '18px',
+ fillColor: Cesium.Color.WHITE, // 文字颜色：白色
+ backgroundColor: Cesium.Color.BLACK, //背景颜色
+ 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,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+}
+
function LeftClickEvent(click) {
- const pos = click.position // Cartesian2 屏幕坐标
- // 屏幕坐标 -> 椭球面坐标（不考虑地形/模型）
- const cartesian3 = viewer.camera.pickEllipsoid(pos, viewer.scene.globe.ellipsoid)
- if (!cartesian3) {
- return { longitude: 112, latitude: 23 }
+ const pos = click.position
+ // 优先使用 pickPosition 获取贴地坐标（包含地形高度）
+ let cartesian3 = viewer.scene.pickPosition(pos)
+ // 如果 pickPosition 失败，回退到 pickEllipsoid
+ if (!cartesian3 || !Cesium.defined(cartesian3)) {
+ cartesian3 = viewer.camera.pickEllipsoid(pos, viewer.scene.globe.ellipsoid)
}
- // 椭球面坐标 -> 经纬度
+ if (!cartesian3) return
const carto = Cesium.Cartographic.fromCartesian(cartesian3)
const longitude = Cesium.Math.toDegrees(carto.longitude)
const latitude = Cesium.Math.toDegrees(carto.latitude)
- tempLocation.value = { longitude, latitude }
+ formData.value.longitude = _.round(longitude, 6)
+ formData.value.latitude = _.round(latitude, 6)
+ getLocationName(longitude, latitude)
+
// 添加红点（全局仅保留一个）并渲染经纬度标签
if (!redPointEntity) {
redPointEntity = viewer.entities.add({
position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
- point: {
- color: Cesium.Color.RED,
- pixelSize: 10,
+ billboard: {
+ image: positionIcon,
+ width: 20,
+ height: 20,
+ verticalOrigin: Cesium.VerticalOrigin.CENTER,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
},
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, // 确保背景显示（某些版本需要）
- 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), // 负值更靠近相机（显示在前）
+ ...labelParams,
},
})
} else {
@@ -174,34 +243,76 @@
}
}
-function positionClosed() {
- redPointEntity = null
+function setMapPoint(longitude, latitude) {
+ if (!viewer || longitude == null || latitude == null) return
+ if (!redPointEntity) {
+ redPointEntity = viewer.entities.add({
+ position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
+ billboard: {
+ image: positionIcon,
+ width: 20,
+ height: 20,
+ verticalOrigin: Cesium.VerticalOrigin.CENTER,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ },
+ label: {
+ text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
+ ...labelParams,
+ },
+ })
+ } else {
+ redPointEntity.position = Cesium.Cartesian3.fromDegrees(longitude, latitude)
+ redPointEntity.label.text = `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`
+ }
}
-let viewer
-let redPointEntity
-async function selectLocation() {
- visible1.value = true
+function formatCoord(value) {
+ if (value == null || value === '') return '-'
+ return _.round(Number(value), 6)
+}
+
+// 初始化内嵌地图
+async function initInlineMap() {
await nextTick()
- const publicCesiumInstance = new PublicCesium({
- dom: 'mapContainer',
- flatMode: false,
- terrain: true,
- layerMode: 4,
- boundary: false,
- })
- publicCesiumInstance.addLeftClickEvent(null, LeftClickEvent)
- viewer = publicCesiumInstance.getViewer()
+ const map = inlineMapRef.value?.getMap()
+ viewer = map?.viewer || null
+ publicCesium = map?.publicCesium || null
+ if (viewer && !leftClickBound) {
+ map.publicCesium?.addLeftClickEvent?.(null, LeftClickEvent)
+ leftClickBound = true
+ }
+ if (viewer && !readonly.value) {
+ ensurePointTooltip()
+ }
+ if (formData.value.longitude != null && formData.value.latitude != null) {
+ setMapPoint(formData.value.longitude, formData.value.latitude)
+ }
}
-function handleMapCancel() {
- tempLocation.value = { longitude: null, latitude: null }
- visible1.value = false
+function ensurePointTooltip() {
+ if (!viewer || !publicCesium || mouseMoveBound) return
+ mapTooltip ||= new MapTooltip(viewer, { offset: { x: 16, y: 24 } })
+ publicCesium.addMouseHandler?.(
+ null,
+ movement => {
+ if (!visible.value || readonly.value) return
+ mapTooltip?.show('点击地图选择派出所位置', movement.endPosition)
+ },
+ tooltipEventKey
+ )
+ mouseMoveBound = true
}
-async function getLocationName() {
+function clearPointTooltip() {
+ mapTooltip?.hide()
+ if (publicCesium && mouseMoveBound) {
+ publicCesium.removeMouseHandler?.(tooltipEventKey)
+ mouseMoveBound = false
+ }
+}
+
+async function getLocationName(longitude, latitude) {
const tk = import.meta.env.VITE_APP_TDT_TOKEN
- const { latitude, longitude } = tempLocation.value
const http = axios.create({ withCredentials: false })
const res = await http({
url: `https://api.tianditu.gov.cn/geocoder?postStr={'lon':${longitude},'lat':${latitude},'ver':1}&tk=${tk}`,
@@ -210,26 +321,54 @@
formData.value.address = res.data.result.formatted_address
}
-function handleMapConfirm() {
- if (tempLocation.value.longitude != null && tempLocation.value.latitude != null) {
- formData.value.longitude = _.round(tempLocation.value.longitude, 6)
- formData.value.latitude = _.round(tempLocation.value.latitude, 6)
- getLocationName()
- }
- visible1.value = false
-}
// 打开弹框
async function open({ mode, row } = {}) {
dialogMode.value = mode || 'add'
formData.value = dialogMode.value === 'add' ? initForm() : row
- dialogMode.value !== 'add' && (await loadDetail())
+ redPointEntity = null
+ leftClickBound = false
+ clearPointTooltip()
+ if (dialogMode.value !== 'add') {
+ await loadDetail()
+ }
+ // 延迟初始化地图，确保 DOM 渲染完成
+ setTimeout(() => {
+ initInlineMap()
+ }, 500)
}
+
+watch(
+ () => visible.value,
+ val => {
+ if (!val) {
+ clearPointTooltip()
+ }
+ }
+)
defineExpose({ open })
</script>
<style scoped lang="scss">
-#mapContainer {
+.location-container {
width: 100%;
- height: 500px;
+}
+
+.location-info {
+ margin-bottom: 8px;
+ color: #fff;
+ font-size: 14px;
+}
+
+.inline-map-container {
+ width: 100%;
+ height: 300px;
+ border-radius: 4px;
+ overflow: hidden;
+ border: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+.inline-map {
+ width: 100%;
+ height: 100%;
}
</style>
--
Gitblit v1.9.3