From cfa95f03007b221f1e00f4bf5cd29c3ccea3a0a7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 09 Feb 2022 10:26:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/index.vue | 113 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 14 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index b2b0db8..dbf3aad 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -4,6 +4,18 @@
style="height: 100%; width: 100%;"
@click="mapClick($event)">
+ <video id="video"
+ style="position: fixed;
+ visibility: hidden;"
+ muted
+ autoplay
+ loop
+ crossorigin
+ controls>
+ <source src="http://dc.dvgis.cn/examples/data/demo.mp4"
+ type="video/mp4" />
+ </video>
+
<div style="
position: fixed;
left: 4px;
@@ -20,7 +32,7 @@
智慧社区
</div>
- <dimension />
+ <dimension :areaLayer='areaLayer' />
<left-nav ref="leftNav"></left-nav>
@@ -31,6 +43,7 @@
<campusNav ref="campusNavRoute"
v-show="campusNavFlag" />
+ <search-details v-if="searchPopupFlag"></search-details>
<org-nav-bar v-if="orgNavBarFlag"></org-nav-bar>
<arc-nav-bar v-if="arcNavBarFlag"></arc-nav-bar>
</div>
@@ -52,7 +65,67 @@
},
data () {
return {
- DC: null
+ DC: null,
+ areaLayer: null
+ }
+ },
+ watch: {
+ searchPopupFlag: {
+ immediate: true,
+ handler (newVal, oldVal) {
+ if (newVal == true) {
+ if (this.$route.path.indexOf('/pcLayout/default/service') != -1) {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ }
+
+ if (this.$route.path.indexOf('/orgnav') != -1) {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+
+ if (this.orgNavBarFlag == true) {
+ this.$store.commit('SET_ORGNAVBARTITLE', '')
+ this.$store.commit('SET_ORGNAVBARLIST', [])
+ this.$store.commit('SET_ORGNAVBARFLAG', false)
+ }
+
+ if (this.$route.path.indexOf('/arc') != -1) {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+
+ if (this.arcNavBarFlag == true) {
+ this.$store.commit('SET_ARCNAVBARTITLE', '')
+ this.$store.commit('SET_ARCNAVBARCODE', '')
+ this.$store.commit('SET_ARCNAVBARFLAG', false)
+ }
+ }
+ }
+ },
+
+ orgNavBarFlag: {
+ immediate: true,
+ handler (newVal, oldVal) {
+ if (newVal == true) {
+ this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+ }
+ }
+ },
+
+ arcNavBarFlag: {
+ immediate: true,
+ handler (newVal, oldVal) {
+ if (newVal == true) {
+ this.$store.commit('SET_SEARCHPOPUPFLAG', false)
+ }
+ }
}
},
computed: {
@@ -81,7 +154,8 @@
// 社区内导航的显示关闭
'campusNavFlag',
'orgNavBarFlag',
- 'arcNavBarFlag'
+ 'arcNavBarFlag',
+ 'searchPopupFlag'
])
},
mounted () {
@@ -155,19 +229,21 @@
}
})
+ that.createdLayers(viewer)
+
that.$store.commit('SET_VIEWER', viewer)
that.$refs.leftNav.initialize(viewer)
- const key = '0f7c1d161d7352116a21aacf0e9f44c1'
- const vec = that.DC.ImageryLayerFactory.createTdtImageryLayer({
- key
- })
- const cva = that.DC.ImageryLayerFactory.createTdtImageryLayer({
- key,
- style: 'cva'
- })
- viewer.addBaseLayer([vec, cva])
+ // const key = '0f7c1d161d7352116a21aacf0e9f44c1'
+ // const vec = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+ // key
+ // })
+ // const cva = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+ // key,
+ // style: 'cva'
+ // })
+ // viewer.addBaseLayer([vec, cva])
// const areaLayer = new that.DC.VectorLayer('areaLayer')
@@ -279,7 +355,7 @@
// name: '地形'
// })
- // viewer.use(new that.DC.Measure())
+ viewer.use(new that.DC.Measure())
// viewer.flyToPosition(
// new that.DC.Position(117.08489820, 31.65413916, 1500, 0, -90, 45)
@@ -287,7 +363,7 @@
viewer.compass.enable = true
viewer.zoomController.enable = true
- // viewer.locationBar.enable = true
+ viewer.locationBar.enable = true
viewer.hawkeyeMap.enable = true
viewer.hawkeyeMap.addBaseLayer(
that.DC.ImageryLayerFactory.createAmapImageryLayer(
@@ -303,7 +379,16 @@
},
methods: {
mapClick (e) {
+ this.$refs.campusNavRoute.shortcutShow(e)
this.$refs.campusBuildingSearch.shortcutShow(e)
+ },
+
+ createdLayers (viewer) {
+ const layerGroup = new this.DC.LayerGroup('modelBox')
+ viewer.addLayerGroup(layerGroup)
+
+ this.areaLayer = new this.DC.VectorLayer('areaLayer')
+ layerGroup.addLayer(this.areaLayer)
}
}
}
--
Gitblit v1.9.3