From ac19ae903dd740bdaf1499ae40ef4039fdb4e6ad Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Fri, 31 Mar 2023 22:00:21 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

---
 src/components/mapSearchBox/index.vue |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/components/mapSearchBox/index.vue b/src/components/mapSearchBox/index.vue
index b46175b..12d189d 100644
--- a/src/components/mapSearchBox/index.vue
+++ b/src/components/mapSearchBox/index.vue
@@ -94,6 +94,8 @@
         },
 
         clearSearchValue () {
+            this.$store.commit('SET_MAPSEARCHPOPUP', false)
+
             this.$EventBus.$emit('mapRemoveLayer', {
                 layerName: 'searchLayer',
                 type: 'VectorLayer'
@@ -120,6 +122,7 @@
         },
 
         searchExtensivelyVlaClick (item) {
+            this.$store.commit('SET_MAPSEARCHPOPUP', false)
             this.searchExtensivelyValBoxShow = false
             this.isClickValBox = true
 
@@ -133,17 +136,26 @@
                 layerName: 'searchLayer',
                 type: 'VectorLayer'
             })
-            this.$EventBus.$emit('layerPointAdd', {
-                layerName: 'searchLayer',
-                type: 'label',
-                params: {
-                    lng: `${item.location.lng}`,
-                    lat: `${item.location.lat}`,
-                    alt: 1,
-                    text: item.name,
-                    fontColor: global.DC.Color.ORANGE,
-                }
+
+            this.$store.commit('SET_MAPSEARCHPOPUP', true)
+
+            this.$store.commit('SET_MAPSEARCHPOPUPDATA', {
+                ...item
             })
+
+            var popup = new global.DC.DivForms(global.viewer, {
+                domId: 'mapSearchPopup',
+                position: [
+                    global.DC.Transform.transformWGS84ToCartesian(
+                        new global.DC.Position(
+                            Number(item.location.lng),
+                            Number(item.location.lat),
+                            0
+                        )
+                    )
+                ]
+            })
+
             this.$EventBus.$emit('layerPointAdd', {
                 layerName: 'searchLayer',
                 type: "billboard",
@@ -158,6 +170,8 @@
     },
 
     destroyed () {
+        this.$store.commit('SET_MAPSEARCHPOPUP', false)
+
         this.$EventBus.$emit('mapRemoveLayer', {
             layerName: 'searchLayer',
             type: 'VectorLayer'

--
Gitblit v1.9.3