From b97cd191a9386a8cb971d0a2c74e24e6376ccc46 Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Thu, 8 Aug 2024 17:54:53 +0800 Subject: [PATCH] merge --- .../sys/exception/LargeScreenMap/index.vue | 12 +-- src/views/sys/exception/VideoSupervision.vue | 75 +++++++++++++++++++ .../exception/VideoSupervision/map/map.vue | 33 ++++++++ 3 files changed, 114 insertions(+), 6 deletions(-) diff --git a/src/views/sys/exception/LargeScreenMap/index.vue b/src/views/sys/exception/LargeScreenMap/index.vue index 1761d8ce..83c70294 100644 --- a/src/views/sys/exception/LargeScreenMap/index.vue +++ b/src/views/sys/exception/LargeScreenMap/index.vue @@ -66,20 +66,20 @@ const initMap = () => { } }, layers: [ + { - id: 'dianzi', + id: 'dianzi-biaozhu', type: 'raster', - source: 'dianzi', + source: 'dianzi-biaozhu', minzoom: 0, maxzoom: 18, layout: { visibility: 'visible', } - }, - { - id: 'dianzi-biaozhu', + },{ + id: 'dianzi', type: 'raster', - source: 'dianzi-biaozhu', + source: 'dianzi', minzoom: 0, maxzoom: 18, layout: { diff --git a/src/views/sys/exception/VideoSupervision.vue b/src/views/sys/exception/VideoSupervision.vue index fe940f9f..427e721d 100644 --- a/src/views/sys/exception/VideoSupervision.vue +++ b/src/views/sys/exception/VideoSupervision.vue @@ -1,5 +1,10 @@