From b1631e475314229d3365ad7aa6397c7b70b1a8fd Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 12 Jan 2026 14:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
index 60d2d57..2f0c1f7 100644
--- a/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/FormDiaLog.vue
@@ -29,18 +29,15 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="位置" prop="longitude">
- <el-button @click="selectLocation">{{ formData.longitude }},{{ formData.longitude }}</el-button>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="位置" prop="address">
- <el-input v-model="formData.address" maxlength="50" placeholder="请输入" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="12">
<el-form-item label="联系方式" prop="contactPhone">
<el-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>
</el-form-item>
</el-col>
</el-row>
@@ -69,6 +66,7 @@
import { fieldRules } from '@ztzf/utils'
import { PublicCesium } from '@/utils/cesium/publicCesium'
import * as Cesium from 'cesium'
+import axios from 'axios'
const initForm = () => ({
address: '', // 位置
@@ -185,10 +183,22 @@
visible1.value = false
}
+async function getLocationName() {
+ 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}`,
+ method: 'get',
+ })
+ formData.value.address = res.data.result.formatted_address
+}
+
function handleMapConfirm() {
if (tempLocation.value.longitude != null && tempLocation.value.latitude != null) {
- formData.value.longitude = tempLocation.value.longitude
- formData.value.latitude = tempLocation.value.latitude
+ formData.value.longitude = _.round(tempLocation.value.longitude, 6)
+ formData.value.latitude = _.round(tempLocation.value.latitude, 6)
+ getLocationName()
}
visible1.value = false
}
--
Gitblit v1.9.3