From 40c2702c3da24d9d9fda6bd63894c3206779f812 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 17 Jan 2026 16:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
index 5679269..e6ac8dd 100644
--- a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
@@ -1,5 +1,5 @@
<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]">
<div class="detail-container" v-if="readonly">
<div class="detail-title">派出所详情</div>
<el-row>
@@ -26,19 +26,19 @@
<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-data-cockpit-search-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-data-cockpit-search-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-data-cockpit-search-input" v-model="formData.contactPhone" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
</el-col>
@@ -59,11 +59,19 @@
</el-button>
</template>
- <el-dialog class="ztzf-page-map-view-dialog" v-model="visible1" :show-close="false"
+ <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">
- <div class="leftMap ztzf-cesium" id="mapContainer"></div>
+ <CommonCesiumMap
+ ref="mapRef"
+ class="leftMap command-cesium"
+ :active="visible1"
+ :flat-mode="false"
+ :terrain="true"
+ :layer-mode="4"
+ :boundary="false"
+ />
</div>
</div>
@@ -80,7 +88,7 @@
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'
@@ -103,6 +111,7 @@
const readonly = computed(() => dialogMode.value === 'view')
const titleEnum = ref({ edit: '编辑', view: '查看', add: '新增' })
const tempLocation = ref({ longitude: null, latitude: null })
+const mapRef = ref(null)
const rules = {
address: fieldRules(true, 50),
@@ -186,6 +195,7 @@
let viewer
let redPointEntity
+let leftClickBound = false
function setMapPoint (longitude, latitude) {
if (!viewer || longitude == null || latitude == null) return
if (!redPointEntity) {
@@ -225,15 +235,12 @@
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()
+ 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)
@@ -264,6 +271,7 @@
}
visible1.value = false
}
+
// 打开弹框
async function open ({ mode, row } = {}) {
dialogMode.value = mode || 'add'
--
Gitblit v1.9.3