From f4cb66a062b4d0852a6f01bbcb2f40014cd7fbaf Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Tue, 22 Nov 2022 14:51:18 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=A7=86=E9=A2=91=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/home/infrastructureApplication.vue | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue index 7413b856..9787ccb7 100644 --- a/front/src/views/home/infrastructureApplication.vue +++ b/front/src/views/home/infrastructureApplication.vue @@ -2,7 +2,7 @@ * @Author: Light * @Date: 2022-11-18 11:53:43 * @LastEditors: Light - * @LastEditTime: 2022-11-22 11:57:18 + * @LastEditTime: 2022-11-22 14:50:32 * @Description: 告诉大家这是什么 --> diff --git a/front/src/views/home/infrastructurePageXha.vue b/front/src/views/home/infrastructurePageXha.vue index 35517f96..f7acb9ef 100644 --- a/front/src/views/home/infrastructurePageXha.vue +++ b/front/src/views/home/infrastructurePageXha.vue @@ -621,8 +621,30 @@ :title="'视频监控点选择'" footer={null} > +
+
+ +
+
+ {{ userInfo.usernameShow }} +
+
+ {{ userInfo.realNameShow }} +
+
+ {{ userInfo.usernameShow }} +
+
+ {{ userInfo.realNameShow }} +
- + +
+
+ @@ -2244,6 +2266,8 @@ //地图视频操作弹窗 const operationPopupFlag = ref(false)//地图操作弹窗显示标志位 + //是否为视频选择地图弹窗 + const selectedFlag = ref(false) diff --git a/front/src/views/home/infrastructurePageXha.vue b/front/src/views/home/infrastructurePageXha.vue index 1da0d6ac..c6d30453 100644 --- a/front/src/views/home/infrastructurePageXha.vue +++ b/front/src/views/home/infrastructurePageXha.vue @@ -621,6 +621,7 @@ :title="'视频监控点选择'" destroyOnClose footer="{null}" + @cancel="handleCancel" >
- +
@@ -2269,6 +2270,14 @@ const operationPopupFlag = ref(false)//地图操作弹窗显示标志位 //是否为视频选择地图弹窗 const selectedFlag = ref(false) + //地图弹窗默认索引 + const resetFlag = ref(false) + + //地图弹窗右上角按钮关闭事件 + const handleCancel = () => { + //console.log('是否关'); + resetFlag.value = true + } From c05ed0616ccc5028a5142dc03a6687d6f611af08 Mon Sep 17 00:00:00 2001 From: chenchenzai Date: Tue, 22 Nov 2022 17:30:39 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E8=A7=86=E9=A2=91=E6=95=B0=E6=8D=AE=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/supermap/advance-init.js | 2 +- front/src/supermap/map-showResource.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/supermap/advance-init.js b/front/src/supermap/advance-init.js index ef06a789..7e90c4e3 100644 --- a/front/src/supermap/advance-init.js +++ b/front/src/supermap/advance-init.js @@ -1678,7 +1678,6 @@ export function MapFun(mapObj) { _removeLayerByLayerName(layerName) let selectedLayerList = []; let layers = null; - let clickDataList = []; // 判断是否是聚合图层 layers = createMarkerClusterLayer('', map) const icon1 = createDefaultFeatureStyle({ @@ -1734,6 +1733,7 @@ export function MapFun(mapObj) { // }) // } marker.on('click', e => { + let clickDataList = []; //console.log('点位数据', e) //console.log('点位数据1', e.sourceTarget.resourceData) clickDataList.push(e.sourceTarget.resourceData); diff --git a/front/src/supermap/map-showResource.js b/front/src/supermap/map-showResource.js index 3aab1872..f7d3708f 100644 --- a/front/src/supermap/map-showResource.js +++ b/front/src/supermap/map-showResource.js @@ -83,9 +83,9 @@ function createMarkerClusterLayer(layerClassName, mapObj) { maxClusterRadius: 80, }) markerClusterLayer.on('clusterclick', function(a) { + let clusterList = []; //console.log('cluster ' + a.layer.getAllChildMarkers()); if (a.layer.getAllChildMarkers().length < 50) { - let clusterList = []; for (var i = 0; i < a.layer.getAllChildMarkers().length; i++) { //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].resourceData); //console.log('yyyyyyyyy', a.layer.getAllChildMarkers()[i].fData);