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/campusBuildingSearch.vue | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index 1d747bf..92c6349 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -52,7 +52,6 @@
name: 'campusBuildingSearch',
data () {
return {
- DC: null,
shortcutList: [
{
bgimg: '/img/search/org.png',
@@ -113,7 +112,6 @@
},
computed: {
...mapGetters([
- 'viewer',
// 校区内导航的显示关闭
'campusNavFlag',
'orgNavBarFlag',
@@ -121,7 +119,6 @@
])
},
created () {
- this.DC = global.DC
},
methods: {
searchValueChange () {
@@ -264,8 +261,8 @@
}
this.newPopup(param)
- this.viewer.flyToPosition(
- new this.DC.Position(
+ global.viewer.flyToPosition(
+ new global.DC.Position(
Number(param.jd),
Number(param.wd),
300,
@@ -279,11 +276,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(global.viewer, {
domId: 'divFormsDomBox',
position: [position]
})
--
Gitblit v1.9.3