From 75ca0722b86e7751202e7aec2e8d8ef96d68ce98 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 22 Dec 2021 16:22:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilemap/index.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 7046ae0..0b9f4df 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -1,9 +1,11 @@
/* eslint-disable camelcase */
<template>
<div id="mobile-viewer-container">
- <!-- 地图图标弹窗↓ -->
+ <!-- 随地图改变图标弹窗↓ -->
<div id="mobile-map_popup_content"></div>
<mobileWindow></mobileWindow>
+ <!-- 地图固定弹窗 -->
+ <mobileWindowFixed></mobileWindowFixed>
<!-- 地图图标弹窗↑ -->
<!-- 控制↓ -->
<mobileLeftNav ref="mobileLeftNav"></mobileLeftNav>
@@ -43,6 +45,7 @@
"mBigPopupAfter",
"iconHide",
"popupsDom",
+ "MobileWindowsHideFixed",
]),
},
watch: {
@@ -135,7 +138,7 @@
});
that.$refs.mobileLeftNav.initialize(viewer);
that.$store.commit("MSET_VIEWER", viewer);
- that.$store.commit("MSET_DC", DC);
+ // that.$store.commit("MSET_DC", DC);
const popup = viewer.popup;
popup.hide();
@@ -180,7 +183,12 @@
if (!that.iconHide) {
that.$store.commit("MSET_ICONHIDE", true);
}
- that.$store.dispatch("closeMobileWindowsDom"); //关闭弹窗
+ if (!that.MobileWindowsHide) {
+ // that.$store.dispatch("closeMobileWindowsDom"); //关闭随地图弹窗
+ }
+ // if (!that.MobileWindowsHideFixed) {
+ // that.$store.dispatch("CLOSE_WIDOWFIXED"); //关闭固定弹窗
+ // }
// if (!that.MobileWindowsHide && that.popupsDom) {
// that.popupsDom.closeOur();
// that.$store.commit("MSET_MOBILEWINDOWSHIDE", true);
@@ -211,8 +219,17 @@
viewer.use(new DC.Measure());
tileset.setStyle(style);
- layer.addOverlay(tileset);
- viewer.flyTo(tileset);
+ // layer.addOverlay(tileset);
+ // viewer.flyTo(tileset);
+ that.$store.dispatch("mapFlyTo", {
+ lntLat: [115.87186406, 28.74449337, 1200],
+ heading: 0,
+ pitch: -45,
+ roll: 0,
+ noOpen: true,
+ });
+ //地图渲染完成执行srore中MSET_CREADE
+ that.$store.dispatch("MSET_CREADE");
tileset.on(DC.MouseEventType.CLICK, (e) => {
// that.popupFlag = true
@@ -221,7 +238,7 @@
viewer.scene.globe.depthTestAgainstTerrain = false;
// console.log(document.getElementById("mobile-map_content_content"));
- console.log(e);
+ // console.log(e);
// 定制化窗体
that.openPopupS(e.position, [e.wgs84Position.lng, e.wgs84Position.lat]);
@@ -250,7 +267,7 @@
let d = {
position,
lntLat,
- query: { ...(query || {}), position, lntLat },
+ query: { ...(query || {}), introduce: position, address: lntLat },
useJWD: true, //仅使用经纬度
};
that.$store.dispatch("setMobileWindows", d);
--
Gitblit v1.9.3