From cfa95f03007b221f1e00f4bf5cd29c3ccea3a0a7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 09 Feb 2022 10:26:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileLeftNav/index.vue | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/components/mobileLeftNav/index.vue b/src/components/mobileLeftNav/index.vue
index 768b558..1c75245 100644
--- a/src/components/mobileLeftNav/index.vue
+++ b/src/components/mobileLeftNav/index.vue
@@ -9,6 +9,7 @@
v-for="(item, index) in leftNavData"
:key="index"
@click="leftNavClick(item)"
+ v-show="!item.notShow"
>
<img :style="[imgStyle]" :src="item.img" alt="" />
<span>{{ item.label }}</span>
@@ -58,9 +59,10 @@
},
leftNavData: [
{
- flag: false,
+ flag: true,
label: "标签",
- img: "/img/leftnav/tag.png",
+ // img: "/img/leftnav/tag.png",
+ img: "/img/leftnav/tag-checked.png",
normal: "/img/leftnav/tag.png",
checked: "/img/leftnav/tag-checked.png",
layer: "tagLayer",
@@ -121,6 +123,7 @@
type: 9,
imgSrc: "img/leftnav/map-aed.png",
// imgSrc: "img/mobile/pink.png",
+ notShow: true,
},
{
flag: false,
@@ -285,7 +288,7 @@
dom = `
<div class="way-entitys-box">
<div class="way-title" style="border: white 1px solid; padding-left: 2px;font-size: 12px; background: #0066ff; width: 12px;line-height: 13px; padding:2px 1px 2px 1px; color:white;">
- ${data[k].roadname}
+ ${data[k].roadname}
</div>
<div class="way-sign-box">
<img src="https://map.hit.edu.cn/images/roadsign3.png">
@@ -297,12 +300,11 @@
// ${data[k].mechanismname}
// </div>
dom = `
- <div class="way-entitys-box mobile-way-entitys-box">
- <div class="way-sign-box ">
- <img src="img/leftnav/map-panorama.png">
- </div>
+ <div class="scene-entitys-box">
+ <div>${data[k].mechanismname}</div>
+ <img src="/img/leftnav/map-panorama.png" alt="">
</div>
- `;
+ `;
} else if (ourD.label == "AED") {
dom = `
<div class="mobiletag-entitys-box">
@@ -342,15 +344,11 @@
`;
} else if (ourD.label == "监控") {
dom = `
- <div class="mobiletag-entitys-box-pink">
- <div class="tag-content">
- 监控
- </div>
- <div class="tag-angle-content">
- <img src="${ourD.imgSrc}">
- </div>
+ <div class="monitor-entitys-box">
+ <div>${data[k].mechanismname}</div>
+ <img class="monitor-entitys-box" src="/img/leftnav/map-monitor.png" alt="">
</div>
- `;
+ `;
}
const divIcon = new that.DC.DivIcon(position[k], dom);
//订阅事件
@@ -377,9 +375,16 @@
that[that.leftNavData[n].layer].addOverlay(divIcon); //加入图标
}
that[that.leftNavData[n].layer]["positions"] = position;
- that[that.leftNavData[n].layer].show = false;
+ if (that.leftNavData[n].layer == "tagLayer") {
+ // that.leftNavData[n].img = that.leftNavData[n].checked;
+ } else {
+ that[that.leftNavData[n].layer].show = false;
+ }
});
}
+ // setTimeout(() => {
+ // this.tagLayer.show = false;
+ // }, 500);
},
changePoiton(data) {
// console.log(data);
@@ -422,7 +427,7 @@
.m-left-coutrol {
position: absolute;
left: -24px;
- top: 96px;
+ top: 79px;
width: 25px;
height: 60px;
background-color: #fff;
--
Gitblit v1.9.3