From 9e43f80d96bda7f1108dcfcfd7340e567f2e48d0 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 23 Dec 2021 13:57:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobileLeftNav/index.vue | 84 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/src/components/mobileLeftNav/index.vue b/src/components/mobileLeftNav/index.vue
index aba8411..a533ef5 100644
--- a/src/components/mobileLeftNav/index.vue
+++ b/src/components/mobileLeftNav/index.vue
@@ -76,7 +76,8 @@
checked: "/img/leftnav/tag-checked.png",
layer: "tagLayer",
methods: getListarchitecture1,
- imgSrc: "img/mobile/pink.png",
+ imgSrc: "https://map.hit.edu.cn/images/tarrow_xq.png",
+ // imgSrc: "img/mobile/pink.png",
},
// {
// flag: false,
@@ -96,7 +97,8 @@
checked: "/img/leftnav/scene-checked.png",
layer: "sceneLayer",
methods: getListarchitecture,
- imgSrc: "img/mobile/blue.png",
+ imgSrc: "img/leftnav/map-panorama.png",
+ // imgSrc: "img/mobile/blue.png",
},
// {
// flag: false,
@@ -116,7 +118,8 @@
checked: "/img/leftnav/aed-checked.png",
layer: "aedLayer",
methods: getListaed,
- imgSrc: "img/mobile/pink.png",
+ imgSrc: "img/leftnav/map-aed.png",
+ // imgSrc: "img/mobile/pink.png",
},
{
flag: false,
@@ -126,7 +129,8 @@
checked: "/img/leftnav/park-checked.png",
layer: "parkLayer",
methods: getListparking,
- imgSrc: "img/mobile/popcorn.png",
+ imgSrc: "https://map.hit.edu.cn/images/p-biao.png",
+ // imgSrc: "img/mobile/popcorn.png",
},
{
flag: false,
@@ -136,7 +140,8 @@
checked: "/img/leftnav/come-checked.png",
layer: "comeLayer",
methods: getListdoor,
- imgSrc: "img/mobile/purple.png",
+ imgSrc: "img/leftnav/map-activity.png",
+ // imgSrc: "img/mobile/purple.png",
},
],
viewer: null,
@@ -202,7 +207,8 @@
// console.log(posi);
this.$store.dispatch("mapFlyTo", {
//飞入
- lntLat: [posi.lng + 0.01187, posi.lat - 0.0308, 4000],
+ lntLat: [posi.lng + 0.00917, posi.lat - 0.0188, 2100],
+ // lntLat: [posi.lng + 0.01187, posi.lat - 0.0308, 4000],
// lntLat: [121.50492752204283, 31.21567802276832, 2530],
heading: 0,
pitch: -45,
@@ -438,24 +444,74 @@
// this.comeLayer["positions"] = positions6;
let ourNum = that.leftNavData.length;
for (let n = 0; n < ourNum; n++) {
- this.leftNavData[n].methods().then((res) => {
+ let ourD = this.leftNavData[n];
+ ourD.methods().then((res) => {
+ let dom;
let data = res.data.data;
let position = that.changePoiton(data);
let num = data.length;
for (let k = 0; k < num; k++) {
- const divIcon = new that.DC.DivIcon(
- position[k],
- `
+ if (ourD.label == "标签") {
+ dom = `
<div class="tag-entitys-box">
<div class="tag-content">
${data[k].mechanismname}
</div>
<div class="tag-angle-content">
- <img src="${this.leftNavData[n].imgSrc}">
+ <img src="${ourD.imgSrc}">
</div>
</div>
- `
- );
+ `;
+ } else if (ourD.label == "实景") {
+ // <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].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>
+ `;
+ } else if (ourD.label == "AED") {
+ dom = `
+ <div class="mobiletag-entitys-box">
+ <div class="tag-content">
+ ${data[k].mechanismname}
+ </div>
+ <div class="tag-angle-content">
+ <img src="${ourD.imgSrc}">
+ </div>
+ </div>
+ `;
+ } else if (ourD.label == "停车") {
+ dom = `
+ <div class="park-entitys-box">
+ <div class="park-title" alt="${data[k].mechanismname}">
+ </div>
+ <div class="park-sign-box">
+ <div>
+ <img src="https://map.hit.edu.cn/images/p-biao.png" width="14" height="14" alt="${data[k].mechanismname}" title="${data[k].mechanismname}">
+ </div>
+ <div>
+ <img src="https://map.hit.edu.cn/images/roadsign.png" width="5" height="21">
+ </div>
+ </div>
+ </div>
+ `;
+ } else if (ourD.label == "出入") {
+ dom = `
+ <div class="mobiletag-entitys-box-pink">
+ <div class="tag-content">
+ ${data[k].mechanismname}
+ </div>
+ <div class="tag-angle-content">
+ <img src="${ourD.imgSrc}">
+ </div>
+ </div>
+ `;
+ }
+ const divIcon = new that.DC.DivIcon(position[k], dom);
//订阅事件
divIcon.on(DC.MouseEventType.CLICK, (e) => {
// console.log(data[k]);
@@ -519,7 +575,7 @@
.m-left-coutrol {
position: absolute;
left: -24px;
- top: 96px;
+ top: 60px;
width: 25px;
height: 60px;
background-color: #fff;
--
Gitblit v1.9.3