From 08c6ecf506bfc7003894775fe57d98d9b11f3d9e Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期三, 26 二月 2025 11:43:18 +0800
Subject: [PATCH] 地图对话

---
 src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/BasicMap.vue |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/BasicMap.vue b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/BasicMap.vue
index ac47e38..5d42cb7 100644
--- a/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/BasicMap.vue
+++ b/src/components/chat/chatComponents/summaryCom/components/recordSetTable/map/BasicMap.vue
@@ -34,7 +34,7 @@
 				</div>
 			</div>
 		</div>
-		<LayerControl v-if="olMap" :olMap="olMap" class="absolute top-3 left-3 z-10" />
+		<!-- <LayerControl v-if="olMap" :olMap="olMap" class="absolute top-3 left-3 z-10" /> -->
 
 		<!-- <PropertyPanel class="absolute top-14 left-10 z-14"></PropertyPanel> -->
 		<PanelTool
@@ -47,7 +47,8 @@
 			:isFullscreen="isFullscreen"
 			@toggleFullScreen="toggleFullScreen"
 		></PanelTool>
-		<!-- <el-button class="absolute top-3 right-4" @click="changeTheme" type="primary">鍒囨崲涓婚</el-button> -->
+
+		<Search class="absolute top-0 left-2 z-14 w-fit" :olMap="olMap" :propertyMap="propertyMap"  :propertyConfigMap="propertyConfigMap"/>
 	</div>
 </template>
 
@@ -70,6 +71,7 @@
 import equipPic from './img/equip.svg';
 import LayerControl from './LayerControl.vue';
 import PanelTool from './panelTool/index.vue';
+import Search from './Search.vue';
 import {
 	getMapDrawStyles,
 	getMapLayerGroupList,
@@ -93,22 +95,24 @@
 		data: any;
 		config?: {
 			sourceType: GaoDeSourceType;
-			markerIsVisible: boolean;
 		};
 		isFullscreen: boolean;
 	}>(),
 	{
 		config: () => ({
 			sourceType: GaoDeSourceType.Vector,
-			markerIsVisible: true,
 		}),
 	}
 );
 
+const locationCurrent = () => {
+	olMap.value.locationCurrent();
+};
+
 const colsArray = computed(() => {
 	return props.data.cols ?? [];
 });
-const emit = defineEmits(['markerClick', 'closeInfoWindow','toggleFullScreen']);
+const emit = defineEmits(['markerClick', 'closeInfoWindow', 'toggleFullScreen']);
 
 const toggleFullScreen = () => {
 	emit('toggleFullScreen');
@@ -267,7 +271,7 @@
 
 const handleVectorTileClick = (feature, layer) => {
 	panelToolRef.value.featureClick(feature);
-	feature &&  panelToolRef.value.setActivePanel(MapPanelTool.Property);
+	feature && panelToolRef.value.setActivePanel(MapPanelTool.Property);
 	// setActiveStyle(feature,layer);
 };
 const propertyMap = ref({});
@@ -402,7 +406,6 @@
 const getDrawStyles = async () => {
 	const res = await getMapDrawStyles();
 	const styleList = res?.values ?? [];
-	// console.log("馃殌 ~ styleList:", styleList)
 	olMap.value.setDrawStyles(styleList);
 };
 
@@ -437,7 +440,6 @@
 	await getDrawStyles();
 	const res = await getMapLayersByPost();
 	const layers = reverse(res?.layers ?? []);
-	if (layers.length === 0) return;
 	const layerModels = [];
 	for (const item of layers) {
 		const styleFunc = olMap.value.unsupportedLayers.includes(item.id) ? undefined : layerStyleFunc;
@@ -449,6 +451,8 @@
 	getGroupList().then((groupList) => {
 		olMap.value.setAllLayers(layerModels, layers, groupList);
 	});
+	if (layers.length === 0) return;
+
 	getThemeList();
 	getPropertyList();
 	olMap.value.on('featureChange', handleVectorTileClick);
@@ -457,7 +461,6 @@
 	olMap.value = new OLMap({
 		container: containerRef.value,
 		sourceType: props.config?.sourceType,
-		markerIsVisible: props.config?.markerIsVisible,
 	});
 
 	addMarkerLayer();

--
Gitblit v1.9.3