冲突

liuyg

2021-12-15 ae038d50b068a02c4fe53725095dc952bf75b797

 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',