From 951aacd10e070d3c9867dbb19404bc470f2e3aad Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 29 Nov 2023 10:20:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/demo' into demo
---
src/pages/page-web/projects/routeLine.vue | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/pages/page-web/projects/routeLine.vue b/src/pages/page-web/projects/routeLine.vue
index a0009e7..47741c7 100644
--- a/src/pages/page-web/projects/routeLine.vue
+++ b/src/pages/page-web/projects/routeLine.vue
@@ -40,6 +40,9 @@
<!-- 地图内弹窗 -->
<div class="popup-box" ref="popup">
+ <div class="popup-title">
+ <span @click="closePopUp">×</span>
+ </div>
<div class="PopUp">
<img :src="currentWayline.photo_url" alt="photo">
<div>
@@ -150,7 +153,6 @@
const billboardSetting = {
...pointOption,
billboard: {
- id: 'start_point_img',
image: 'https://dev.jxpskj.com:8026/cloud-bucket/5abb3b6e-cb42-40e4-b086-9c24db0e8765/DJI_202311171122_004_5abb3b6e-cb42-40e4-b086-9c24db0e8765/DJI_20231117112319_0001_W_%E8%88%AA%E7%82%B91.jpeg',
width: 40,
height: 40,
@@ -215,6 +217,12 @@
// 飞向第一个坐标点
flyTo(pointOption, 4, 1000)
}
+
+const closePopUp = () => {
+ const element: HTMLDivElement | any = document.querySelector('.popup-box') || popup.value
+ element.style.display = 'none'
+}
+
function onScroll (e: any) {
const element = e.srcElement
if (element.scrollTop + element.clientHeight >= element.scrollHeight - 5 && Math.ceil(pagination.total / pagination.page_size) > pagination.page && canRefresh.value) {
@@ -259,19 +267,34 @@
top: 0;
left: 0;
display: none;
+ background-color: #fff;
+ padding-top: 0;
+ border-radius: 5px;
+ box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+ .popup-title {
+ display: flex;
+ justify-content: flex-end;
+ padding: 0 10px;
+ span {
+ text-align: right;
+ cursor: pointer;
+ font-weight: bolder;
+ display: block;
+ width: 25px
+ }
+ }
.PopUp {
width: 250px;
- background-color: #fff;
- padding: 5px;
- border: 1px solid #f5f5f5;
+ padding: 10px;
+ padding-top: 0px;
position: relative;
&::after {
content: '';
position: absolute;
top: calc(50% - 6px);
- left: -9px;
+ left: -12px;
width: 0px;
height: 0px;
border-style: solid;
@@ -290,5 +313,4 @@
overflow: auto;
scrollbar-width: thin;
scrollbar-color: #c5c8cc transparent;
-}
-</style>
+}</style>
--
Gitblit v1.9.3