From bf5ba56e8a82f0ef699f2eae413d0dc2c4e4f67d Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Tue, 25 Oct 2022 16:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/sd-jg-school-web into master

---
 src/components/mobileCortrolButtom/index.vue |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/mobileCortrolButtom/index.vue b/src/components/mobileCortrolButtom/index.vue
index d5ec7cb..458a61a 100644
--- a/src/components/mobileCortrolButtom/index.vue
+++ b/src/components/mobileCortrolButtom/index.vue
@@ -87,7 +87,9 @@
         openOurSee () {
             this.$store.commit(
                 'MSET_OPENMOBILEPANORAMA',
-                'https://vr.jxpskj.com/JXSFKZQJ/QJ/' // sd
+                // 'https://vr.jxpskj.com/JXSFKZQJ/QJ/' // sd
+                'https://vr.jxpskj.com/JXJJGLGBXY/' // jg
+
             )
         },
 
@@ -127,8 +129,8 @@
                     wd: position[1]
                 }
 
-                // 师大
-                if (position[0] > 116.009836 && position[0] < 116.045022 && position[1] > 28.664168 && position[1] < 28.699788) {
+                // 经管
+                if (position[0] > 115.78815057 && position[0] < 115.80346610 && position[1] > 28.63771847 && position[1] < 28.64981682) {
                     that.$store.dispatch('pcMoveView', {
                         jd: position[0],
                         wd: position[1],
@@ -145,6 +147,26 @@
                         type: 'warning'
                     })
                 }
+
+                // 师大
+                // if (position[0] > 116.009836 && position[0] < 116.045022 && position[1] > 28.664168 && position[1] < 28.699788) {
+                //     that.$store.dispatch('pcMoveView', {
+                //         jd: position[0],
+                //         wd: position[1],
+                //         viewer: global.viewer
+                //     })
+
+                //     that.$store.dispatch('addLabelLayerIconMobelUse', {
+                //         list: data,
+                //         clear: true,
+                //         mviewer: global.viewer
+                //     })
+                // } else {
+                //     that.$message({
+                //         message: '您当前位置超出学校范围',
+                //         type: 'warning'
+                //     })
+                // }
             }
 
             function showErrow (result) {

--
Gitblit v1.9.3