From 08a79b319ac5eba050d4b3ffc16b62d0bdd9182d Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 11 Apr 2023 11:42:46 +0800
Subject: [PATCH] 首页全屏按钮优化
---
src/components/map/index.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index ac8c5bc..e8d0b3f 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -10,23 +10,23 @@
-->
<template>
<div class="viewer-box" id="viewer-container">
- <slot ref="mainContent" name="mainContent"></slot>
- <slot name="showButton"></slot>
+ <slot ref="mainContent" name="mainContent"></slot>
+ <slot name="showButton"></slot>
<div class="over-look-btn">
<el-tooltip content="一键俯视" placement="top" effect="dark">
- <i class="fa fa-eye" style="vertical-align: middle; cursor: pointer" @click="overLookClick"></i>
- </el-tooltip>
+ <i class="fa fa-eye" style="vertical-align: middle; cursor: pointer" @click="overLookClick"></i>
+ </el-tooltip>
</div>
<!-- 全屏控制按钮 -->
<div class="screen-full-btn">
- <!-- <el-tooltip v-if="isFullscreen" content="缩放" placement="top" effect="dark">
- <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
- </el-tooltip> -->
+ <el-tooltip v-if="!isShowHomeContentBtn && isFullscreen" content="缩放" placement="top" effect="dark">
+ <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
+ </el-tooltip>
- <!-- <el-tooltip v-if="!isFullscreen" content="全屏" placement="top" effect="dark">
- <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
- </el-tooltip> -->
- <el-tooltip content="显示/隐藏" placement="top" effect="dark">
+ <el-tooltip v-if="!isShowHomeContentBtn && !isFullscreen" content="全屏" placement="top" effect="dark">
+ <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
+ </el-tooltip>
+ <el-tooltip v-if="isShowHomeContentBtn" content="显示/隐藏" placement="top" effect="dark">
<i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="switchShowHomeContent"></i>
</el-tooltip>
</div>
@@ -162,6 +162,7 @@
import houseDeepDataPopup from './components/houseDeepDataPopup.vue'
import yToolTip from './components/yToolTip.vue'
import createTools from '@/utils/tools/index'
+import { mapGetters } from 'vuex'
export default {
name: 'mapBox',
@@ -188,14 +189,15 @@
},
computed: {
-
+ ...mapGetters([
+ 'isShowHomeContentBtn'
+ ]),
},
mounted () {
if (global.viewer != null) {
global.viewer = null
}
-
const that = this
// 初始化地图
@@ -950,7 +952,6 @@
labelElement.on(global.DC.MouseEventType.CLICK, incident)
} else if (type == 'HeatPoint') {
layersObjcect[layerName].setPositions(params.positions)
- console.log('----------HeatPoint------------', params.positions)
}
},
--
Gitblit v1.9.3