From ead73b4e3a20d15d03ed662fe1850393a4decfa3 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 11 Mar 2022 18:12:12 +0800
Subject: [PATCH] viewer更改
---
src/components/map/components/mapPopup.vue | 78 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 23 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index c11d181..c3af8c7 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -66,7 +66,7 @@
<i class="popup-icon start-nav deblurring"></i>
出发
</li>
- <li v-show="false" @click="qrCodeClick">
+ <li v-show="pupupQRUrl != ''" @click="qrCodeClick">
<i class="popup-icon qr-code-nav deblurring"></i>
二维码
</li>
@@ -164,6 +164,12 @@
id="FullScreenBox"
>
<div class="title">
+ <img
+ @click="returnDetailsPopup"
+ class="return-btn"
+ src="/img/icon/return.png"
+ alt
+ />
{{ stateName }}
<img
@click="screen"
@@ -198,6 +204,12 @@
<div class="monitor-wrap">
<div class="content-wrap">
<div class="title">
+ <img
+ @click="returnDetailsPopup"
+ class="return-btn"
+ src="/img/icon/return.png"
+ alt
+ />
{{ stateName }}
<img
@click="closeMonitorPopupBox"
@@ -268,7 +280,7 @@
<div class="arrow-rb"></div>
<div class="label-wrap">
<div class="title">
- {{ nowlabelLayerData.name }} 二维码分享
+ {{ nowlabelLayerData.name }}
<img
@click="closelabelLayerid"
class="close-box"
@@ -459,7 +471,6 @@
dialogImageUrl: '',
dialogVisible: false,
apiUrls: null,
- DC: null,
tabBtnFlag: '教学科研行政',
QRCodeFlag: false,
audioSource: '',
@@ -681,7 +692,6 @@
},
computed: {
...mapGetters([
- 'viewer',
'popupBgUrl',
'pupupQRUrl',
// 终点
@@ -727,7 +737,6 @@
},
created () {
this.apiUrls = window.$apiUrls
- this.DC = global.DC
this.audioSynth = window.speechSynthesis
this.audioMsg = new window.SpeechSynthesisUtterance()
@@ -738,7 +747,9 @@
this.audioCourse = false
}
},
- mounted () { },
+ mounted () {
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
+ },
watch: {
addIconsLayerIconPopup () {
if (this.addIconsLayerIconPopup) {
@@ -923,13 +934,13 @@
}
// eslint-disable-next-line new-cap
- var positions = this.DC.Transform.transformWGS84ToCartesian(
+ var positions = global.DC.Transform.transformWGS84ToCartesian(
// eslint-disable-next-line new-cap
- new this.DC.Position.fromArray(this.pointPosition)
+ new global.DC.Position.fromArray(this.pointPosition)
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
+
// eslint-disable-next-line no-unused-vars
- var panorama = new this.DC.PanoramaBox(this.viewer, {
+ var panorama = new global.DC.PanoramaBox(global.viewer, {
domId: 'PanoramaBox',
position: [positions]
})
@@ -946,19 +957,40 @@
this.audioCourse = false
}
// eslint-disable-next-line new-cap
- var positions = this.DC.Transform.transformWGS84ToCartesian(
+ var positions = global.DC.Transform.transformWGS84ToCartesian(
// eslint-disable-next-line new-cap
- new this.DC.Position.fromArray(this.pointPosition)
+ new global.DC.Position.fromArray(this.pointPosition)
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
- var monitor = new this.DC.PanoramaBox(this.viewer, {
+ var monitor = new global.DC.PanoramaBox(global.viewer, {
domId: 'MonitorBox',
position: [positions]
})
this.$store.commit('SET_PANORAMAPOPUP', false)
this.$store.commit('SET_DETAILSPOPUP', false)
this.$store.commit('SET_MONITORPOPUP', true)
+ },
+
+ returnDetailsPopup () {
+ var positions = global.DC.Transform.transformWGS84ToCartesian(
+ // eslint-disable-next-line new-cap
+ new global.DC.Position.fromArray(this.pointPosition)
+ )
+
+ // eslint-disable-next-line no-unused-vars
+ var divBox = new global.DC.PanoramaBox(global.viewer, {
+ domId: 'divFormsDomBox',
+ position: [positions]
+ })
+
+ global.viewer.zoomToPosition(
+ // eslint-disable-next-line new-cap
+ new global.DC.Position.fromArray(this.pointPosition)
+ )
+
+ this.$store.commit('SET_DETAILSPOPUP', true)
+ this.$store.commit('SET_MONITORPOPUP', false)
+ this.$store.commit('SET_PANORAMAPOPUP', false)
},
closeMapPopupBox () {
@@ -992,8 +1024,8 @@
this.$store.commit('SET_ADDTAGPOPUP', false)
// if (this.addTagLayer == null) {
- // this.addTagLayer = new this.DC.HtmlLayer("addTagLayer");
- // this.viewer.addLayer(this.addTagLayer);
+ // this.addTagLayer = new global.DC.HtmlLayer("addTagLayer");
+ // global.viewer.addLayer(this.addTagLayer);
// }
// 2022.3.2对接接口
@@ -1024,8 +1056,8 @@
// list: [data],
add: true
})
- // const divIcon = new this.DC.DivIcon(
- // new that.DC.Position(
+ // const divIcon = new global.DC.DivIcon(
+ // new global.DC.Position(
// Number(that.addTagPosition.lng),
// Number(that.addTagPosition.lat),
// 0
@@ -1100,8 +1132,8 @@
}
this.newPopup(result)
- this.viewer.flyToPosition(
- new this.DC.Position(
+ global.viewer.flyToPosition(
+ new global.DC.Position(
Number(result.jd),
Number(result.wd),
300,
@@ -1116,11 +1148,11 @@
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(
- new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
+ const position = global.DC.Transform.transformWGS84ToCartesian(
+ new global.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
)
// eslint-disable-next-line no-unused-vars
- var popup = new this.DC.DivForms(this.viewer, {
+ var popup = new global.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
position: [position]
})
--
Gitblit v1.9.3