From 128a3d4df3754e428cdb2c46bc1e10f074229256 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 04 Jan 2022 18:22:04 +0800
Subject: [PATCH] +
---
src/components/map/components/campusBuildingSearch.vue | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/components/map/components/campusBuildingSearch.vue b/src/components/map/components/campusBuildingSearch.vue
index 3ddaea0..a10793f 100644
--- a/src/components/map/components/campusBuildingSearch.vue
+++ b/src/components/map/components/campusBuildingSearch.vue
@@ -62,36 +62,42 @@
bgimg: '/img/search/org.png',
title: '党群机构',
type: 'orgnav',
+ path: '/pcLayout/default/orgnav/masses',
code: 1
},
{
bgimg: '/img/search/ofc.png',
title: '职能部处',
type: 'orgnav',
+ path: '/pcLayout/default/orgnav/ofc',
code: 2
},
{
bgimg: '/img/search/teach.png',
title: '教学科研',
- type: 'orgnav',
- code: 4
+ type: 'arc',
+ path: '/pcLayout/default/arc/teaching',
+ code: 2
},
{
bgimg: '/img/search/venue.png',
title: '校内场馆',
type: 'arc',
+ path: '/pcLayout/default/arc/venue',
code: 3
},
{
bgimg: '/img/search/dorm.png',
title: '学生宿舍',
type: 'arc',
+ path: '/pcLayout/default/arc/dorm',
code: 4
},
{
bgimg: '/img/search/scenery.png',
title: '文化风景',
type: 'arc',
+ path: '/pcLayout/default/arc/culture',
code: 5
}
],
@@ -136,6 +142,11 @@
openModelPopup (param) {
var list = []
+ if (this.$route.path.indexOf('/service') != -1) {
+ this.$store.dispatch('delVisitedViews', this.$route)
+ this.$router.push('/pcLayout/default')
+ }
+
if (param.type == 'orgnav') {
var path = this.$route.path
if (path.indexOf('/arc') != -1) {
@@ -172,7 +183,8 @@
QRImg: item.codeurl,
address: item.address,
telephone: item.telephone,
- introduce: item.introduce
+ introduce: item.introduce,
+ videourl: item.videourl
})
})
@@ -234,7 +246,7 @@
if (result.panoramaurl != '') {
this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
}
- if (result.videourl != '') {
+ if (result.videourl && result.videourl != '') {
this.$store.commit('SET_MONITORURL', result.videourl)
}
this.$store.commit('SET_POPUPIMGATLAS', imgArr)
@@ -261,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