From 0ae912e7296a6c2c7178b6560cd1984900a1e75b Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 20 Sep 2022 16:43:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

---
 src/components/map/index.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index ed6a2d7..8698f2f 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -2,7 +2,7 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2022-08-18 17:00:30
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-09-20 15:05:14
+ * @LastEditTime: 2022-09-20 16:25:50
  * @FilePath: \srs-police-affairs\src\components\map\index.vue
  * @Description: 公用地图组件
  * 
@@ -313,7 +313,7 @@
         // 注册事件
 
         // 使用示例
-        // this.$EventBus.emit('mapAddLayer', {
+        // this.$EventBus.$emit('mapAddLayer', {
         //     layerName: 'housingEstateLayer',
         //     type: 'VectorLayer'
         // })
@@ -333,7 +333,8 @@
 
         this.$EventBus.$on('layerPointAdd', (params) => {
             // eslint-disable-next-line no-unused-vars
-            that.layerPointAdd(params.layerName, params.type, params.params, params.incident = (e) => { })
+            console.log(params.incident)
+            that.layerPointAdd(params.layerName, params.type, params.params, params.incident)
         })
 
         this.$EventBus.$on('layerPolygonAdd', (params) => {
@@ -351,12 +352,12 @@
 
         this.$EventBus.$on('addMxTileset', (params) => {
             // eslint-disable-next-line no-unused-vars
-            that.addMxTileset(params.titlesetName, params.titlesetUrl, params.incident = (e) => { })
+            that.addMxTileset(params.titlesetName, params.titlesetUrl, params.incident)
         })
 
         this.$EventBus.$on('removeMxTileset', (params) => {
             // eslint-disable-next-line no-unused-vars
-            that.removeMxTileset(params.titlesetName, params.incident = (e) => { })
+            that.removeMxTileset(params.titlesetName, params.incident)
         })
     },
 
@@ -459,7 +460,7 @@
          * @param {*} params 添加的点位参数(内容、详情)
          * @param {*} incident 添加的点位事件
          */
-        layerPointAdd (layerName, type, params, incident) {
+        layerPointAdd (layerName, type, params, incident = (e) => { }) {
             if (!layersObjcect[layerName] || layersObjcect[layerName] == null) {
                 this.mapAddLayer(layerName, 'VectorLayer')
             }
@@ -553,7 +554,7 @@
          * @param {*} titlesetUrl 模型地址
          * @param {*} incident 模型点击事件
          */
-        addMxTileset (titlesetName, titlesetUrl, incident) {
+        addMxTileset (titlesetName, titlesetUrl, incident = (e) => { }) {
             if (!tilesetObject[titlesetName]) tilesetObject[titlesetName] = null
 
             tilesetObject[titlesetName] = new global.DC.Tileset(titlesetUrl, {
@@ -579,7 +580,7 @@
          * @param {*} titlesetName 图层名称
          * @param {*} incident 模型点击事件
          */
-        removeMxTileset (titlesetName, incident) {
+        removeMxTileset (titlesetName, incident = (e) => { }) {
             if (tilesetObject[titlesetName] && tilesetObject[titlesetName] != null) {
                 tilesetObject[titlesetName].off(global.DC.MouseEventType.CLICK, incident)
                 tilesetLayer.removeOverlay(tilesetObject[titlesetName])

--
Gitblit v1.9.3