From acb45c731c3ccd0a67061efb4e7bdf4f56005672 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 12 Jan 2022 08:52:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/components/campusBuildingSearch.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index 7c9e6c3..cb3baea 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -3,7 +3,7 @@
<div class="map-campus-search"
id="CampusSearchPanel">
<el-input class="search-input"
- placeholder="校园搜索…"
+ placeholder="社区搜索…"
v-model="searchInput"
@input="searchValueChange"
@focus="shortcutFlag = true">
@@ -81,14 +81,14 @@
},
{
bgimg: '/img/search/venue.png',
- title: '校内场馆',
+ title: '社区场馆',
type: 'arc',
path: '/pcLayout/default/arc/venue',
code: 3
},
{
bgimg: '/img/search/dorm.png',
- title: '学生宿舍',
+ title: '社区宿舍',
type: 'arc',
path: '/pcLayout/default/arc/dorm',
code: 4
@@ -110,7 +110,7 @@
computed: {
...mapGetters([
'viewer',
- // 校内导航的显示关闭
+ // 社区内导航的显示关闭
'campusNavFlag',
'orgNavBarFlag',
'arcNavBarFlag'
@@ -273,7 +273,7 @@
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd), Number(item.heading), Number(item.pitch), Number(item.roll)))
+ const position = this.DC.Transform.transformWGS84ToCartesian(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, {
domId: 'divFormsDomBox',
--
Gitblit v1.9.3