From 6bf300a2b2660bd2ec0251f35c0de24760b33e12 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 20 Jan 2022 11:30:23 +0800
Subject: [PATCH] 部分修改
---
src/components/map/components/mapPopup.vue | 174 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 128 insertions(+), 46 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 675dd4e..78e94f7 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -4,7 +4,7 @@
<div v-if="detailsPopup"
class="divForms-dom"
id="divFormsDomBox">
- <div style='width: 100%; height: 100%;'>
+ <div style="width: 100%; height: 100%;">
<div class="divForms divForms-theme">
<div class="divForms-wrap">
<div class="area">
@@ -16,31 +16,31 @@
<div class="arrow-rb"></div>
<div class="label-wrap">
<div class="title">
- {{stateName}}
+ {{ stateName }}
<img v-show="introduceText != null && introduceText != ''"
@click="audioPlay"
class="audio-control"
src="/img/navicon/audio.png"
- alt="">
+ alt="" />
<img @click="closeMapPopupBox"
class="close-box"
src="/img/navicon/close.png"
- alt="">
+ alt="" />
</div>
<div class="label-content">
<div class="arc-bcg">
<img :src="popupBgUrl"
- alt="">
+ alt="" />
</div>
<div v-show="siteName != null && siteName != ''"
class="site">
<strong>地址：</strong>
- {{siteName}}
+ {{ siteName }}
</div>
<div v-show="telephone != null && telephone != ''"
class="phone">
<strong>电话：</strong>
- {{telephone}}
+ {{ telephone }}
</div>
<div v-show="introduceText != null && introduceText != ''"
class="introduce">
@@ -83,30 +83,34 @@
class="arc-box">
<ul class="tab-btn">
<li v-show="teachList.length > 0"
- :class="{'on': tabBtnFlag == '教学科研行政'}"
- @click="tabBtnClick('教学科研行政')">教学科研行政</li>
+ :class="{ on: tabBtnFlag == '教学科研行政' }"
+ @click="tabBtnClick('教学科研行政')">
+ 教学科研行政
+ </li>
<li v-show="liveList.length > 0"
- :class="{'on': tabBtnFlag == '生活服务'}"
- @click="tabBtnClick('生活服务')">生活服务</li>
+ :class="{ on: tabBtnFlag == '生活服务' }"
+ @click="tabBtnClick('生活服务')">
+ 生活服务
+ </li>
</ul>
<div class="btm-content">
- <div :class="{'on': tabBtnFlag == '教学科研行政'}">
+ <div :class="{ on: tabBtnFlag == '教学科研行政' }">
<ul>
<li v-for="(item, index) in teachList"
:key="index"
@click="mechanismDetailPopup(0, item)">
<i class="popup-icon location-icon deblurring"></i>
- {{item}}
+ {{ item }}
</li>
</ul>
</div>
- <div :class="{'on': tabBtnFlag == '生活服务'}">
+ <div :class="{ on: tabBtnFlag == '生活服务' }">
<ul>
<li v-for="(item, index) in liveList"
:key="index"
@click="mechanismDetailPopup(1, item)">
<i class="popup-icon location-icon deblurring"></i>
- {{item}}
+ {{ item }}
</li>
</ul>
</div>
@@ -132,14 +136,21 @@
<div class="panorama-wrap">
<div class="content-wrap">
<div class="title">
- {{stateName}}
+ {{ stateName }}
<img @click="closePanoramaPopupBox"
class="close-box"
src="/img/navicon/close.png"
- alt="">
+ alt="" />
</div>
- <div class="content">
- <iframe :src="panoramaUrl"
+ <div class="content"
+ id="FullScreenBox">
+ <button type="button"
+ @click="screen">
+ <img :src="fullScreenUrl"
+ alt="" />
+ </button>
+ <iframe allowfullscreen="true"
+ :src="panoramaUrl"
frameborder="0"></iframe>
</div>
</div>
@@ -157,11 +168,11 @@
<div class="monitor-wrap">
<div class="content-wrap">
<div class="title">
- {{stateName}}
+ {{ stateName }}
<img @click="closeMonitorPopupBox"
class="close-box"
src="/img/navicon/close.png"
- alt="">
+ alt="" />
</div>
<div class="content">
<video :src="monitorUrl"
@@ -181,7 +192,7 @@
:visible.sync="QRCodeFlag"
:modal="false"
:modal-append-to-body="false"
- width='44%'>
+ width="44%">
<div style="margin: 0; position: relative; width: 100%; height: 352px;">
<img width="260"
:src="pupupQRUrl"
@@ -191,7 +202,7 @@
left: 0;
right: 0;
bottom: 0;
- margin: auto">
+ margin: auto" />
<div style="position: absolute; bottom: 0; width: 100%; line-height: 36px; text-align: center;">
(右键另存为图片)
</div>
@@ -222,7 +233,9 @@
audioFlag: false,
audioCourse: false,
audioSynth: null,
- audioMsg: null
+ audioMsg: null,
+ fullscreen: false,
+ fullScreenUrl: '/img/icon/bigScreen.png'
}
},
computed: {
@@ -276,6 +289,33 @@
this.audioCourse = false
}
},
+ mounted () {
+ var that = this
+ this.$nextTick(() => {
+ window.onresize = function () {
+ if (!checkFull()) {
+ // 要执行的动作
+ that.fullScreenUrl = '/img/icon/bigScreen.png'
+
+ if (document.documentElement.requestFullScreen) {
+ document.exitFullScreen()
+ } else if (document.documentElement.webkitRequestFullScreen) {
+ document.webkitCancelFullScreen()
+ } else if (document.documentElement.mozRequestFullScreen) {
+ document.mozCancelFullScreen()
+ }
+ that.fullscreen = false
+ }
+ }
+
+ function checkFull () {
+ return document.fullscreenElement ||
+ document.msFullscreenElement ||
+ document.mozFullScreenElement ||
+ document.webkitFullscreenElement || false
+ }
+ })
+ },
watch: {
introduceText: {
immediate: true,
@@ -322,6 +362,33 @@
}
},
methods: {
+ screen () {
+ const element = document.getElementById('FullScreenBox')
+ if (this.fullscreen) {
+ this.fullScreenUrl = '/img/icon/bigScreen.png'
+ this.fullscreen = !this.fullscreen
+
+ if (document.documentElement.requestFullScreen) {
+ document.exitFullScreen()
+ } else if (document.documentElement.webkitRequestFullScreen) {
+ document.webkitCancelFullScreen()
+ } else if (document.documentElement.mozRequestFullScreen) {
+ document.mozCancelFullScreen()
+ }
+ } else {
+ this.fullScreenUrl = '/img/icon/smallScreen.png'
+ this.fullscreen = !this.fullscreen
+
+ if (element.requestFullScreen) {
+ element.requestFullScreen()
+ } else if (element.webkitRequestFullScreen) {
+ element.webkitRequestFullScreen()
+ } else if (element.mozRequestFullScreen) {
+ element.mozRequestFullScreen()
+ }
+ }
+ },
+
tabBtnClick (param) {
this.tabBtnFlag = param
},
@@ -329,13 +396,17 @@
comeHereClick () {
this.$store.commit('SET_COMENAME', this.stateName)
this.$store.commit('SET_TERMINUS', this.pointPosition)
- if (this.campusNavFlag == false) this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ if (this.campusNavFlag == false) {
+ this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ }
},
getToHereClick () {
this.$store.commit('SET_GETTONAME', this.stateName)
this.$store.commit('SET_STARTINGPOINT', this.pointPosition)
- if (this.campusNavFlag == false) this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ if (this.campusNavFlag == false) {
+ this.$store.commit('SET_CAMPUSNAVFLAG', true)
+ }
},
qrCodeClick () {
@@ -354,14 +425,14 @@
}
// eslint-disable-next-line new-cap
- var positions = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position.fromArray(this.pointPosition))
+ 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 panorama = new this.DC.PanoramaBox(this.viewer, {
domId: 'PanoramaBox',
- position: [
- positions
- ]
+ position: [positions]
})
this.$store.commit('SET_DETAILSPOPUP', false)
@@ -376,14 +447,14 @@
this.audioCourse = false
}
// eslint-disable-next-line new-cap
- var positions = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position.fromArray(this.pointPosition))
+ 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
- ]
+ position: [positions]
})
this.$store.commit('SET_PANORAMAPOPUP', false)
this.$store.commit('SET_DETAILSPOPUP', false)
@@ -427,7 +498,7 @@
},
mechanismDetailPopup (num, param) {
- getMechanismDetail({ num: num, mechanismName: param }).then(res => {
+ getMechanismDetail({ num: num, mechanismName: param }).then((res) => {
var result = res.data.data
this.$store.commit('CLEAR_ALL', null)
@@ -435,7 +506,14 @@
this.$store.commit('SET_POPUPBGURL', imgArr[0])
this.$store.commit('SET_POPUPQRURL', result.codeurl)
- this.$store.commit('SET_POINTPOSITION', [Number(result.jd), Number(result.wd), Number(result.gd), Number(result.heading), Number(result.pitch), Number(result.roll)])
+ this.$store.commit('SET_POINTPOSITION', [
+ Number(result.jd),
+ Number(result.wd),
+ Number(result.gd),
+ Number(result.heading),
+ Number(result.pitch),
+ Number(result.roll)
+ ])
this.$store.commit('SET_STATENAME', result.mechanismname)
this.$store.commit('SET_SITENAME', result.address)
this.$store.commit('SET_TELEPHONE', result.telephone)
@@ -448,22 +526,28 @@
this.newPopup(result)
this.viewer.flyToPosition(
- new this.DC.Position(Number(result.jd), Number(result.wd), 300, Number(result.heading), Number(result.pitch), Number(result.roll)),
- function () {
- },
+ new this.DC.Position(
+ Number(result.jd),
+ Number(result.wd),
+ 300,
+ Number(result.heading),
+ Number(result.pitch),
+ Number(result.roll)
+ ),
+ function () { },
3
)
})
},
newPopup (item) {
- const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd)))
+ 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',
- position: [
- position
- ]
+ position: [position]
})
this.$store.commit('SET_PANORAMAPOPUP', false)
@@ -471,9 +555,7 @@
this.$store.commit('SET_DETAILSPOPUP', true)
}
}
-
}
</script>
-<style>
-</style>
+<style></style>
--
Gitblit v1.9.3