Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

guanqb

2023-04-23 4bcad828873db1b4fc67de71d8fefa53675547f8

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 public/images/jjx.png

 src/components/map/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-21 17:52:13
 * @LastEditTime: 2023-04-23 20:40:15
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -292,10 +292,10 @@
            // global.viewer.addTerrain(terrain)

            // 内网
            // that.switchImg()
            that.switchImg()

            // 地形数据添加
            // that.addTerrain()
            that.addTerrain()

            // 外网
            global.viewer.imageryLayers.addImageryProvider(
@@ -471,6 +471,10 @@

        this.$EventBus.$on('layerWallAdd', (params) => {
            that.layerWallAdd(params.layerName, params.positions)
        })

        this.$EventBus.$on('rowLayerWallAdd', (params) => {
            that.rowLayerWallAdd(params.layerName, params.positions)
        })

        this.$EventBus.$on('getOverLayerID', (params) => {
@@ -1082,6 +1086,23 @@
            layersObjcect[layerName].addOverlay(wall)
        },

        rowLayerWallAdd (layerName, positions) {
            if (!layersObjcect[layerName] || layersObjcect[layerName] == null) {
                this.mapAddLayer(layerName, 'VectorLayer')
            }

            let wall = new global.DC.Wall(positions)
            wall.setStyle({
                material: new global.DC.WallImageTrailMaterialProperty({
                    image: '/images/jjx.png',
                    color: global.DC.Namespace.Cesium.Color.fromBytes(255, 255, 0, 180),
                    repeat: { x: 20, y: 1 },
                    speed: 10
                })
            })
            layersObjcect[layerName].addOverlay(wall)
        },

        /**
         * @description: 通过ID获取图层
         * @return {*}

 src/views/activity/components/publicIndex.vue

@@ -318,6 +318,8 @@
            // 加载当前活动区域
            if (params.item.activityArea && params.item.activityArea.length > 0) {

                console.log(params.item.activityArea, 36223322)

                let polyGonData = params.item.activityArea.slice(11, params.item.activityArea.length - 1)
                polyGonData = polyGonData.replace(/,/g, ";")
                polyGonData = polyGonData.replace(/ /g, ",")
@@ -332,7 +334,7 @@

                console.log(newPolyData, 456)

                this.$EventBus.$emit('layerWallAdd', {
                this.$EventBus.$emit('rowLayerWallAdd', {
                    layerName: 'polygonWallLayer',
                    positions: newPolyData
                })

 src/views/house/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-18 20:29:31
 * @LastEditTime: 2023-04-22 09:15:54
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -650,7 +650,7 @@
        this.$parent.$parent.resize("400px", true)

        this.$nextTick(() => {
            // this.$EventBus.$emit('highOrLightChange', 'light', 'house')
            this.$EventBus.$emit('highOrLightChange', 'light', 'house')

            this.$EventBus.$emit('registerMxClick', this.getAoiByPtStd)