From 5b5a5a7899a9444665235d96d8d7f2d50fed6a8c Mon Sep 17 00:00:00 2001 From: Jin Lei <jinlei_182@163.com> Date: 星期六, 11 十一月 2023 17:42:58 +0800 Subject: [PATCH] [历史影像]删除之前二维地图,叠加beijing54地图 --- src/components/index.vue | 51 +++++++++++++++++++++++++-------------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/src/components/index.vue b/src/components/index.vue index 7506958..5e8dc2e 100644 --- a/src/components/index.vue +++ b/src/components/index.vue @@ -11,31 +11,20 @@ <img class="searchBtn" src="@/assets/img/right/closeinput1.png" /> </el-button> </div> - <History /> + </div> - <viewer1 - class="mapViewer" - v-if="viewer1Show" - :style="viewer1Style" - @mousemove.native="viewer1MouseMove" - /> - <viewer - class="mapViewer" - :style="viewerStyle" - @mousemove.native="viewerMouseMove" - /> - <div - class="controlPanel" - :style="{ - width: `${size}`, - height: `${size}`, - transform: `scale(${scale}) translate(${offset},${offset})`, - '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`, - '-moz-transform': `scale(${scale}) translate(${offset},${offset})`, - '-o-transform': `scale(${scale}) translate(${offset},${offset})`, - '-ms-transform': `scale(${scale}) translate(${offset},${offset})`, - }" - > + <viewer1 class="mapViewer" :key="switchKey" v-if="viewer1Show" :style="viewer1Style" + @mousemove.native="viewer1MouseMove" /> + <viewer class="mapViewer" ref="mapViewer" :style="viewerStyle" @mousemove.native="viewerMouseMove" /> + <div class="controlPanel" :style="{ + width: `${size}`, + height: `${size}`, + transform: `scale(${scale}) translate(${offset},${offset})`, + '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`, + '-moz-transform': `scale(${scale}) translate(${offset},${offset})`, + '-o-transform': `scale(${scale}) translate(${offset},${offset})`, + '-ms-transform': `scale(${scale}) translate(${offset},${offset})`, + }"> <img @click="changePwd" id="headlog" src="@/assets/img/new/topBar.png" /> <img id="bottomBar" src="@/assets/img/new/bottomBar.png" /> <!-- <el-slider @@ -69,7 +58,6 @@ import bottommenu from "@/components/menu/bottom-menu"; import { mapState, mapMutations } from "vuex"; -import History from "@/components/map/history.vue"; export default { name: "index", @@ -98,6 +86,7 @@ offset: "0%", tooltipInfo: "璇风◢鍚庛�傘�傘��", tooltipShow: false, + switchKey: 0, // viewer1Show: false, }; }, @@ -108,7 +97,7 @@ this.size = size + "%"; }, computed: { - ...mapState(["viewer1Show", "yqfk"]), + ...mapState(["viewer1Show", "isLand", "yqfk"]), showSetting() { return this.$store.state.showSetting; }, @@ -137,6 +126,9 @@ }, changePwd() { console.log(111); + }, + changeMode(mode){ + this.$refs.mapViewer.changeMode(mode); }, detectZoom() { var ratio = 0, @@ -242,11 +234,13 @@ .mapViewer { height: 100%; } + .userinfo { position: absolute; z-index: 20; top: 10px; } + #headlog { width: 965px; height: 70px; @@ -255,6 +249,7 @@ top: 0; transform: translate(-50%, 0); } + #bottomBar { width: 1357px; height: 52px; @@ -263,6 +258,7 @@ bottom: 0; transform: translate(-50%, 0); } + .trigger { pointer-events: all; } @@ -304,6 +300,7 @@ border-radius: 10px; padding: 10px 30px; } + .hisbox { position: absolute; z-index: 10000002; @@ -311,11 +308,13 @@ height: 100%; background-color: #fff; } + .btnbox { position: absolute; z-index: 100000003; right: 30px; } + .btnbox .el-button { padding: 0 !important; font-size: 24px; -- Gitblit v1.9.3