From 30f4204ca6fb295d0f3d9cae41fbb4e62321beb4 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 05 Dec 2023 10:03:37 +0800
Subject: [PATCH] 处理按钮显示
---
src/components/mobileWindow/index.vue | 4 ++++
src/components/mobilePopupOur/index.vue | 30 ++++++++----------------------
src/components/mobilePopupOurOnce/index.vue | 7 +++----
3 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/src/components/mobilePopupOur/index.vue b/src/components/mobilePopupOur/index.vue
index 9ef552d..cd5af85 100644
--- a/src/components/mobilePopupOur/index.vue
+++ b/src/components/mobilePopupOur/index.vue
@@ -150,11 +150,7 @@
icons: icon + item.mechanismname, // 图片响应改变
from: this.choiceMain,
video: item.videourl,
- buts:
- this.mBigPopup.name == '校园建筑' ||
- this.mBigPopup.name == '文化风景'
- ? ['定位', '实景', '图集']
- : ['定位']
+ buts: ['定位', '实景', '图集']
})
})
} else if (this.mBigPopup.name == '活动') {
@@ -178,11 +174,7 @@
// address: item.address,
introduce: item.context,
video: item.videourl,
- buts:
- that.mBigPopup.name == '校园建筑' ||
- that.mBigPopup.name == '文化风景'
- ? ['定位', '实景', '图集']
- : ['定位'],
+ buts: ['定位', '实景', '图集'],
// 活动添加的字段
addressname: item.addressname.split(';'),
address: item.address.split(';'),
@@ -218,11 +210,7 @@
address: item.address,
introduce: item.introduce,
video: item.videourl,
- buts:
- that.mBigPopup.name == '校园建筑' ||
- that.mBigPopup.name == '文化风景'
- ? ['定位', '实景', '图集']
- : ['定位'],
+ buts: ['定位', '实景', '图集'],
panoramaurl: item.panoramaurl, // 全景
x: item.x
}
@@ -237,7 +225,8 @@
// 搜索请求
getListSearchMethod (name) {
const val = {
- mechanismName: name
+ mechanismName: name,
+ campus: this.mobileMapElement.campusValue
}
const that = this
getListSearch(val).then((res) => {
@@ -247,11 +236,12 @@
const data = res.data.data
// 正常获取全部数据
const outList = []
+
data.forEach((item) => {
const icon = item.tpurl.split(',')
const useData = {
name: item.mechanismname,
- lntLat: [item.jd, item.wd],
+ lntLat: item.x.split(','),
alt: item.gd,
heading: item.heading,
pitch: item.pitch,
@@ -266,11 +256,7 @@
address: item.address,
introduce: item.introduce,
video: item.videourl,
- buts:
- that.mBigPopup.name == '校园建筑' ||
- that.mBigPopup.name == '文化风景'
- ? ['定位', '实景', '图集']
- : ['定位'],
+ buts: ['定位', '实景', '图集'],
panoramaurl: item.panoramaurl, // 全景
x: item.x
}
diff --git a/src/components/mobilePopupOurOnce/index.vue b/src/components/mobilePopupOurOnce/index.vue
index 171ce88..f093b9e 100644
--- a/src/components/mobilePopupOurOnce/index.vue
+++ b/src/components/mobilePopupOurOnce/index.vue
@@ -64,7 +64,9 @@
...mapGetters(['mviewer']),
seebut () {
const buts = this.onceData.buts
+
let b = []
+
for (const k in buts) {
if (buts[k] == '实景') {
continue
@@ -73,6 +75,7 @@
name: buts[k]
})
}
+
if (this.ourData.panoramaurl) {
b.push({
name: '实景'
@@ -114,10 +117,6 @@
if (this.ourData.name == '活动') {
console.log(this.ourData)
return
- }
- const options = {
- url: 'https://js.arcgis.com/4.14/',
- css: 'https://js.arcgis.com/4.14/esri/themes/light/main.css'
}
this.$EventBus.$emit('addSitePositionLayer', this.ourData)
diff --git a/src/components/mobileWindow/index.vue b/src/components/mobileWindow/index.vue
index 9f34ff4..239a65b 100644
--- a/src/components/mobileWindow/index.vue
+++ b/src/components/mobileWindow/index.vue
@@ -323,14 +323,17 @@
this.title = data.name || '成教楼'
this.$store.dispatch('MSET_GETAUDIOBEGIN', 'notOpen')
+
this.quzheD = false
// 数据更改
// this.fullscreenLoading = true;
this.video = '' // 清除视频
this.seebut = [] // 清除按钮
+
const queryData = this.query
this.title = queryData.name
// 判断是否显示操作按钮
+
if (queryData.seebut) {
this.seebut = queryData.seebut
if (queryData.from == '活动') {
@@ -382,6 +385,7 @@
return res.name != '图集'
})
}
+
// 视频
if (queryData.video) {
if (queryData.from == 'labels') {
--
Gitblit v1.9.3