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

liuyg

2022-02-08 5db837aa2d6aef6455c017d8ce58f235dde339fe

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

 public/img/leftnav/map-activity.png

 public/img/leftnav/map-monitor.png

 public/img/leftnav/map-panorama.png

 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

@@ -171,7 +171,7 @@
                        new that.DC.Position(Number(item.jd), Number(item.wd), 0),
                        `
                        <div  class="way-entitys-box">
                            <div  class="way-title" style="border: white 1px solid; padding-left: 2px;font-size: 12px; background: #0066ff;  width: 12px;line-height: 13px; padding:2px 1px 2px 1px; color:white;">
                            <div  class="way-title" style="border: white 1px solid; font-size: 0.875rem; background: #0066ff;  width: 18px; line-height: 14px; padding: 6px 2px 6px 2px; color: white; text-align: center;">
                                 ${item.roadname}
                            </div>
                            <div  class="way-sign-box">
@@ -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

@@ -141,32 +141,78 @@
                        originalColor: new that.DC.Namespace.Cesium.Color()
                    }

                    const videoLayer = new that.DC.CameraVideoLayer('video-layer').addTo(that.viewer)

                    const cameraVideo = new that.DC.CameraVideo(new that.DC.Position(
                        114.03935976, 27.62939045,
                        100.25,
                        4.2,
                        -90
                    ), document.getElementById('video'))
                    cameraVideo.setStyle({
                        fov: 30,
                        far: 120,
                        near: 1,
                        aspectRatio: 1.3,
                        alpha: 0.7
                    })
                    videoLayer.addOverlay(cameraVideo)

                    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 => {
@@ -295,7 +341,7 @@
                    that.viewer.camera.setView({
                        // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
                        // fromDegrees()方法，将经纬度和高程转换为世界坐标
                        destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 600.0),
                        destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 500.0),
                        orientation: {
                            // 指向
                            heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -305,7 +351,6 @@
                        }
                    })

                    that.viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())
                    // 最小
                    that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200
                    // 最大
@@ -398,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)
@@ -460,7 +505,7 @@
                            that.viewer.camera.setView({
                                // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
                                // fromDegrees()方法，将经纬度和高程转换为世界坐标
                                destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 600.0),
                                destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 500.0),
                                orientation: {
                                    // 指向
                                    heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -471,6 +516,47 @@
                            })
                        }
                    }

                    that.viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, () => {
                        if (that.dimensionValue != undefined && that.dimensionValue != '真三维') {
                            const height = Math.ceil(that.viewer.camera.positionCartographic.height)

                            that.viewer.camera.setView({
                                orientation: {
                                    // 指向
                                    heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
                                    // 视角
                                    pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
                                    roll: 0.0
                                }
                            })

                            if (height < 200) {
                                that.viewer.camera.setView({
                                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 200),
                                    orientation: {
                                        // 指向
                                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
                                        // 视角
                                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
                                        roll: 0.0
                                    }
                                })
                            };
                            if (height > 1000) {
                                that.viewer.camera.setView({
                                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 1000),
                                    orientation: {
                                        // 指向
                                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
                                        // 视角
                                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
                                        roll: 0.0
                                    }
                                })
                            }
                        }
                    })
                }
            }
        }
@@ -509,8 +595,6 @@
                // }))
                that.silhouetteBlue.selected = []
                that.tilesetLayer.show = true
                that.viewer.off(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())

                // 最小
                that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 1.0
                // 最大
@@ -560,7 +644,7 @@
                that.viewer.camera.setView({
                    // Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
                    // fromDegrees()方法，将经纬度和高程转换为世界坐标
                    destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 600.0),
                    destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(114.039779, 27.629696, 500.0),
                    orientation: {
                        // 指向
                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
@@ -569,54 +653,12 @@
                        roll: 0.0
                    }
                })

                that.viewer.on(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())
                // 最小
                that.viewer.scene.screenSpaceCameraController.minimumZoomDistance = 200
                // 最大
                that.viewer.scene.screenSpaceCameraController.maximumZoomDistance = 1000
                // 视角旋转
                that.viewer.scene.screenSpaceCameraController.enableTilt = false
            }
        },

        camerAzoom () {
            var that = this
            const height = Math.ceil(that.viewer.camera.positionCartographic.height)

            that.viewer.camera.setView({
                orientation: {
                    // 指向
                    heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
                    // 视角
                    pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
                    roll: 0.0
                }
            })

            if (height < 200) {
                that.viewer.camera.setView({
                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 200),
                    orientation: {
                        // 指向
                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
                        // 视角
                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
                        roll: 0.0
                    }
                })
            };
            if (height > 1000) {
                that.viewer.camera.setView({
                    destination: that.DC.Namespace.Cesium.Cartesian3.fromRadians(that.viewer.camera.positionCartographic.longitude, that.viewer.camera.positionCartographic.latitude, 1000),
                    orientation: {
                        // 指向
                        heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
                        // 视角
                        pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
                        roll: 0.0
                    }
                })
            }
        }
    }

 src/components/map/index.vue

@@ -4,6 +4,18 @@
         style="height: 100%; width: 100%;"
         @click="mapClick($event)">

        <video id="video"
               style="position: fixed;
                visibility: hidden;"
               muted
               autoplay
               loop
               crossorigin
               controls>
            <source src="http://dc.dvgis.cn/examples/data/demo.mp4"
                    type="video/mp4" />
        </video>

        <div style="
            position: fixed;
            left: 4px;
@@ -55,6 +67,65 @@
        return {
            DC: null,
            areaLayer: null
        }
    },
    watch: {
        searchPopupFlag: {
            immediate: true,
            handler (newVal, oldVal) {
                if (newVal == true) {
                    if (this.$route.path.indexOf('/pcLayout/default/service') != -1) {
                        this.$store.dispatch('delVisitedViews', this.$route)
                        this.$router.push('/pcLayout/default')
                    }

                    if (this.$route.path.indexOf('/orgnav') != -1) {
                        this.$store.dispatch('delVisitedViews', this.$route)
                        this.$router.push('/pcLayout/default')
                        this.$store.commit('SET_ORGNAVBARTITLE', '')
                        this.$store.commit('SET_ORGNAVBARLIST', [])
                        this.$store.commit('SET_ORGNAVBARFLAG', false)
                    }

                    if (this.orgNavBarFlag == true) {
                        this.$store.commit('SET_ORGNAVBARTITLE', '')
                        this.$store.commit('SET_ORGNAVBARLIST', [])
                        this.$store.commit('SET_ORGNAVBARFLAG', false)
                    }

                    if (this.$route.path.indexOf('/arc') != -1) {
                        this.$store.dispatch('delVisitedViews', this.$route)
                        this.$router.push('/pcLayout/default')
                        this.$store.commit('SET_ARCNAVBARTITLE', '')
                        this.$store.commit('SET_ARCNAVBARCODE', '')
                        this.$store.commit('SET_ARCNAVBARFLAG', false)
                    }

                    if (this.arcNavBarFlag == true) {
                        this.$store.commit('SET_ARCNAVBARTITLE', '')
                        this.$store.commit('SET_ARCNAVBARCODE', '')
                        this.$store.commit('SET_ARCNAVBARFLAG', false)
                    }
                }
            }
        },

        orgNavBarFlag: {
            immediate: true,
            handler (newVal, oldVal) {
                if (newVal == true) {
                    this.$store.commit('SET_SEARCHPOPUPFLAG', false)
                }
            }
        },

        arcNavBarFlag: {
            immediate: true,
            handler (newVal, oldVal) {
                if (newVal == true) {
                    this.$store.commit('SET_SEARCHPOPUPFLAG', false)
                }
            }
        }
    },
    computed: {
@@ -284,7 +355,7 @@
            //     name: '地形'
            // })

            // viewer.use(new that.DC.Measure())
            viewer.use(new that.DC.Measure())

            // viewer.flyToPosition(
            //     new that.DC.Position(117.08489820, 31.65413916, 1500, 0, -90, 45)

 src/pcviews/service/aed.vue

@@ -3,7 +3,7 @@
 * @Name: AED
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:29:35
 * @Last Modified time: 2022-01-25 09:29:14
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/alleyway.vue

@@ -3,7 +3,7 @@
 * @Name: 出入口
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:30:43
 * @Last Modified time: 2022-01-25 09:29:24
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/bank.vue

@@ -3,7 +3,7 @@
 * @Name: 银行网点
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:30:51
 * @Last Modified time: 2022-01-25 09:29:31
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/canteen.vue

@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/copy.vue

@@ -3,7 +3,7 @@
 * @Name: 打字复印
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:31:00
 * @Last Modified time: 2022-01-25 09:29:40
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/express.vue

@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/medical.vue

@@ -3,7 +3,7 @@
 * @Name: 社区内医疗
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:31:10
 * @Last Modified time: 2022-01-25 09:29:54
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/park.vue

@@ -3,7 +3,7 @@
 * @Name: 停车场
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:31:15
 * @Last Modified time: 2022-01-25 09:29:59
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/service.vue

@@ -3,7 +3,7 @@
 * @Name: 通信营业厅
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-21 11:42:12
 * @Last Modified time: 2022-01-25 09:30:05
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/showers.vue

@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/supermarket.vue

@@ -3,7 +3,7 @@
 * @Name: 购物超市
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:31:31
 * @Last Modified time: 2022-01-25 09:30:12
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 src/pcviews/service/transfer.vue

@@ -3,7 +3,7 @@
 * @Name: 圈存机
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:31:32
 * @Last Modified time: 2022-01-25 09:30:17
 */
<template>
    <div>
@@ -36,12 +36,16 @@
            this.$store.commit('SET_ARCNAVBARCODE', '')
            this.$store.commit('SET_ARCNAVBARFLAG', false)
        }
        if (this.searchPopupFlag == true) {
            this.$store.commit('SET_SEARCHPOPUPFLAG', false)
        }
    },
    computed: {
        ...mapGetters([
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
            'arcNavBarFlag',
            'searchPopupFlag'
        ])
    },
    methods: {

 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),
                `

 src/pcviews/tool/ranging.vue

@@ -3,7 +3,7 @@
 * @Name: 地图测距
 * @Date: 2021-11-13 16:04:27
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-24 09:46:27
 * @Last Modified time: 2022-01-26 11:24:56
 */

<template>
@@ -34,7 +34,7 @@
            <el-button type="danger"
                       size="mini"
                       @click.stop="deactivate">
                结束
                清除
            </el-button>
        </div>
    </div>

 src/styles/entitys/text-entitys.scss

@@ -7,6 +7,7 @@
    align-items: center;
    justify-content: center;
    flex-direction: column;

    .tag-content {
        font-size: 1.1rem;
        font-weight: 900;
@@ -14,15 +15,18 @@
        -webkit-text-stroke-color: #fff;
        -webkit-text-stroke-width: 0.6px;
    }

    .tag-angle-content {
        width: $imgsize;
        height: $imgsize;

        img {
            width: 100%;
            height: 100%;
        }
    }
}

.mobiletag-entitys-box-pink {
    // 手机地图点  勿删  粉色
    height: 28px;
@@ -30,6 +34,7 @@
    align-items: center;
    justify-content: center;
    flex-direction: column;

    .tag-content {
        font-size: 1.1rem;
        font-weight: 900;
@@ -37,15 +42,18 @@
        -webkit-text-stroke-color: #fff;
        -webkit-text-stroke-width: 0.6px;
    }

    .tag-angle-content {
        width: $imgsize;
        height: $imgsize;

        img {
            width: 100%;
            height: 100%;
        }
    }
}

.tag-entitys-box {
    height: 28px;

@@ -77,6 +85,7 @@
    .point-logo {
        height: 40px;
        text-align: center;

        img {
            height: 40px;
        }
@@ -121,8 +130,14 @@
    }

    .park-sign-box {
        width: 22;
        text-align: center;

        &>div:first-child {
            img {
                width: 22px;
                height: 22px;
            }
        }
    }
}

@@ -144,7 +159,7 @@
        line-height: 24px;
        text-align: center;
        font-weight: 700;
        color: #009bff;
        color: #0054d3;
        text-shadow: 0 0 2px #fff;
    }

@@ -158,10 +173,10 @@
    text-align: center;

    div {
        line-height: 24px;
        line-height: 10px;
        text-align: center;
        font-weight: 700;
        color: #009bff;
        color: #0054d3;
        text-shadow: 0 0 2px #fff;
    }