From e75a3028891b08bbd3fdbaa6443d6a8f80dd3f31 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 19 Dec 2024 14:59:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/map/components/placeBasePopup.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/components/map/components/placeBasePopup.vue b/src/components/map/components/placeBasePopup.vue
index b402ff3..9885ef9 100644
--- a/src/components/map/components/placeBasePopup.vue
+++ b/src/components/map/components/placeBasePopup.vue
@@ -72,13 +72,11 @@
},
mounted () {
-
if (this.getWidth() > 7000) {
this.scaleDomFlag = true
} else {
this.scaleDomFlag = false
}
-
},
methods: {
@@ -238,8 +236,6 @@
display: flex;
flex-direction: row;
width: calc(100% - 20px);
- height: 30px;
- line-height: 30px;
margin: 0 10px;
text-align: left;
@@ -249,13 +245,16 @@
display: inline-block;
text-align-last: justify;
margin-right: 20px;
+ line-height: 30px;
}
&>div:nth-of-type(2) {
flex: 1;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ max-width: 240px;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ white-space: wrap;
+ line-height: 30px;
}
}
}
--
Gitblit v1.9.3