From 5421d1e2d9749d9193641139cbf3b3cbf2157ebb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 11 Mar 2022 18:03:23 +0800
Subject: [PATCH] 部分更改
---
src/components/map/components/mapPopup.vue | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 996f48f..c3af8c7 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -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"
@@ -680,7 +692,6 @@
},
computed: {
...mapGetters([
- 'viewer',
'popupBgUrl',
'pupupQRUrl',
// 终点
@@ -736,7 +747,9 @@
this.audioCourse = false
}
},
- mounted () { },
+ mounted () {
+ global.viewer.scene.globe.depthTestAgainstTerrain = false
+ },
watch: {
addIconsLayerIconPopup () {
if (this.addIconsLayerIconPopup) {
@@ -925,9 +938,9 @@
// eslint-disable-next-line new-cap
new global.DC.Position.fromArray(this.pointPosition)
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
+
// eslint-disable-next-line no-unused-vars
- var panorama = new global.DC.PanoramaBox(this.viewer, {
+ var panorama = new global.DC.PanoramaBox(global.viewer, {
domId: 'PanoramaBox',
position: [positions]
})
@@ -948,15 +961,36 @@
// eslint-disable-next-line new-cap
new global.DC.Position.fromArray(this.pointPosition)
)
- this.viewer.scene.globe.depthTestAgainstTerrain = false
// eslint-disable-next-line no-unused-vars
- var monitor = new global.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 () {
@@ -991,7 +1025,7 @@
// if (this.addTagLayer == null) {
// this.addTagLayer = new global.DC.HtmlLayer("addTagLayer");
- // this.viewer.addLayer(this.addTagLayer);
+ // global.viewer.addLayer(this.addTagLayer);
// }
// 2022.3.2对接接口
@@ -1098,7 +1132,7 @@
}
this.newPopup(result)
- this.viewer.flyToPosition(
+ global.viewer.flyToPosition(
new global.DC.Position(
Number(result.jd),
Number(result.wd),
@@ -1118,7 +1152,7 @@
new global.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
)
// eslint-disable-next-line no-unused-vars
- var popup = new global.DC.DivForms(this.viewer, {
+ var popup = new global.DC.DivForms(global.viewer, {
domId: 'divFormsDomBox',
position: [position]
})
--
Gitblit v1.9.3