From 4593a5c6ef4549a519681fa44d94fa242d15bec4 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 30 Dec 2021 11:57:28 +0800
Subject: [PATCH] 完善
---
src/components/map/components/mapPopup.vue | 76 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 44b37ca..d3a9c40 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -72,6 +72,11 @@
<i class="popup-icon live-action-nav deblurring"></i>
实景
</li>
+ <li v-show="panoramaUrl != null && panoramaUrl != ''"
+ @click="monitorClick">
+ <i class="popup-icon monitor-nav deblurring"></i>
+ 监控
+ </li>
</ul>
</div>
<div v-show="teachList.length > 0 || liveList.length > 0"
@@ -85,7 +90,7 @@
@click="tabBtnClick('生活服务')">生活服务</li>
</ul>
<div class="btm-content">
- <div class="on">
+ <div :class="{'on': tabBtnFlag == '教学科研行政'}">
<ul>
<li v-for="(item, index) in teachList"
:key="index"
@@ -95,11 +100,11 @@
</li>
</ul>
</div>
- <div>
+ <div :class="{'on': tabBtnFlag == '生活服务'}">
<ul>
<li v-for="(item, index) in liveList"
:key="index"
- @click="mechanismDetailPopup(1, item)">>
+ @click="mechanismDetailPopup(1, item)">
<i class="popup-icon location-icon deblurring"></i>
{{item}}
</li>
@@ -118,6 +123,7 @@
</div>
</div>
</div>
+
<div v-if="panoramaPopup"
class="panorama-dom"
id="PanoramaBox">
@@ -142,11 +148,39 @@
</div>
</div>
</div>
+
+ <div v-if="monitorPopup"
+ class="monitor-dom"
+ id="MonitorBox">
+ <div style="width: 100%; height: 100%;">
+ <div class="monitor-container">
+ <div class="monitor-wrap">
+ <div class="content-wrap">
+ <div class="title">
+ {{stateName}}
+ <img @click="closeMonitorPopupBox"
+ class="close-box"
+ src="/img/navicon/close.png"
+ alt="">
+ </div>
+ <div class="content">
+ <video :src="monitorUrl"
+ controls
+ autoplay></video>
+ </div>
+ </div>
+ </div>
+ <div class="arrow"></div>
+ </div>
+ </div>
+ </div>
</div>
<!-- 二维码弹框相关 -->
<el-dialog title="场景二维码"
:visible.sync="QRCodeFlag"
+ :modal="false"
+ :modal-append-to-body="false"
width='44%'>
<div style="margin: 0; position: relative; width: 100%; height: 352px;">
<img width="260"
@@ -175,7 +209,6 @@
style="position: fixed; left: 111111111px;"
v-html="audioSource"
@ended="overAudio">
-
</audio>
</div>
</template>
@@ -214,12 +247,16 @@
'telephone',
// 介绍
'introduceText',
- // 全景地址
- 'panoramaUrl',
// 详情弹框显示关闭
'detailsPopup',
+ // 全景地址
+ 'panoramaUrl',
// 全景弹框显示关闭
'panoramaPopup',
+ // 监控地址
+ 'monitorUrl',
+ // 监控弹框显示关闭
+ 'monitorPopup',
'popupImgAtlas',
// 教学
@@ -279,8 +316,30 @@
positions
]
})
+
this.$store.commit('SET_DETAILSPOPUP', false)
+ this.$store.commit('SET_MONITORPOPUP', false)
this.$store.commit('SET_PANORAMAPOPUP', true)
+ },
+
+ monitorClick () {
+ if (this.audioFlag == true) {
+ this.$refs.audioControlPlay.pause()
+ this.audioFlag = false
+ }
+ // eslint-disable-next-line new-cap
+ var positions = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position.fromArray(this.pointPosition))
+ this.viewer.scene.globe.depthTestAgainstTerrain = false
+ // eslint-disable-next-line no-unused-vars
+ var monitor = new this.DC.PanoramaBox(this.viewer, {
+ domId: 'MonitorBox',
+ position: [
+ positions
+ ]
+ })
+ this.$store.commit('SET_PANORAMAPOPUP', false)
+ this.$store.commit('SET_DETAILSPOPUP', false)
+ this.$store.commit('SET_MONITORPOPUP', true)
},
closeMapPopupBox () {
@@ -297,6 +356,11 @@
this.$store.commit('SET_PANORAMAPOPUP', false)
},
+ closeMonitorPopupBox () {
+ this.$store.commit('SET_MONITORURL', '')
+ this.$store.commit('SET_MONITORPOPUP', false)
+ },
+
audioPlay () {
if (this.audioSource == '') {
var zhText = encodeURI(this.$refs.DomIntroduceText.innerText)
--
Gitblit v1.9.3