From 0e461a232cce6e52fbfd071788bdd7294d51e397 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 21 Dec 2021 16:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilemap/index.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 7046ae0..d289e6d 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,8 @@
viewer.use(new DC.Measure());
tileset.setStyle(style);
- layer.addOverlay(tileset);
- viewer.flyTo(tileset);
+ // layer.addOverlay(tileset);
+ // viewer.flyTo(tileset);
tileset.on(DC.MouseEventType.CLICK, (e) => {
// that.popupFlag = true
--
Gitblit v1.9.3