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

jxdnsong

2023-04-05 50a9a2c3debc2299e5994f7d74a77e39641c4d3a

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

 src/views/home/index.vue

@@ -993,11 +993,11 @@
            })

            if (e == true) {
                if(this.userInfo.dept_id == '1123598813738675201'){
                if (this.userInfo.dept_id == '1123598813738675201') {
                    //分局定位
                    initMapPosition()
                }
                else{
                else {
                    //其他派出所定位
                    const center = this.getAllRegionCenter(this.areaOptions)

@@ -1022,11 +1022,11 @@

            if (e == true) {

                if(this.userInfo.dept_id == '1123598813738675201'){
                if (this.userInfo.dept_id == '1123598813738675201') {
                    //分局定位
                    initMapPosition()
                }
                else{
                else {
                    //其他派出所定位
                    const center = this.getAllRegionCenter(this.areaOptions)

@@ -1038,7 +1038,7 @@
                        sitePitch: -45
                    })
                }
                


                this.getEquipmentAll({ type: 1, deptId: this.policeStaionID == '' ? this.userInfo.dept_id : this.policeStaionID })
            }
@@ -1946,6 +1946,16 @@
            type: 'ClusterLayer'
        })

        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'keypeopleslayer',
            type: 'ClusterLayer'
        })

        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'schoolJSONlayer',
            type: 'ClusterLayer'
        })

        if (cylinderLayer != null) {
            cylinderLayer.remove()
            cylinderLayer = null