From ae2fc3a474e43a7e3ff60f427061bfe27b51abb7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 17 Mar 2022 17:33:34 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilemap/index.vue | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 3bf44a4..5a8772e 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -614,9 +614,9 @@
global.viewer.scene.globe.depthTestAgainstTerrain = false;
// console.log(e);
- global.viewer.flyToPosition(
- new global.DC.Position(115.87186406, 28.74449337, 1800, 0, 45, 0)
- );
+ // global.viewer.flyToPosition(
+ // new global.DC.Position(115.87186406, 28.74449337, 1800, 0, 45, 0)
+ // );
// 定制化窗体
that.openPopupS(
@@ -626,9 +626,10 @@
name: e.overlay.attr.name,
address: e.layer._id,
introduce: e.overlay.attr.id,
- data: e,
+ // data: e,
}
);
+ // return;
// 高亮
window.silhouetteBlue.selected = [];
@@ -944,13 +945,13 @@
// 瀑布流↑
// 传入store
- that.$store.commit("MSET_MODEOLS", {
- tilesetLayer: window.tilesetLayer,
- // tileset: window.tileset,
- newLayer: window.newLayer,
- wallLayer: window.wallLayer,
- usetowpointfive: window.usetowpointfive,
- });
+ // that.$store.commit("MSET_MODEOLS", {
+ // tilesetLayer: window.tilesetLayer,
+ // // tileset: window.tileset,
+ // newLayer: window.newLayer,
+ // wallLayer: window.wallLayer,
+ // usetowpointfive: window.usetowpointfive,
+ // });
// 飞入起始点
// that.$store.dispatch("mapFlyTo", {
@@ -1094,6 +1095,7 @@
query: { introduce: position, address: lntLat, ...(query || {}) },
useJWD: true, // 仅使用经纬度
};
+ console.log(d);
that.$store.dispatch("setMobileWindows", d);
},
flytos(jd, wd) {
--
Gitblit v1.9.3