冲突

liuyg

2022-01-25 117dc4cec546f830bc941ea314dcbdb9b370b211

 src/components/map/components/mapPopup.vue

@@ -59,7 +59,8 @@
                                                    <i class="popup-icon start-nav deblurring"></i>
                                                    出发
                                                </li>
                                                <li v-show="false" @click="qrCodeClick">
                                                <li v-show="false"
                                                    @click="qrCodeClick">
                                                    <i class="popup-icon qr-code-nav deblurring"></i>
                                                    二维码
                                                </li>
@@ -131,25 +132,26 @@

            <div v-if="panoramaPopup"
                 class="panorama-dom"
                 :class="{'change-full': fullscreen}"
                 id="PanoramaBox">
                <div style="width: 100%; height: 100%;">
                    <div class="panorama-container">
                        <div class="panorama-wrap">
                            <div class="content-wrap">
                            <div class="content-wrap"
                                 :class="{'change-full': fullscreen}"
                                 id="FullScreenBox">
                                <div class="title">
                                    {{ stateName }}
                                    <img @click="screen"
                                         class="full-srceen-btn"
                                         :src="fullScreenUrl"
                                         alt="" />
                                    <img @click="closePanoramaPopupBox"
                                         class="close-box"
                                         src="/img/navicon/close.png"
                                         alt="" />
                                </div>
                                <div class="content"
                                     id="FullScreenBox">
                                    <button type="button"
                                            @click="screen">
                                        <img :src="fullScreenUrl"
                                             alt="" />
                                    </button>
                                <div class="content">
                                    <iframe allowfullscreen="true"
                                            :src="panoramaUrl"
                                            frameborder="0"></iframe>
@@ -291,31 +293,7 @@
        }
    },
    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: {
@@ -364,29 +342,16 @@
    },
    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()
                }
                document.getElementById('pcElHeader').style.zIndex = 9999
            } 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()
                }
                document.getElementById('pcElHeader').style.zIndex = 9
            }
        },