From ae038d50b068a02c4fe53725095dc952bf75b797 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 15 Dec 2021 17:36:21 +0800
Subject: [PATCH] 冲突
---
src/components/orgNavBar/index.vue | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/components/orgNavBar/index.vue b/src/components/orgNavBar/index.vue
index 7579241..536a5e1 100644
--- a/src/components/orgNavBar/index.vue
+++ b/src/components/orgNavBar/index.vue
@@ -60,7 +60,11 @@
...mapGetters([
'viewer',
'popupBgUrl',
- 'pupupQRUrl'
+ 'pupupQRUrl',
+ // 点信息
+ 'pointPosition',
+ // 点名称
+ 'stateName'
])
},
methods: {
@@ -116,19 +120,21 @@
mapPopup (item) {
this.$store.commit('SET_POPUPBGURL', item.bgImg)
this.$store.commit('SET_POPUPQRURL', item.QRImg)
+ this.$store.commit('SET_POINTPOSITION', [item.longitude, item.latitude, item.alt, item.heading, item.pitch, item.roll])
+ this.$store.commit('SET_STATENAME', item.navTitle)
console.log(this.popupBgUrl)
var that = this
// item.alt, item.heading, item.pitch, item.roll
this.viewer.zoomToPosition(
- new this.DC.Position(item.longitude, item.latitude, item.alt, 35, -45, 0),
+ new this.DC.Position(item.longitude, item.latitude, item.alt, item.heading, item.pitch, item.roll),
function () {
that.newPopup(item)
}
)
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(item.longitude, item.latitude, item.alt, 35, -45, 0))
+ const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(item.longitude, item.latitude, item.alt, item.heading, item.pitch, item.roll))
// eslint-disable-next-line new-cap
var popup = new this.DC.divForms(this.viewer, {
domId: 'div1',
--
Gitblit v1.9.3