From 242563b76577c8dfa44ceecf1f47d11230fc6bf5 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 04 Apr 2023 15:15:14 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs
---
src/components/map/index.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index b2caaca..5ed5f54 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-04-01 21:45:20
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-04-04 10:14:02
+ * @LastEditTime: 2023-04-04 10:49:27
* @FilePath: \srs-police-affairs\src\components\map\index.vue
* @Description:
*
@@ -94,6 +94,8 @@
<y-tool-tip></y-tool-tip>
<assemble-box></assemble-box>
+
+ <video-row-click-popup></video-row-click-popup>
</div>
</template>
@@ -161,6 +163,7 @@
import mapPopup from './components/mapPopup.vue'
import activityPolicePopup from './components/activityPolicePopup.vue'
import videoListPopup from './components/videoListPopup.vue'
+import videoRowClickPopup from './components/videoRowClickPopup.vue'
import mapSearchPopup from './components/mapSearchPopup.vue'
import houseDeepDataPopup from './components/houseDeepDataPopup.vue'
import yToolTip from './components/yToolTip.vue'
@@ -169,7 +172,7 @@
export default {
name: 'mapBox',
- components: { mapPopup, activityPolicePopup, videoListPopup, mapSearchPopup, houseDeepDataPopup, yToolTip },
+ components: { mapPopup, activityPolicePopup, videoListPopup, mapSearchPopup, houseDeepDataPopup, yToolTip, videoRowClickPopup },
data () {
return {
@@ -748,7 +751,7 @@
if (!layersObjcect[layerName]) layersObjcect[layerName] = null
layersObjcect[layerName] = new global.DC.ClusterLayer(layerName, {
- pixelRange: 4
+ pixelRange: 40
})
layersObjcect[layerName].addTo(global.viewer)
--
Gitblit v1.9.3