From bf58722dfd03ea1513f3acc7331d4d4403fca76e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 18 Mar 2022 11:48:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web

---
 src/components/map/components/mapPopup copy.vue |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/map/components/mapPopup copy.vue b/src/components/map/components/mapPopup copy.vue
index fbb356b..70c8e85 100644
--- a/src/components/map/components/mapPopup copy.vue
+++ b/src/components/map/components/mapPopup copy.vue
@@ -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"
@@ -1088,9 +1088,9 @@
                 // eslint-disable-next-line new-cap
                 new this.DC.Position.fromArray(this.pointPosition)
             )
-            this.viewer.scene.globe.depthTestAgainstTerrain = false
+            global.viewer.scene.globe.depthTestAgainstTerrain = false
             // eslint-disable-next-line no-unused-vars
-            var panorama = new this.DC.PanoramaBox(this.viewer, {
+            var panorama = new this.DC.PanoramaBox(global.viewer, {
                 domId: 'PanoramaBox',
                 position: [positions]
             })
@@ -1111,9 +1111,9 @@
                 // eslint-disable-next-line new-cap
                 new this.DC.Position.fromArray(this.pointPosition)
             )
-            this.viewer.scene.globe.depthTestAgainstTerrain = false
+            global.viewer.scene.globe.depthTestAgainstTerrain = false
             // eslint-disable-next-line no-unused-vars
-            var monitor = new this.DC.PanoramaBox(this.viewer, {
+            var monitor = new this.DC.PanoramaBox(global.viewer, {
                 domId: 'MonitorBox',
                 position: [positions]
             })
@@ -1154,7 +1154,7 @@
 
             //   if (this.addTagLayer == null) {
             //     this.addTagLayer = new this.DC.HtmlLayer("addTagLayer");
-            //     this.viewer.addLayer(this.addTagLayer);
+            //     global.viewer.addLayer(this.addTagLayer);
             //   }
 
             // 2022.3.2对接接口
@@ -1166,7 +1166,6 @@
             }
             //   console.log(data);
             setlabel(data).then((res) => {
-                console.log(res)
                 if (res.data.code == 200) {
                     doit()
                     that.$message({
@@ -1262,7 +1261,7 @@
                 }
 
                 this.newPopup(result)
-                this.viewer.flyToPosition(
+                global.viewer.flyToPosition(
                     new this.DC.Position(
                         Number(result.jd),
                         Number(result.wd),
@@ -1282,7 +1281,7 @@
                 new this.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 this.DC.DivForms(global.viewer, {
                 domId: 'divFormsDomBox',
                 position: [position]
             })

--
Gitblit v1.9.3