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/precinctInfo/FormDiaLog.vue | 136 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 39 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..d76eae9 100644
--- a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
@@ -1,7 +1,7 @@
<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>
@@ -26,47 +26,61 @@
<el-row>
<el-col :span="12">
<el-form-item label="派出所名称" prop="stationName">
- <el-input class="ztzf-data-cockpit-search-input" v-model="formData.stationName" maxlength="50"
+ <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"
+ <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"
+ <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 }}
+ {{ formData.longitude }}, {{ formData.latitude }}, {{ formData.address }}
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
- <el-button color="#2B2B4C" @click="handleCancel">{{ readonly ? '关闭' : '取消' }}</el-button>
+ <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>
- <el-dialog v-model="visible1" title="选择位置" destroy-on-close @closed="positionClosed">
- <div class="ztzf-cesium" id="mapContainer"></div>
+ <el-dialog class="command-page-map-view-dialog" v-model="visible1" :show-close="false"
+ :close-on-click-modal="false" destroy-on-close @closed="positionClosed">
+ <div class="dialog-container">
+ <div class="left-container">
+ <CommonCesiumMap
+ ref="mapRef"
+ class="leftMap command-cesium"
+ :active="visible1"
+ :flat-mode="false"
+ :terrain="true"
+ :layer-mode="4"
+ :boundary="false"
+ />
+ </div>
+ </div>
+
<template #footer>
- <el-button @click="handleMapCancel">取消</el-button>
- <el-button type="primary" @click="handleMapConfirm">确定</el-button>
+ <el-button color="#2B2B4C" @click="handleMapCancel">取消</el-button>
+ <el-button color="#284FE3" type="primary" @click="handleMapConfirm">确定</el-button>
</template>
</el-dialog>
- </el-dialog>
</template>
<script setup>
@@ -74,9 +88,11 @@
import { ElMessage } from 'element-plus'
import { fwPoliceStationDetailApi, fwPoliceStationSubmitApi } from './precinctInfoApi'
import { fieldRules } from '@ztzf/utils'
-import { PublicCesium } from '@/utils/cesium/publicCesium'
+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'
const initForm = () => ({
address: '', // 位置
@@ -97,6 +113,8 @@
const readonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
const tempLocation = ref({ longitude: null, latitude: null })
+const mapRef = ref(null)
+const route = useRoute()
const rules = {
address: fieldRules(true, 50),
@@ -106,17 +124,22 @@
}
// 关闭弹框
-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
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')
@@ -126,13 +149,13 @@
}
// 加载详情
-async function loadDetail() {
+async function loadDetail () {
if (!formData.value.id) return
const res = await fwPoliceStationDetailApi({ id: formData.value.id })
formData.value = res?.data?.data ?? {}
}
-function LeftClickEvent(click) {
+function LeftClickEvent (click) {
const pos = click.position // Cartesian2 屏幕坐标
// 屏幕坐标 -> 椭球面坐标（不考虑地形/模型）
const cartesian3 = viewer.camera.pickEllipsoid(pos, viewer.scene.globe.ellipsoid)
@@ -156,7 +179,7 @@
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, // 确保背景显示（某些版本需要）
@@ -174,32 +197,70 @@
}
}
-function positionClosed() {
+function positionClosed () {
redPointEntity = null
}
let viewer
let redPointEntity
-async function selectLocation() {
- visible1.value = true
- await nextTick()
- const publicCesiumInstance = new PublicCesium({
- dom: 'mapContainer',
- flatMode: false,
- terrain: true,
- layerMode: 4,
- boundary: false,
- })
- publicCesiumInstance.addLeftClickEvent(null, LeftClickEvent)
- viewer = publicCesiumInstance.getViewer()
+let leftClickBound = false
+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,
+ },
+ label: {
+ text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
+ font: '14px',
+ fillColor: Cesium.Color.WHITE,
+ 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,
+ eyeOffset: new Cesium.Cartesian3(0, 0, -20),
+ },
+ })
+ } else {
+ redPointEntity.position = Cesium.Cartesian3.fromDegrees(longitude, latitude)
+ redPointEntity.label.text = `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`
+ }
}
-function handleMapCancel() {
+function formatCoord (value) {
+ if (value == null || value === '') return '-'
+ return _.round(Number(value), 6)
+}
+
+async function selectLocation () {
+ visible1.value = true
+ await nextTick()
+ const map = mapRef.value?.getMap()
+ viewer = map?.viewer || null
+ if (viewer && !leftClickBound) {
+ map.publicCesium?.addLeftClickEvent?.(null, LeftClickEvent)
+ leftClickBound = true
+ }
+ if (formData.value.longitude != null && formData.value.latitude != null) {
+ tempLocation.value = { longitude: formData.value.longitude, latitude: formData.value.latitude }
+ setMapPoint(formData.value.longitude, formData.value.latitude)
+ }
+}
+
+function handleMapCancel () {
tempLocation.value = { longitude: null, latitude: null }
visible1.value = false
}
-async function getLocationName() {
+async function getLocationName () {
const tk = import.meta.env.VITE_APP_TDT_TOKEN
const { latitude, longitude } = tempLocation.value
const http = axios.create({ withCredentials: false })
@@ -210,7 +271,7 @@
formData.value.address = res.data.result.formatted_address
}
-function handleMapConfirm() {
+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)
@@ -218,8 +279,9 @@
}
visible1.value = false
}
+
// 打开弹框
-async function open({ mode, row } = {}) {
+async function open ({ mode, row } = {}) {
dialogMode.value = mode || 'add'
formData.value = dialogMode.value === 'add' ? initForm() : row
dialogMode.value !== 'add' && (await loadDetail())
@@ -228,8 +290,4 @@
defineExpose({ open })
</script>
<style scoped lang="scss">
-#mapContainer {
- width: 100%;
- height: 500px;
-}
</style>
--
Gitblit v1.9.3