From 6303854b482179fefc3498739aed3f86e930e6fb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 15:30:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder_add.html | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder_add.html b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder_add.html
index 7dc2b2f..20ddd02 100644
--- a/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder_add.html
+++ b/management/guns-admin/src/main/webapp/WEB-INF/view/system/tOrder/tOrder_add.html
@@ -70,7 +70,7 @@
}
</script>
<script src="${ctxPath}/static/modular/system/tOrder/tOrder_info.js"></script>
-<script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=86fcccf007b64ae97b01c3c982c0ef0f&plugin=AMap.PlaceSearch,AMap.AutoComplete,AMap.Marker,AMap.Geocoder"></script>
+<script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=86fcccf007b64ae97b01c3c982c0ef0f&plugin=AMap.PlaceSearch,AMap.AutoComplete,AMap.Marker,AMap.Geocoder,AMap.Geolocation"></script>
<script type="text/javascript">
//地图加载
var map1 = new AMap.Map("container1", {
@@ -81,7 +81,6 @@
function autoInput1(){
var keywords = document.getElementById("tipinput1").value;
- AMap.plugin('AMap.AutoComplete', function(){
// 实例化Autocomplete
var autoOptions = {
city: '全国'
@@ -95,7 +94,6 @@
$(".amap-sug-result-one").append('<div class="auto-item amapaddr" id="amap-sug4" onclick="javascript:geoCode1(\''+result.tips[key].name+'\', \''+result.tips[key].district+ result.tips[key].address+'\');">' + result.tips[key].name+ " <span style='color: darkgray;margin-left: 13px;'>" + result.tips[key].district+ result.tips[key].address+ " </span></div>");
}
})
- })
}
autoInput1();
@@ -113,7 +111,7 @@
var address = t; //document.getElementById('address').value;
geocoder1.getLocation(address, function(status, result) {
if (status === 'complete'&&result.geocodes.length) {
- console.log(result);
+ // console.log(result);
var lnglat = result.geocodes[0].location;
TOrderInfoDlg.startAddress = {
name: t,
@@ -135,7 +133,26 @@
map1.on('click', function(e) {
- console.log(e,'e')
+
+ var lnglatXY = [e.lnglat.getLng(), e.lnglat.getLat()];
+ geocoder1.getAddress(lnglatXY, function (status, result) {
+ if (status === 'complete' && result.info === 'OK') {
+ // console.log(result,'result')
+
+ var address = result.regeocode.formattedAddress;
+ // console.log(address,'address');
+ TOrderInfoDlg.startAddress = {
+ name: address,
+ address: result.regeocode.addressComponent.province+result.regeocode.addressComponent.city+result.regeocode.addressComponent.district,
+ lat: e.lnglat.getLat(),
+ lon: e.lnglat.getLng(),
+ };
+ document.getElementById('tipinput1').value = address;
+ } else {
+ log.error('根据坐标查询地址失败');
+ }
+ });
+ // console.log(e,'e')
ln = e.lnglat.getLng();
lt = e.lnglat.getLat();
if (marker1){
@@ -166,7 +183,7 @@
autoComplete.search(keywords, function(status, result) {
$(".amap-sug-result-two").html("");
$(".amap-sug-result-two").show();
- console.log(result.info);
+ // console.log(result.info);
for(const key in result.tips){
$(".amap-sug-result-two").append('<div class="auto-item amapaddr" id="amap-sug4" onclick="javascript:geoCode2(\''+result.tips[key].name+'\', \''+result.tips[key].district+ result.tips[key].address+'\');">' + result.tips[key].name+ " <span style='color: darkgray;margin-left: 13px;'>" + result.tips[key].district+ result.tips[key].address+ " </span></div>");
}
@@ -189,8 +206,6 @@
var address = t; //document.getElementById('address').value;
geocoder2.getLocation(address, function(status, result) {
if (status === 'complete'&&result.geocodes.length) {
- console.log(t);
- console.log(result);
var lnglat = result.geocodes[0].location;
TOrderInfoDlg.endAddress = {
name: t,
@@ -211,7 +226,24 @@
map2.on('click', function(e) {
- console.log(e,'e');
+
+ var lnglatXY = [e.lnglat.getLng(), e.lnglat.getLat()];
+ geocoder2.getAddress(lnglatXY, function (status, result) {
+ if (status === 'complete' && result.info === 'OK') {
+
+ var address = result.regeocode.formattedAddress;
+ TOrderInfoDlg.endAddress = {
+ name: address,
+ address: result.regeocode.addressComponent.province+result.regeocode.addressComponent.city+result.regeocode.addressComponent.district,
+ lat: e.lnglat.getLat(),
+ lon: e.lnglat.getLng(),
+ };
+ document.getElementById('tipinput2').value = address;
+ } else {
+ log.error('根据坐标查询地址失败');
+ }
+ });
+
ln = e.lnglat.getLng();
lt = e.lnglat.getLat();
--
Gitblit v1.7.1