From 4ad9804e68c0fa3fb07a85cefc4d73d9e6f5b268 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 04 Jan 2022 16:01:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/mobilemap/index.vue | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/components/mobilemap/index.vue b/src/components/mobilemap/index.vue
index 9e5bf56..1f4245d 100644
--- a/src/components/mobilemap/index.vue
+++ b/src/components/mobilemap/index.vue
@@ -21,6 +21,8 @@
<mobileGoTo></mobileGoTo>
<!-- 实景窗口 -->
<mobilePanorama></mobilePanorama>
+ <!-- 盖住左下角 -->
+ <div class="cover_mobileMap">智慧校园</div>
</div>
</template>
<script>
@@ -240,6 +242,7 @@
viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, (e) => {
//相机移动最后参数
//控制高度
+ let isSet = that.dimension == "3D" ? false : true;
const height = Math.ceil(viewer.camera.positionCartographic.height);
let conBack = (height) => {
viewer.camera.setView({
@@ -265,10 +268,10 @@
// if (height > 2000) {
// conBack(2000);
// }
- if (height < 500) {
+ if (height < 500 && isSet) {
conBack(500);
}
- if (height > 6000) {
+ if (height > 6000 && isSet) {
conBack(6000);
}
});
@@ -372,9 +375,7 @@
introduce: e.layer._id,
}
);
- });
- //移动事件 高亮
- tileset.on(that.DC.MouseEventType.MOUSE_MOVE, (e) => {
+ //高亮
silhouetteBlue.selected = [];
if (that.DC.Namespace.Cesium.defined(highlighted.feature)) {
@@ -398,10 +399,35 @@
);
}
});
+ //移动事件
+ // tileset.on(that.DC.MouseEventType.MOUSE_MOVE, (e) => {
+ // silhouetteBlue.selected = [];
+
+ // if (that.DC.Namespace.Cesium.defined(highlighted.feature)) {
+ // highlighted.feature.color = highlighted.originalColor;
+ // highlighted.feature = undefined;
+ // }
+
+ // if (e.feature !== selected.feature) {
+ // silhouetteBlue.selected = [e.feature];
+
+ // highlighted.feature = e.feature;
+
+ // that.DC.Namespace.Cesium.Color.clone(
+ // e.feature.color,
+ // highlighted.originalColor
+ // );
+ // e.feature.color = that.DC.Namespace.Cesium.Color.fromBytes(
+ // 155,
+ // 255,
+ // 175
+ // );
+ // }
+ // });
tilesetLayer["changesilhouetteBlue"] = () => {
silhouetteBlue.selected = [];
};
- tilesetLayer.show = false;
+ // tilesetLayer.show = false;
//精细模型↑
// 2.5D贴图↓
@@ -529,7 +555,7 @@
? doit([116.36618337, 27.95911915, 2000.0])
: doit([117.08513731, 31.64790556, 600.0]);
};
- startPoint(1);
+ // startPoint(1);
}
//传递默认位置
that.$store.commit("MSET_MORENWEIZHI", startPoint);
@@ -591,7 +617,15 @@
viewer.zoomController.enable = true;
viewer.locationBar.enable = false;
viewer.distanceLegend.enable = false;
- if (true) {
+ //判断默认维度
+ //原本默认是2.5d 改为3d默认时做出改变
+ if (that.dimension == "2.5D") {
+ that.$store.commit("MSET_DIMENSION", "2.5D"); //切换2.5D设置
+ } else if (that.dimension == "3D") {
+ that.$store.commit("MSET_DIMENSION", "3D"); //切换3D设置
+ }
+ if (false) {
+ //镜头改变示例
// viewer.scene.screenSpaceCameraController.enableZoom = false; //控制视角缩放
// viewer.scene.screenSpaceCameraController.enableTilt = false; //控制视角旋转
// viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200; //最小缩放
@@ -633,7 +667,7 @@
};
</script>
-<style lang='scss' scope>
+<style lang="scss" scope>
#mobile-viewer-container {
width: 100%;
height: 100%;
--
Gitblit v1.9.3