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

liuyg

2022-01-20 2712607013b10c075642fcd80d75762f9ecbf72b

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

 src/components/leftNav/index.vue

@@ -191,7 +191,10 @@
                    const divIcon = new this.DC.DivIcon(
                        new that.DC.Position(Number(item.jd), Number(item.wd), 0),
                        `
                        <img class="monitor-entitys-box" src="/img/leftnav/map-monitor.png" alt="">
                        <div class="monitor-entitys-box">
                            <div>${item.mechanismname}</div>
                            <img class="monitor-entitys-box" src="/img/leftnav/map-monitor.png" alt="">
                        </div>
                        `
                    )
                    divIcon.attrParams = item
@@ -311,12 +314,15 @@
                        outlineColor: that.DC.Color.WHITE, // 边框颜色
                        outlineWidth: 8, // 边框大小，
                        font: '14px sans-serif',
                        pixelOffset: { x: 0, y: -24 }
                        pixelOffset: { x: 0, y: -40 }
                    })
                    that.comeLayer.addOverlay(label)

                    const billboard = new that.DC.Billboard(new that.DC.Position(Number(item.jd), Number(item.wd), 0), '/img/leftnav/map-activity.png')
                    billboard.size = [20, 20]
                    billboard.setStyle({
                        pixelOffset: { x: 0, y: -16 }
                    })

                    that.comeLayer.addOverlay(billboard)
                })

 src/components/map/components/campusBuildingSearch.vue

@@ -393,7 +393,7 @@
                display: flex;
                width: 100%;
                height: 120px;
                justify-content: start;
                justify-content: flex-start;
                flex-wrap: wrap;

                li {

 src/components/map/components/dimension.vue

@@ -108,6 +108,28 @@
                        ])
                    )

                    that.vecLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                        url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
                        type: 'wmts',
                        layer: 'vec',
                        style: 'default',
                        format: 'tiles',
                        tileMatrixSetID: 'w',
                        show: true,
                        maximumLevel: 18
                    }))

                    that.cvaLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                        url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
                        type: 'wmts',
                        layer: 'cva',
                        style: 'default',
                        format: 'tiles',
                        tileMatrixSetID: 'w',
                        show: true,
                        maximumLevel: 18
                    }))

                    var highlighted = {
                        feature: undefined,
                        originalColor: new that.DC.Namespace.Cesium.Color()
@@ -367,7 +389,7 @@
                    })

                    that.viewer.on(that.DC.MouseEventType.CLICK, e => {
                        if (e.overlay != undefined) {
                        if (e.overlay != undefined && e.layer.id == 'areaLayer') {
                            that.viewer.scene.globe.depthTestAgainstTerrain = false

                            that.$store.commit('CLEAR_ALL', null)
@@ -439,27 +461,27 @@
                that.newLayer = null
                // that.viewer.imageryLayers.remove(that.baseLayer)
                that.baseLayer = null
                that.vecLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                    url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
                    type: 'wmts',
                    layer: 'vec',
                    style: 'default',
                    format: 'tiles',
                    tileMatrixSetID: 'w',
                    show: true,
                    maximumLevel: 18
                }))
                // that.vecLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                //     url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
                //     type: 'wmts',
                //     layer: 'vec',
                //     style: 'default',
                //     format: 'tiles',
                //     tileMatrixSetID: 'w',
                //     show: true,
                //     maximumLevel: 18
                // }))

                that.cvaLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                    url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
                    type: 'wmts',
                    layer: 'cva',
                    style: 'default',
                    format: 'tiles',
                    tileMatrixSetID: 'w',
                    show: true,
                    maximumLevel: 18
                }))
                // that.cvaLayer = that.viewer.imageryLayers.addImageryProvider(new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
                //     url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
                //     type: 'wmts',
                //     layer: 'cva',
                //     style: 'default',
                //     format: 'tiles',
                //     tileMatrixSetID: 'w',
                //     show: true,
                //     maximumLevel: 18
                // }))
                that.silhouetteBlue.selected = []
                that.tilesetLayer.show = true
                that.viewer.off(that.DC.SceneEventType.CAMERA_CHANGED, that.camerAzoom())
@@ -485,10 +507,10 @@
                })
            } else {
                that.tilesetLayer.show = false
                that.viewer.imageryLayers.remove(that.vecLayer)
                that.vecLayer = null
                that.viewer.imageryLayers.remove(that.cvaLayer)
                that.cvaLayer = null
                // that.viewer.imageryLayers.remove(that.vecLayer)
                // that.vecLayer = null
                // that.viewer.imageryLayers.remove(that.cvaLayer)
                // that.cvaLayer = null
                that.areaLayer.show = true

                // var provider = new that.DC.Namespace.Cesium.ArcGisMapServerImageryProvider({

 src/components/map/components/mapPopup.vue

@@ -59,7 +59,7 @@
                                                    <i class="popup-icon start-nav deblurring"></i>
                                                    出发
                                                </li>
                                                <li @click="qrCodeClick">
                                                <li v-show="false" @click="qrCodeClick">
                                                    <i class="popup-icon qr-code-nav deblurring"></i>
                                                    二维码
                                                </li>
@@ -448,6 +448,7 @@
            }
            // eslint-disable-next-line new-cap
            var positions = this.DC.Transform.transformWGS84ToCartesian(
                // eslint-disable-next-line new-cap
                new this.DC.Position.fromArray(this.pointPosition)
            )
            this.viewer.scene.globe.depthTestAgainstTerrain = false

 src/styles/entitys/text-entitys.scss

@@ -93,9 +93,9 @@
}

.way-entitys-box {
    margin-left: 40px;
    margin-bottom: 40px;
    
    margin-left: 8px;
    margin-bottom: 136px;

    .way-title {
        border: white 1px solid;
        padding-left: 2px;
@@ -115,6 +115,8 @@
}

.park-entitys-box {
    margin-bottom: 26px;

    .park-title {
        position: relative;
        left: -8px;
@@ -141,12 +143,31 @@


.scene-entitys-box {
    text-align: center;

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

    img {
        height: 40px;
    }
}


.monitor-entitys-box {
    text-align: center;

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

    img {