From 2243bdd92801cd6235ea497b3266d171a58a7a87 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Dec 2021 11:49:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/index.vue | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 416e290..39f044e 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -6,17 +6,24 @@
<left-nav ref="leftNav"></left-nav>
<mapPopup />
+
+ <!-- <campusBuildingSearch /> -->
+ <div class="keep-out">
+ 智慧校园
+ </div>
</div>
</template>
<script>
import { mapGetters } from 'vuex'
-import mapPopup from './component/mapPopup.vue'
+import mapPopup from './components/mapPopup.vue'
+import campusBuildingSearch from './components/campusBuildingSearch.vue'
export default {
name: 'mapBox',
components: {
- mapPopup
+ mapPopup,
+ campusBuildingSearch
},
data () {
return {
@@ -179,7 +186,9 @@
}
)
tilesetLayer.addOverlay(tileset)
- viewer.flyTo(tileset)
+ setTimeout(() => {
+ viewer.flyTo(tileset)
+ }, 1500)
tileset.on(that.DC.MouseEventType.CLICK, e => {
viewer.scene.globe.depthTestAgainstTerrain = false
@@ -232,13 +241,14 @@
)
wall.setStyle({
material: new that.DC.WallTrailMaterialProperty({
- color: that.DC.Color.DEEPSKYBLUE,
- speed: 4
+ color: that.DC.Namespace.Cesium.Color.fromBytes(0, 142, 255, 150),
+ // color: that.DC.Color.CYAN,
+ speed: 10
})
})
wallLayer.addOverlay(wall)
- viewer.use(new that.DC.Measure())
+ // viewer.use(new that.DC.Measure())
// viewer.flyTo(wallLayer)
@@ -248,8 +258,8 @@
viewer.compass.enable = true
viewer.zoomController.enable = true
- viewer.locationBar.enable = true
- viewer.distanceLegend.enable = true
+ // viewer.locationBar.enable = true
+ // viewer.distanceLegend.enable = true
}
that.DC.ready(initViewer)
@@ -261,4 +271,17 @@
</script>
<style lang='scss' scope>
+.keep-out {
+ position: fixed;
+ left: 6px;
+ bottom: 2px;
+ z-index: 11;
+ width: 72px;
+ height: 30px;
+ line-height: 30px;
+ text-align: center;
+ background: rgba(0, 0, 0, 0.8);
+ color: #fff;
+ border-radius: 8px;
+}
</style>
--
Gitblit v1.9.3