shuishen
2022-01-26 03ab5ee01cf7fbc8d685af41b45b530155504fba
部分调整
4 files modified
74 ■■■■■ changed files
src/components/campusNav/index.vue 1 ●●●● patch | view | raw | blame | history
src/components/leftNav/index.vue 1 ●●●● patch | view | raw | blame | history
src/components/map/components/dimension.vue 69 ●●●● patch | view | raw | blame | history
src/pcviews/specialmap/welcome.vue 3 ●●●● patch | view | raw | blame | history
src/components/campusNav/index.vue
@@ -454,7 +454,6 @@
        },
        originChange (param) {
            console.log(param, 456)
            this.$store.commit('SET_POINTPOSITION', [
                Number(param.jd),
                Number(param.wd),
src/components/leftNav/index.vue
@@ -187,7 +187,6 @@
            getMonitorList().then(res => {
                res.data.data.forEach(item => {
                    console.log(item, 456)
                    const divIcon = new this.DC.DivIcon(
                        new that.DC.Position(Number(item.jd), Number(item.wd), 0),
                        `
src/components/map/components/dimension.vue
@@ -161,29 +161,58 @@
                    that.tileset.on(that.DC.MouseEventType.CLICK, e => {
                        that.viewer.scene.globe.depthTestAgainstTerrain = false
                        that.$store.commit('CLEAR_ALL', null)
                        if (e.overlay && e.overlay.attr.arcName != null) {
                            this.$store.commit('CLEAR_ALL', null)
                            getDetail({ mechanismname: e.overlay.attr.arcName }).then((res) => {
                                if (res && JSON.stringify(res.data.data) != '{}') {
                                    var result = res.data.data
                        var imgArr = ['http://223.82.109.183:2081/zhxy/upload/20220105/3c05dd70a9eac17b7e49afbfc7b1b68e.png']
                                    var imgArr = result.tpurl.split(',')
                                    this.$store.commit('SET_POPUPBGURL', imgArr[0])
                                    this.$store.commit('SET_POPUPQRURL', result.codeurl)
                                    this.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
                                    this.$store.commit('SET_STATENAME', result.mechanismname)
                                    this.$store.commit('SET_SITENAME', result.address)
                                    this.$store.commit('SET_TELEPHONE', result.telephone)
                                    this.$store.commit('SET_INTRODUCETEXT', result.introduce)
                                    this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
                                    this.$store.commit('SET_POPUPIMGATLAS', imgArr)
                                    if (result.videourl && result.videourl != '') {
                                        this.$store.commit('SET_MONITORURL', result.videourl)
                                    }
                                    if (result.jx != undefined && result.jx != '') {
                                        var tabOne = res.data.data[0].jx.split(',')
                                        this.$store.commit('SET_TEACHLIST', tabOne)
                                    } else {
                                        this.$store.commit('SET_TEACHLIST', [])
                                    }
                        that.$store.commit('SET_POPUPBGURL', imgArr[0])
                        that.$store.commit('SET_POPUPQRURL', 'http://223.82.109.183:2081/zhxy/upload/20211222/9c324adea5d9e5b50cd8f874d5f780f4.png')
                        that.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
                        that.$store.commit('SET_STATENAME', e.overlay.attr.name)
                        that.$store.commit('SET_SITENAME', e.overlay.attr['地址'])
                        that.$store.commit('SET_POPUPIMGATLAS', imgArr)
                                    if (result.sh != undefined && result.sh != '') {
                                        var tabTwo = res.data.data[0].sh.split(',')
                                        this.$store.commit('SET_LIVELIST', tabTwo)
                                    } else {
                                        this.$store.commit('SET_LIVELIST', [])
                                    }
                        // 定制化窗体
                        // eslint-disable-next-line no-unused-vars
                        var popup = new that.DC.DivForms(that.viewer, {
                            domId: 'divFormsDomBox',
                            position: [
                                that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt)))
                            ]
                        })
                                    // 定制化窗体
                                    // eslint-disable-next-line no-unused-vars
                                    var popup = new that.DC.DivForms(that.viewer, {
                                        domId: 'divFormsDomBox',
                                        position: [
                                            that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt)))
                                        ]
                                    })
                        this.$store.commit('SET_PANORAMAPOPUP', false)
                        this.$store.commit('SET_MONITORPOPUP', false)
                        this.$store.commit('SET_DETAILSPOPUP', true)
                                    this.$store.commit('SET_PANORAMAPOPUP', false)
                                    this.$store.commit('SET_MONITORPOPUP', false)
                                    this.$store.commit('SET_DETAILSPOPUP', true)
                                }
                            })
                            this.viewer.flyToPosition(
                                new this.DC.Position(Number(e.wgs84Position.lng + 0.00070806), Number(e.wgs84Position.lat - 0.00261205), 300, Number(-9), Number(-34.54), Number(0))
                            )
                        }
                    })
                    // that.tileset.on(that.DC.MouseEventType.MOUSE_MOVE, e => {
@@ -414,7 +443,7 @@
                                var imgArr = result.tpurl.split(',')
                                this.$store.commit('SET_POPUPBGURL', imgArr[0])
                                this.$store.commit('SET_POPUPQRURL', result.codeurl)
                                that.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
                                this.$store.commit('SET_POINTPOSITION', [Number(e.wgs84Position.lng), Number(e.wgs84Position.lat), Number(e.wgs84Position.alt), Number(0), Number(0), Number(0)])
                                this.$store.commit('SET_STATENAME', result.mechanismname)
                                this.$store.commit('SET_SITENAME', result.address)
                                this.$store.commit('SET_TELEPHONE', result.telephone)
src/pcviews/specialmap/welcome.vue
@@ -3,7 +3,7 @@
 * @Name: 社区迎新
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2022-01-21 16:01:43
 * @Last Modified time: 2022-01-26 10:51:24
 */
<template>
    <div>
@@ -207,7 +207,6 @@
            this.pathLayer.addOverlay(polyline)
        },
        drawPoint (item, name) {
            console.log(item, name)
            const divIcon = new this.DC.DivIcon(
                new this.DC.Position(Number(item[0]), Number(item[1]), 0),
                `