From e8e7b70168d5cc8a465c92da28bdcce52e8bf3cc Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 10 Mar 2022 14:48:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/map/components/mapPopup.vue |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index c11d181..996f48f 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>
@@ -268,7 +268,7 @@
                                 <div class="arrow-rb"></div>
                                 <div class="label-wrap">
                                     <div class="title">
-                                        {{ nowlabelLayerData.name }} &nbsp; 二维码分享
+                                        {{ nowlabelLayerData.name }}
                                         <img
                                             @click="closelabelLayerid"
                                             class="close-box"
@@ -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