From bf5ba56e8a82f0ef699f2eae413d0dc2c4e4f67d Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Tue, 25 Oct 2022 16:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web into master
---
src/components/leftNav/index.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index cc3796e..c5c5807 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -5,10 +5,12 @@
<img :src="item.img" alt />
<span>{{ item.label }}</span>
</li>
- <li class="addIcons" @click="addIcons">
- <!-- <img :style="[imgStyle]" :src="item.img" alt="" /> -->
+
+ <!-- img在下面这个标签中 -->
+ <!-- <img :style="[imgStyle]" :src="item.img" alt="" /> -->
+ <!-- <li class="addIcons" @click="addIcons">
<span>+</span>
- </li>
+ </li>-->
</ul>
</div>
</template>
@@ -104,9 +106,9 @@
layer: 'leftParkLayer'
},
{
- flag: false,
+ flag: true,
label: '出入',
- img: '/zhjg/img/leftnav/come.png',
+ img: '/zhjg/img/leftnav/come-checked.png',
normal: '/zhjg/img/leftnav/come.png',
checked: '/zhjg/img/leftnav/come-checked.png',
layer: 'leftComeLayer'
@@ -118,7 +120,19 @@
},
mounted () {
// 初始化新增标签图层
+
// this.$store.commit("createAddIconsLayerIconLayer", { viewer: global.viewer });
+ const that = this
+ this.$EventBus.$on('closeTagLayer', () => {
+ that.leftNavData.forEach(item => {
+ if (item.layer && item.flag == true) {
+ item.flag = false
+ item.img = item.normal
+
+ LeftNavLayer[item.layer].show = false
+ }
+ })
+ })
},
watch: {
addIconsLayerIconPopup () {
@@ -413,8 +427,9 @@
divIcon.attr.params = item
LeftNavLayer.leftWayLayer.addOverlay(divIcon)
+
+ LeftNavLayer.leftWayLayer.show = false
})
- LeftNavLayer.leftWayLayer.show = false
})
getMonitorList().then((res) => {
@@ -701,6 +716,7 @@
`
<div class="park-entitys-box">
<div class="park-title" alt="${item.mechanismname}">
+ ${item.mechanismname}
</div>
<div class="park-sign-box">
<div>
@@ -717,8 +733,9 @@
divIcon.attr.params = item
LeftNavLayer.leftParkLayer.addOverlay(divIcon)
+
+ LeftNavLayer.leftParkLayer.show = false
})
- LeftNavLayer.leftParkLayer.show = false
})
getLifeList({ lifetype: 12 }).then((res) => {
@@ -777,7 +794,6 @@
LeftNavLayer.leftComeLayer.addOverlay(billboard)
})
- LeftNavLayer.leftComeLayer.show = false
})
},
--
Gitblit v1.9.3