From 3ea790ec7b0280a55cc406d2c3dc9fa5411a7471 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 20 Jan 2022 17:32:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilemap/index.vue | 58 ++++++++++++++++++++++-------
src/api/mobile/buildsClock/buildsClock.js | 16 ++++++++
src/components/mobileLeftNav/index.vue | 18 +++++++--
src/components/mobileCortrol/index.vue | 2
4 files changed, 75 insertions(+), 19 deletions(-)
diff --git a/src/api/mobile/buildsClock/buildsClock.js b/src/api/mobile/buildsClock/buildsClock.js
new file mode 100644
index 0000000..fe8fe44
--- /dev/null
+++ b/src/api/mobile/buildsClock/buildsClock.js
@@ -0,0 +1,16 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-05-09 15:17:44
+ * @Last Modified by: liu
+ * @Last Modified time: 2022-01-20 16:47:43
+ */
+// 党群机构
+import request from "@/router/axios";
+
+export const getBuildClock = (params) => {
+ return request({
+ url: `/blade-architecture/architecture/detail`,
+ method: "get",
+ params: params,
+ });
+};
diff --git a/src/components/mobileCortrol/index.vue b/src/components/mobileCortrol/index.vue
index cabf0fe..6531e2a 100644
--- a/src/components/mobileCortrol/index.vue
+++ b/src/components/mobileCortrol/index.vue
@@ -15,7 +15,7 @@
:class="{ active: dimension == '2.5D' }"
@click="zoomIn('2.5D')"
>
- 2.5维
+ 3D
</div>
</div>
</template>
diff --git a/src/components/mobileLeftNav/index.vue b/src/components/mobileLeftNav/index.vue
index 768b558..0d05c62 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,
@@ -377,9 +380,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 +432,7 @@
.m-left-coutrol {
position: absolute;
left: -24px;
- top: 96px;
+ top: 79px;
width: 25px;
height: 60px;
background-color: #fff;
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index cc9c4ae..4d2277a 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -34,6 +34,7 @@
</template>
<script>
import axios from "axios";
+import { getBuildClock } from "@/api/mobile/buildsClock/buildsClock"; // 楼栋详情
import { mapGetters } from "vuex";
export default {
name: "mobilemapBox",
@@ -560,20 +561,49 @@
),
});
}
- // 定制化窗体
- that.openPopupS(
- {},
- [e.wgs84SurfacePosition.lng, e.wgs84SurfacePosition.lat],
- {
- name: "楼栋号:" + e.overlay.attr["楼栋号"],
- bgImg:
- "http://223.82.109.183:2081/zhxy/upload/20220105/3c05dd70a9eac17b7e49afbfc7b1b68e.png",
- address: "",
- introduce: "",
- data: e,
- lntLat: [e.wgs84SurfacePosition.lng, e.wgs84SurfacePosition.lat],
- }
- );
+
+ //如果是地图点击建筑，调用接口查详情
+ let ids =
+ e.overlay.attr["楼栋号"] == "8栋"
+ ? "9栋"
+ : e.overlay.attr["楼栋号"] == "9栋"
+ ? "8栋"
+ : e.overlay.attr["楼栋号"];
+ let eIntlat = [
+ e.wgs84SurfacePosition.lng,
+ e.wgs84SurfacePosition.lat,
+ ];
+ getBuildClock({
+ mechanismname: "香琴湾" + ids,
+ }).then((res) => {
+ const item = res.data.data;
+ // data.query.bgImg = ds.mechanismname;
+ // data.query.name = ds.tpurl;
+ // data.query.panoramaurl = ds.panoramaurl;
+ // data.query.bgImg = ds.tpurl;
+ // data.query.bgImg = ds.tpurl;
+ let useData = {
+ name: item.mechanismname,
+ lntLat: eIntlat,
+ alt: item.gd,
+ heading: item.heading,
+ pitch: item.pitch,
+ roll: item.roll,
+ bgImg: item.tpurl,
+ QRImg: item.codeurl,
+ websiteUrl: item.websiteurl,
+ telePhone: item.telephone,
+ address: item.address,
+ introduce: item.introduce,
+ video: item.videourl,
+ buts: ["定位", "实景", "图集"],
+ panoramaurl: item.panoramaurl, //全景
+ };
+ // 定制化窗体
+ // console.log(item, useData, "111111");
+ // return;
+ that.openPopupS({}, eIntlat, useData);
+ });
} else {
if (that.areaLayerSelect.overlay != undefined) {
that.areaLayerSelect.overlay.setStyle({
--
Gitblit v1.9.3