From a191b048401b2a483a5a59ee5290376f3f26e016 Mon Sep 17 00:00:00 2001
From: helloxujingliang <3225043@qq.com>
Date: Mon, 25 Nov 2024 08:28:40 +0800
Subject: [PATCH] merge

---
 src/views/sys/exception/Converge/index.vue           | 2 ++
 src/views/sys/exception/VideoSupervision/map/map.vue | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/sys/exception/Converge/index.vue b/src/views/sys/exception/Converge/index.vue
index 3d37a6dc..48a2a856 100644
--- a/src/views/sys/exception/Converge/index.vue
+++ b/src/views/sys/exception/Converge/index.vue
@@ -804,6 +804,8 @@ import {  GeojsonToWkt } from './src/WktGeojsonTransform';
       center: [118.30207505530701, 35.30123435040745], // 设置中心点坐标
       zoom: 8, // 设置缩放等级
       pitch:0,
+     bearing: 0, 
+     duration: 1000
     });
   };
 
diff --git a/src/views/sys/exception/VideoSupervision/map/map.vue b/src/views/sys/exception/VideoSupervision/map/map.vue
index 53d6a240..d3592f82 100644
--- a/src/views/sys/exception/VideoSupervision/map/map.vue
+++ b/src/views/sys/exception/VideoSupervision/map/map.vue
@@ -38,7 +38,6 @@ import { TableOutlined, GlobalOutlined,HomeOutlined} from '@ant-design/icons-vue
   import YingXiangAddress from './index.json'
   import {serverAddress} from '/public/yingxiangConfig/index.json'
   const {VITE_GLOB_YINGXIANG_SERVER,VITE_GLOB_YAOGANYINGXIANG_SERVER} = getAppEnvConfig();
-  alert(VITE_GLOB_YINGXIANG_SERVER);
   const mapContainerName = ref<String>();
   mapContainerName.value = 'mapContainer-' + generateUUID();
   //