From 30205a382338c83461cad4524d9a01f5d3b3cbbb Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Dec 2024 10:13:45 +0800
Subject: [PATCH] 企业应急空间调整
---
src/views/pac/components/box/dataContent.vue | 11 +----
src/views/companyInfo/components/box/unitContent.vue | 2
src/views/companyInfo/components/box/dataContent.vue | 10 ++---
src/styles/base/dc-base.scss | 70 ++++++++++++++++++++++++++++++----
4 files changed, 68 insertions(+), 25 deletions(-)
diff --git a/src/styles/base/dc-base.scss b/src/styles/base/dc-base.scss
index 74835c1..3004572 100644
--- a/src/styles/base/dc-base.scss
+++ b/src/styles/base/dc-base.scss
@@ -85,20 +85,20 @@
&::after {
content: "";
position: absolute;
- bottom: -5px;
+ bottom: -10px;
left: calc(50% - 3px);
display: block;
- width: 10px;
- height: 10px;
- transform: rotate(45deg);
+ width: 0;
+ height: 0;
+ border-left: 10px solid transparent;
+ border-right: 10px solid transparent;
+ border-bottom: 10px solid #69a7e4; // 三角形的颜色
+ transform: rotate(180deg);
z-index: -1;
- // background-color: #3b96ff;
- box-shadow: inset 0 0 40px #409eff;
- // background: linear-gradient(rgb(7 10 203 / 75%), rgb(16 238 220));
}
.marsBlueGradientPnl {
- // padding: 2px 2px;
+ padding: 2px 2px;
text-align: center;
margin: 0;
color: #fff;
@@ -106,7 +106,7 @@
-moz-border-radius: 5px;
border-radius: 5px;
// line-height: 32px;
- width: 360px;
+ width: 112px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@@ -172,6 +172,58 @@
}
}
+.public-map-popup-qy {
+ position: absolute;
+ bottom: 160px;
+ pointer-events: all;
+ display: block;
+ transform-origin: left bottom;
+ transform: translate(-50%, 0px);
+ border-radius: 5px;
+ z-index: auto;
+
+ &::after {
+ content: "";
+ position: absolute;
+ bottom: -10px;
+ left: calc(50% - 3px);
+ display: block;
+ width: 0;
+ height: 0;
+ border-left: 10px solid transparent;
+ border-right: 10px solid transparent;
+ border-bottom: 10px solid #69a7e4; // 三角形的颜色
+ transform: rotate(180deg);
+ z-index: -1;
+ }
+
+ .marsBlueGradientPnl {
+ // padding: 2px 2px;
+ text-align: center;
+ margin: 0;
+ color: #fff;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ // line-height: 32px;
+ width: 360px;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ word-wrap: break-word;
+ font-size: 14px;
+ box-shadow: inset 0 0 40px #409eff;
+ // background: linear-gradient(rgb(7 10 203 / 75%), rgb(16 238 220));
+ }
+
+ .marsBlueGradientPnl img {
+ vertical-align: middle;
+ width: 360px;
+ height: 360px;
+ }
+}
+
.yjwz-height-box {
bottom: 120px;
diff --git a/src/views/companyInfo/components/box/dataContent.vue b/src/views/companyInfo/components/box/dataContent.vue
index 79d6a60..bec0805 100644
--- a/src/views/companyInfo/components/box/dataContent.vue
+++ b/src/views/companyInfo/components/box/dataContent.vue
@@ -57,12 +57,10 @@
let iconEl = ''
if ('showPanel' in item && item.showPanel == false) {
if (item.backgroundIcon) {
- iconEl = `
- <div class="map-name">${i[item.showParams] || i.name}</div>
- <div class="map-icon">
- <img src="${item.backgroundIcon}">
- </div>
- `
+ iconEl = `<div class="map-name">${i[item.showParams] || i.name}</div>
+ <div class="map-icon">
+ <img src="${item.backgroundIcon}">
+ </div>`
}
} else {
iconEl = `<div class="marsBlueGradientPnl"> <div>${i.name}</div> </div>`
diff --git a/src/views/companyInfo/components/box/unitContent.vue b/src/views/companyInfo/components/box/unitContent.vue
index 226d220..dc84d67 100644
--- a/src/views/companyInfo/components/box/unitContent.vue
+++ b/src/views/companyInfo/components/box/unitContent.vue
@@ -69,7 +69,7 @@
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
- `<div class="public-map-popup-two">
+ `<div class="public-map-popup-qy">
${iconEl}
</div>`
)
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index 5e07c9d..010d075 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -43,6 +43,7 @@
const curSelect = ref('1')
let addTileLayers = {}
const handleCheckChange = (row) => {
+ EventBus.emit('flyToyqfw', 'flyToyqfw')
resData.data.forEach(item => {
if (row.value === item.value) {
if (!addTileLayers[item.label]) {
@@ -104,7 +105,6 @@
data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
let iconEl = ''
let divclassName = ''
-
let flag = typeList.find(l => l.type == i.type)
if (flag) {
divclassName = flag.className
@@ -116,12 +116,6 @@
</div>
`
}
- } else {
- iconEl = `<div class="marsBlueGradientPnl">
- <div>${i[i.showParams] || i.name}</div>
- </div>`
- }
-
let divIcon = new DC.DivIcon(
new DC.Position(i.lng, i.lat, i.ele || 64),
`<div class="public-map-popup ${divclassName}">
@@ -132,10 +126,9 @@
let incident = () => { }
if (item.incident) incident = item.incident
-
divIcon.on(DC.MouseEventType.CLICK, incident)
-
addTileLayers[item.label].addOverlay(divIcon)
+ }
})
})
} else {
--
Gitblit v1.9.3