From 368cadf28a912e35bd9d8017588cb0aefffc7b79 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 08 Mar 2022 17:10:48 +0800
Subject: [PATCH] 二维码扫码与PC端DC使用方式更换
---
src/components/map/components/mapPopup.vue | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index c11d181..1464ca3 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -459,7 +459,6 @@
dialogImageUrl: '',
dialogVisible: false,
apiUrls: null,
- DC: null,
tabBtnFlag: '教学科研行政',
QRCodeFlag: false,
audioSource: '',
@@ -727,7 +726,6 @@
},
created () {
this.apiUrls = window.$apiUrls
- this.DC = global.DC
this.audioSynth = window.speechSynthesis
this.audioMsg = new window.SpeechSynthesisUtterance()
@@ -923,13 +921,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(this.viewer, {
domId: 'PanoramaBox',
position: [positions]
})
@@ -946,13 +944,13 @@
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(this.viewer, {
domId: 'MonitorBox',
position: [positions]
})
@@ -992,7 +990,7 @@
this.$store.commit('SET_ADDTAGPOPUP', false)
// if (this.addTagLayer == null) {
- // this.addTagLayer = new this.DC.HtmlLayer("addTagLayer");
+ // this.addTagLayer = new global.DC.HtmlLayer("addTagLayer");
// this.viewer.addLayer(this.addTagLayer);
// }
@@ -1024,8 +1022,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
@@ -1101,7 +1099,7 @@
this.newPopup(result)
this.viewer.flyToPosition(
- new this.DC.Position(
+ new global.DC.Position(
Number(result.jd),
Number(result.wd),
300,
@@ -1116,11 +1114,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(this.viewer, {
domId: 'divFormsDomBox',
position: [position]
})
--
Gitblit v1.9.3