From 7a8c8edc0b4f78a0b7b6cedd2fcba7a3262f0b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F?= <736883394@qq.com>
Date: Wed, 30 Apr 2025 14:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/devops/bikesite/bikesite-info.vue   |  1 +
 .../pages/devops/bikesite/bikesite-list.css   |  2 +-
 ebike-maintenance/pages/map/map-bikesite.vue  | 61 ++++++++++++-------
 ebike-maintenance/utils/map.js                |  4 +-
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue b/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue
index 7e89b47..42dba63 100644
--- a/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue
+++ b/ebike-maintenance/pages/devops/bikesite/bikesite-info.vue
@@ -210,6 +210,7 @@
 			} = arrPoint[0];
 			if (type == "add") {
 				map.reverseGeocoder(qqmapsdk, longitude, latitude, (res) => {
+						console.log("3333333333333","reverseGeocoder",longitude, latitude,res)
 					const {
 						formatted_addresses: {
 							recommend
diff --git a/ebike-maintenance/pages/devops/bikesite/bikesite-list.css b/ebike-maintenance/pages/devops/bikesite/bikesite-list.css
index 115773d..16b2e06 100644
--- a/ebike-maintenance/pages/devops/bikesite/bikesite-list.css
+++ b/ebike-maintenance/pages/devops/bikesite/bikesite-list.css
@@ -20,7 +20,7 @@
 }
 
 .divSearchCel {
-	line-height: 3px;
+	line-height: 5px;
 	margin-left: 5px;
 }
 
diff --git a/ebike-maintenance/pages/map/map-bikesite.vue b/ebike-maintenance/pages/map/map-bikesite.vue
index fbcbc3a..8ec6f2b 100644
--- a/ebike-maintenance/pages/map/map-bikesite.vue
+++ b/ebike-maintenance/pages/map/map-bikesite.vue
@@ -1,7 +1,8 @@
 <template>
 	<div :style="{width:'100vw',height}">
-		<map id="mapRef" ref="mapRef" :style="{width:'100vw',height}" show-location :markers="markers"
-			:polygons="polygons" :circles="circles" :polyline="polyline" :scale="scale" @tap="mapTap" />
+		<map id="mapRef" ref="mapRef" :style="{width:'100vw',height}" show-location :longitude="mapcenter.longitude"
+			:latitude="mapcenter.latitude" :markers="markers" :polygons="polygons" :circles="circles"
+			:polyline="polyline" :scale="scale" @tap="mapTap" />
 		<div class="divNav">
 
 		</div>
@@ -84,6 +85,10 @@
 	const title = ref("新建站点");
 	let isload = false;
 	let oMap = null;
+	const mapcenter = ref({
+		longitude: "",
+		latitude: ""
+	})
 	const scale = ref(18);
 	const polygons = ref([]);
 	const circles = ref([]);
@@ -301,10 +306,10 @@
 
 	function loadOperation(callback) {
 		console.log("666666666666666666666", "行政区划", zoneId);
-		
+
 		map.getOperation(zoneId, (res) => {
 			if (!res) {
-			 if(callback)	callback();
+				if (callback) callback();
 				return;
 			}
 			const {
@@ -314,7 +319,7 @@
 				arrData
 			} = res;
 			if (arrRegionID.length == 0) {
-			 if(callback)	callback();
+				if (callback) callback();
 				return;
 			}
 
@@ -325,7 +330,7 @@
 			};
 
 			map.getRegionData(arrRegionID, (res) => {
-				console.log("11111111111getRegionData",res);
+				console.log("11111111111getRegionData", res);
 				const {
 					arrData,
 					arrCircles: arrCircles_region,
@@ -363,7 +368,7 @@
 
 				markers.value = arrMarker;
 				showMapSite(showRegion.value);
-				 if(callback) callback();
+				if (callback) callback();
 			})
 		})
 	}
@@ -375,7 +380,10 @@
 				latitude,
 				longitude
 			} = res;
-
+			mapcenter.value={
+				latitude,
+				longitude
+			};
 		})
 	}
 
@@ -394,8 +402,8 @@
 			arrCirclesData,
 			arrPolygonsData
 		} = regionData;
-		const arrEditC=[];
-		const arrEditP=[];
+		const arrEditC = [];
+		const arrEditP = [];
 		if (showSite) {
 			if (editId) { //编辑
 				const obj = {
@@ -403,34 +411,42 @@
 				};
 				console.log("9999999999999999999999arrCirclesData, arrPolygonsData", arrCirclesData, arrPolygonsData);
 				let index = findIndex(arrCirclesData, obj);
-				
+
 				if (index > -1) {
-					const {latitude,longitude}=arrCircles_region[index];
+					const {
+						latitude,
+						longitude
+					} = arrCircles_region[index];
 					arrCirclesData.splice(index, 1);
 					arrCircles_region.splice(index, 1);
-					arrEditC.push(map.addCirle(drawColor,drawFillColor,longitude,latitude,radius.value));
+					arrEditC.push(map.addCirle(drawColor, drawFillColor, longitude, latitude, radius.value));
 				} else {
 					index = findIndex(arrPolygonsData, obj);
-					if(index>-1){
-						const {points:arrPoint}=arrPolygons_region[index];
+					if (index > -1) {
+						const {
+							points: arrPoint
+						} = arrPolygons_region[index];
 						arrPolygonsData.splice(index, 1);
 						arrPolygons_region.splice(index, 1);
-						arrEditP.push(map.addPolygon(drawColor,drawFillColor,arrPoint))
+						arrEditP.push(map.addPolygon(drawColor, drawFillColor, arrPoint))
 					}
 				}
 			}
-			polygons.value = [...arrPolygons, ...arrPolygons_region,...arrEditP];
-			circles.value = [...arrCircles, ...arrCircles_region,...arrEditC];
+			polygons.value = [...arrPolygons, ...arrPolygons_region, ...arrEditP];
+			circles.value = [...arrCircles, ...arrCircles_region, ...arrEditC];
 		} else {
 			polygons.value = arrPolygons;
 			circles.value = arrCircles;
 		}
 	}
-	
+
 
 
 	function defualtZoom() {
-		if (polygons.value.length == 0) return;
+		console.log("888888888888888888defualtZoom", polygons.value)
+		if (polygons.value.length == 0) {
+			return;
+		}
 		const arrPoint = polygons.value[0].points;
 		oMap.includePoints({
 			points: arrPoint,
@@ -455,11 +471,12 @@
 		oMap = map.getMap("mapRef", getCurrentInstance());
 		//oMap.moveToLocation();
 		isload = true;
+		getLocation();
 		defualtZoom();
 	});
 
 	onLoad(options => {
-		console.log("33333333333333333","options",options)
+		console.log("33333333333333333", "options,isload", options,isload)
 		let title = "站点地图";
 		const {
 			type,
@@ -493,6 +510,8 @@
 		uni.setNavigationBarTitle({
 			title
 		});
+		
+		
 		loadData();
 	});
 </script>
diff --git a/ebike-maintenance/utils/map.js b/ebike-maintenance/utils/map.js
index 79d6477..e188538 100644
--- a/ebike-maintenance/utils/map.js
+++ b/ebike-maintenance/utils/map.js
@@ -56,7 +56,7 @@ export const reverseGeocoder = (qqmapsdk, longitude, latitude, success, fail) =>
 			if (success) success(res.result);
 		},
 		fail: (res) => {
-			if (fail) success(fail);
+			if (fail) fail(res);
 		}
 	})
 }
@@ -233,7 +233,7 @@ export function getOperation(zoneId, callback) {
 			} = item;
 			arrRegionID.push(regionId);
 			const scolor = "#578FD4";
-			const fcolor = "rgba(192,218,245,0.3)";
+			const fcolor = "#c0daf54d";
 			if (shapeType == 1) {
 				const {
 					longitude: lng,