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/viewer1.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/map/viewer1.vue b/src/components/map/viewer1.vue
index a701f99..12d50b4 100644
--- a/src/components/map/viewer1.vue
+++ b/src/components/map/viewer1.vue
@@ -252,7 +252,7 @@
"sdkContainer1",
{
StaticFileBaseUrl: "../../static/CimSDK/",
- // StaticFileBaseUrl: "../../../YZXNCS/static/CimSDK/",
+ // StaticFileBaseUrl: "../../../SW/static/CimSDK/",
},
{},
null,
@@ -528,6 +528,7 @@
},
// 鍒濆鍔犺浇宸叉敞鍐屼紒涓�
showYZCQY() {
+ this.showTDinfo = false;
this.QYbox = !this.QYbox;
this.searchYZCQY("浼佷笟鍚嶇О");
},
@@ -1027,8 +1028,8 @@
position: absolute;
z-index: 999;
top: 20%;
- /* left: 50%; */
- right: -68%;
+ left: 35%;
+ /* right: -68%; */
padding-top: 20px;
width: 401px;
height: 549px;
@@ -1115,7 +1116,8 @@
.aboutDialog /deep/ .el-dialog {
background: rgba(14, 50, 143, 0.7);
- border: 1px solid #205fbc;
+ border: 2px solid #205fbc;
+ border-radius: 10px;
box-shadow: 0px 1px 10px 0px rgba(3, 10, 26, 0.38);
}
--
Gitblit v1.9.3