From 076cd08a4abcae33957e4de5b15babfcb6fed8ce Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 15:32:39 +0800
Subject: [PATCH] [viewer]解决合并冲突
---
src/components/map/viewer.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index dd46aed..4255a83 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -67,8 +67,8 @@
window.sgworld = new SmartEarth.EarthCtrl(
"sdkContainer",
{
- StaticFileBaseUrl: "../../../static/CimSDK/",
- // StaticFileBaseUrl: "../../../YZXNCS/static/CimSDK/",
+ // StaticFileBaseUrl: "../../../static/CimSDK/",
+ StaticFileBaseUrl: "../../../YZXNCS/static/CimSDK/",
},
{},
{},
@@ -405,8 +405,8 @@
display: block;
position: absolute;
/*bottom: 120px;*/
- bottom: 13px;
- right: 46px;
+ bottom: 30px;
+ right: 80px;
/* margin-right: -105px; */
z-index: 9999;
border-radius: 10px;
--
Gitblit v1.9.3