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 | 74 +++++++++++++++++++-----------------
1 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/src/components/leftNav/index.vue b/src/components/leftNav/index.vue
index aa93894..c5c5807 100644
--- a/src/components/leftNav/index.vue
+++ b/src/components/leftNav/index.vue
@@ -52,65 +52,65 @@
{
flag: true,
label: '标签',
- img: '/zhxy/img/leftnav/tag-checked.png',
- normal: '/zhxy/img/leftnav/tag.png',
- checked: '/zhxy/img/leftnav/tag-checked.png',
+ img: '/zhjg/img/leftnav/tag-checked.png',
+ normal: '/zhjg/img/leftnav/tag.png',
+ checked: '/zhjg/img/leftnav/tag-checked.png',
layer: 'leftTagLayer'
},
{
- flag: true,
+ flag: false,
label: '道路',
- img: '/zhxy/img/leftnav/way-checked.png',
- normal: '/zhxy/img/leftnav/way.png',
- checked: '/zhxy/img/leftnav/way-checked.png',
+ img: '/zhjg/img/leftnav/way.png',
+ normal: '/zhjg/img/leftnav/way.png',
+ checked: '/zhjg/img/leftnav/way-checked.png',
layer: 'leftWayLayer'
},
{
flag: false,
label: '实景',
- img: '/zhxy/img/leftnav/scene.png',
- normal: '/zhxy/img/leftnav/scene.png',
- checked: '/zhxy/img/leftnav/scene-checked.png',
+ img: '/zhjg/img/leftnav/scene.png',
+ normal: '/zhjg/img/leftnav/scene.png',
+ checked: '/zhjg/img/leftnav/scene-checked.png',
layer: 'leftSceneLayer'
},
// {
// flag: false,
// label: '监控',
- // img: '/zhxy/img/leftnav/monitor.png',
- // normal: '/zhxy/img/leftnav/monitor.png',
- // checked: '/zhxy/img/leftnav/monitor-checked.png',
+ // img: '/zhjg/img/leftnav/monitor.png',
+ // normal: '/zhjg/img/leftnav/monitor.png',
+ // checked: '/zhjg/img/leftnav/monitor-checked.png',
// layer: 'leftMonitorLayer'
// },
{
flag: false,
label: '活动',
- img: '/zhxy/img/leftnav/activity.png',
- normal: '/zhxy/img/leftnav/activity.png',
- checked: '/zhxy/img/leftnav/activity-checked.png',
+ img: '/zhjg/img/leftnav/activity.png',
+ normal: '/zhjg/img/leftnav/activity.png',
+ checked: '/zhjg/img/leftnav/activity-checked.png',
layer: 'leftActivityLayer'
},
// {
// flag: false,
// label: 'AED',
- // img: '/zhxy/img/leftnav/aed.png',
- // normal: '/zhxy/img/leftnav/aed.png',
- // checked: '/zhxy/img/leftnav/aed-checked.png',
+ // img: '/zhjg/img/leftnav/aed.png',
+ // normal: '/zhjg/img/leftnav/aed.png',
+ // checked: '/zhjg/img/leftnav/aed-checked.png',
// layer: 'leftAedLayer'
// },
{
- flag: true,
+ flag: false,
label: '停车',
- img: '/zhxy/img/leftnav/park-checked.png',
- normal: '/zhxy/img/leftnav/park.png',
- checked: '/zhxy/img/leftnav/park-checked.png',
+ img: '/zhjg/img/leftnav/park.png',
+ normal: '/zhjg/img/leftnav/park.png',
+ checked: '/zhjg/img/leftnav/park-checked.png',
layer: 'leftParkLayer'
},
{
flag: true,
label: '出入',
- img: '/zhxy/img/leftnav/come-checked.png',
- normal: '/zhxy/img/leftnav/come.png',
- checked: '/zhxy/img/leftnav/come-checked.png',
+ img: '/zhjg/img/leftnav/come-checked.png',
+ normal: '/zhjg/img/leftnav/come.png',
+ checked: '/zhjg/img/leftnav/come-checked.png',
layer: 'leftComeLayer'
}
]
@@ -210,7 +210,7 @@
${item.mechanismname}
</div>
<div class="tag-angle-content">
- <img src="/zhxy/img/icon/tarrow_xq.png">
+ <img src="/zhjg/img/icon/tarrow_xq.png">
</div>
</div>
`
@@ -351,7 +351,7 @@
${item.mechanismname}
</div>
<div class="tag-angle-content">
- <img src="/zhxy/img/icon/tarrow_xq.png">
+ <img src="/zhjg/img/icon/tarrow_xq.png">
</div>
</div>
`
@@ -418,7 +418,7 @@
${item.roadname}
</div>
<div class="way-sign-box">
- <img src="/zhxy/img/icon/roadsign3.png">
+ <img src="/zhjg/img/icon/roadsign3.png">
</div>
</div>
`
@@ -427,6 +427,8 @@
divIcon.attr.params = item
LeftNavLayer.leftWayLayer.addOverlay(divIcon)
+
+ LeftNavLayer.leftWayLayer.show = false
})
})
@@ -461,7 +463,7 @@
`
<div class="monitor-entitys-box">
<div>${item.vrname}</div>
- <img class="monitor-entitys-box" src="/zhxy/img/leftnav/map-monitor.png" alt="">
+ <img class="monitor-entitys-box" src="/zhjg/img/leftnav/map-monitor.png" alt="">
</div>
`
)
@@ -557,7 +559,7 @@
`
<div class="scene-entitys-box">
<div>${item.vrname}</div>
- <img src="/zhxy/img/leftnav/map-panorama.png" alt="">
+ <img src="/zhjg/img/leftnav/map-panorama.png" alt="">
</div>
`
)
@@ -672,7 +674,7 @@
const billboard = new global.DC.Billboard(
new global.DC.Position(Number(siteJd), Number(siteWd), 0),
- '/zhxy/img/leftnav/map-aed.png'
+ '/zhjg/img/leftnav/map-aed.png'
)
billboard.size = [20, 20]
@@ -718,10 +720,10 @@
</div>
<div class="park-sign-box">
<div>
- <img src="/zhxy/img/icon/p-biao.png" width="14" height="14" alt="${item.mechanismname}" title="${item.mechanismname}">
+ <img src="/zhjg/img/icon/p-biao.png" width="14" height="14" alt="${item.mechanismname}" title="${item.mechanismname}">
</div>
<div>
- <img src="/zhxy/img/icon/roadsign.png" width="5" height="21">
+ <img src="/zhjg/img/icon/roadsign.png" width="5" height="21">
</div>
</div>
</div>
@@ -731,6 +733,8 @@
divIcon.attr.params = item
LeftNavLayer.leftParkLayer.addOverlay(divIcon)
+
+ LeftNavLayer.leftParkLayer.show = false
})
})
@@ -779,7 +783,7 @@
const billboard = new global.DC.Billboard(
new global.DC.Position(Number(obj.lng), Number(obj.lat), 0),
- '/zhxy/img/leftnav/map-activity.png'
+ '/zhjg/img/leftnav/map-activity.png'
)
billboard.size = [20, 20]
billboard.setStyle({
--
Gitblit v1.9.3