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/index.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/components/index.vue b/src/components/index.vue
index cc6fdfb..7506958 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -36,16 +36,15 @@
'-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
}"
>
- <img id="headlog" src="@/assets/img/new/topBar.png" />
+ <img @click="changePwd" id="headlog" src="@/assets/img/new/topBar.png" />
<img id="bottomBar" src="@/assets/img/new/bottomBar.png" />
- <el-slider
+ <!-- <el-slider
class="undergroundAlpha"
v-if="openUnderGround"
v-model="undergroundAlpha"
:show-tooltip="false"
@input="changeAlpha"
- ></el-slider>
-
+ ></el-slider> -->
<right ref="Right" />
<leftpanel ref="Left" />
<menupanel />
@@ -91,7 +90,7 @@
return {
date: "",
undergroundAlpha: 50,
- openUnderGround: false,
+ // openUnderGround: false,
viewerStyle: "",
viewer1Style: "",
size: "100%",
@@ -135,6 +134,9 @@
setMessgae(show, msg) {
this.tooltipShow = show;
this.tooltipInfo = msg ? msg : "";
+ },
+ changePwd() {
+ console.log(111);
},
detectZoom() {
var ratio = 0,
@@ -240,6 +242,11 @@
.mapViewer {
height: 100%;
}
+.userinfo {
+ position: absolute;
+ z-index: 20;
+ top: 10px;
+}
#headlog {
width: 965px;
height: 70px;
--
Gitblit v1.9.3