Merge branch 'master' of http://192.168.0.105:10010/r/school-web

liuyg

2022-03-10 e8e7b70168d5cc8a465c92da28bdcce52e8bf3cc

 src/components/map/components/mapPopup.vue

@@ -66,7 +66,7 @@
                                                    <i class="popup-icon start-nav deblurring"></i>
                                                    出发
                                                </li>
                                                <li v-show="false" @click="qrCodeClick">
                                                <li v-show="pupupQRUrl != ''" @click="qrCodeClick">
                                                    <i class="popup-icon qr-code-nav deblurring"></i>
                                                    二维码
                                                </li>
@@ -268,7 +268,7 @@
                                <div class="arrow-rb"></div>
                                <div class="label-wrap">
                                    <div class="title">
                                        {{ nowlabelLayerData.name }} &nbsp; 二维码分享
                                        {{ nowlabelLayerData.name }}
                                        <img
                                            @click="closelabelLayerid"
                                            class="close-box"
@@ -297,7 +297,7 @@
        </div>

        <!-- 新增编辑标签 -->
        <div v-if="addIconsLayerIconPopup" class="monitor-dom" id="leftNavsAdd">
        <div v-if="addIconsLayerIconPopup" class="monitor-dom add-sign-box-style" id="leftNavsAdd">
            <div style="width: 100%; height: 100%">
                <div class="divForms divForms-theme">
                    <div class="divForms-wrap">
@@ -316,10 +316,6 @@
                                        class="addIconFromInput"
                                    >
                                        <template slot="prepend">标题:</template>
                                        <i
                                            slot="suffix"
                                            class="el-icon-edit el-input__icon addIconFromInputicon"
                                        ></i>
                                    </el-input>
                                    <img
                                        @click="closeaddIconsLayerIconPopup"
@@ -463,7 +459,6 @@
            dialogImageUrl: '',
            dialogVisible: false,
            apiUrls: null,
            DC: null,
            tabBtnFlag: '教学科研行政',
            QRCodeFlag: false,
            audioSource: '',
@@ -731,7 +726,6 @@
    },
    created () {
        this.apiUrls = window.$apiUrls
        this.DC = global.DC

        this.audioSynth = window.speechSynthesis
        this.audioMsg = new window.SpeechSynthesisUtterance()
@@ -927,13 +921,13 @@
            }

            // eslint-disable-next-line new-cap
            var positions = this.DC.Transform.transformWGS84ToCartesian(
            var positions = global.DC.Transform.transformWGS84ToCartesian(
                // eslint-disable-next-line new-cap
                new this.DC.Position.fromArray(this.pointPosition)
                new global.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, {
            var panorama = new global.DC.PanoramaBox(this.viewer, {
                domId: 'PanoramaBox',
                position: [positions]
            })
@@ -950,13 +944,13 @@
                this.audioCourse = false
            }
            // eslint-disable-next-line new-cap
            var positions = this.DC.Transform.transformWGS84ToCartesian(
            var positions = global.DC.Transform.transformWGS84ToCartesian(
                // eslint-disable-next-line new-cap
                new this.DC.Position.fromArray(this.pointPosition)
                new global.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, {
            var monitor = new global.DC.PanoramaBox(this.viewer, {
                domId: 'MonitorBox',
                position: [positions]
            })
@@ -996,7 +990,7 @@
            this.$store.commit('SET_ADDTAGPOPUP', false)

            //   if (this.addTagLayer == null) {
            //     this.addTagLayer = new this.DC.HtmlLayer("addTagLayer");
            //     this.addTagLayer = new global.DC.HtmlLayer("addTagLayer");
            //     this.viewer.addLayer(this.addTagLayer);
            //   }

@@ -1028,8 +1022,8 @@
                    // list: [data],
                    add: true
                })
                // const divIcon = new this.DC.DivIcon(
                //   new that.DC.Position(
                // const divIcon = new global.DC.DivIcon(
                //   new global.DC.Position(
                //     Number(that.addTagPosition.lng),
                //     Number(that.addTagPosition.lat),
                //     0
@@ -1105,7 +1099,7 @@

                this.newPopup(result)
                this.viewer.flyToPosition(
                    new this.DC.Position(
                    new global.DC.Position(
                        Number(result.jd),
                        Number(result.wd),
                        300,
@@ -1120,11 +1114,11 @@
        },

        newPopup (item) {
            const position = this.DC.Transform.transformWGS84ToCartesian(
                new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
            const position = global.DC.Transform.transformWGS84ToCartesian(
                new global.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, {
            var popup = new global.DC.DivForms(this.viewer, {
                domId: 'divFormsDomBox',
                position: [position]
            })
@@ -1144,9 +1138,32 @@
}
</script>

<style>
<style lang="scss">
.labelLayeridewm {
    width: 250px !important;
    height: 250px !important;
}

.add-sign-box-style {
    input:-moz-placeholder,
    textarea:-moz-placeholder {
        color: #fff;
    }
    input:-ms-input-placeholder,
    textarea:-ms-input-placeholder {
        color: #fff;
    }
    input::-webkit-input-placeholder,
    textarea::-webkit-input-placeholder {
        color: #fff;
    }

    .addIconsLayerinimgs {
        margin-top: 4px;
    }

    .addIconsLayerin {
        padding: 0 10px;
    }
}
</style>