From 8b2fc551d8bee2d2143a36e1e2fcd7e81d051b18 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Sun, 15 Jan 2023 15:21:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/components/map/index.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 0cd4702..a5b43ab 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2022-08-18 17:00:30
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2022-12-30 13:59:43
+ * @LastEditTime: 2023-01-09 10:15:17
* @FilePath: \srs-police-affairs\src\components\map\index.vue
* @Description: 公用地图组件
*
@@ -15,20 +15,37 @@
<!-- 全屏控制按钮 -->
<div class="screen-full-btn">
<el-tooltip v-if="isFullscreen" content="缩放" placement="bottom" effect="dark">
- <i class="fa fa-compress" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
+ <i
+ class="fa fa-compress"
+ style="vertical-align: middle; cursor: pointer"
+ @click="fullscreenchange"
+ ></i>
</el-tooltip>
<el-tooltip v-if="!isFullscreen" content="全屏" placement="bottom" effect="dark">
- <i class="fa fa-expand" style="vertical-align: middle; cursor: pointer" @click="fullscreenchange"></i>
+ <i
+ class="fa fa-expand"
+ style="vertical-align: middle; cursor: pointer"
+ @click="fullscreenchange"
+ ></i>
</el-tooltip>
</div>
<!-- 切换矢量图按钮 -->
- <div class="image-switch-icon-btn" title="切换影像" @mouseover="showImgBtn = true" @mouseleave="showImgBtn = false">
+ <div
+ class="image-switch-icon-btn"
+ title="切换影像"
+ @mouseover="showImgBtn = true"
+ @mouseleave="showImgBtn = false"
+ >
<div class="icon-box">
<img src="/img/base_map.png" alt />
</div>
- <div class="image-switch-img-btn" v-show="showImgBtn" @mouseover="showImgBtn = true"
- @mouseleave="showImgBtn = false">
+ <div
+ class="image-switch-img-btn"
+ v-show="showImgBtn"
+ @mouseover="showImgBtn = true"
+ @mouseleave="showImgBtn = false"
+ >
<div class="img" @click="switchImg">
<span :class="{ on: imgtype == 0 }">影像</span>
</div>
@@ -547,7 +564,7 @@
outlineColor: global.DC.Color.WHITE, // 边框颜色
outlineWidth: 4, // 边框大小，
font: '16px sans-serif',
- pixelOffset: { x: 0, y: -24 },
+ pixelOffset: { x: 0, y: -30 },
distanceDisplayCondition: distanceDisplayCondition
})
pointElement.attrParams = params
--
Gitblit v1.9.3