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

shuishen

2023-02-16 80179ced472d1f8402784905ff0ff350e9ad109f

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

 src/views/activity/index.vue

@@ -789,6 +789,7 @@
            isShowActivityEditBox: false,
            deletePlotVisible: false,
            plotId: '',
            polygonPosition: '',
        }
    },
    created () {
@@ -994,7 +995,8 @@
                res.data.data.forEach(item => {
                    if (item.type == 1 && polylineShow) {
                        let positionNewArr = this.convertPolylineOrPolygonPositionDate(item.position, item.type)
                        item.positionStr = positionNewArr
                        // 线坐标字符串
                        item.linePositionStr = positionNewArr
                        let coords = global.DC.GeoTools.polylineBuffer(positionNewArr, item.width != -1 ? item.width : 100)
                        let polygon = new global.DC.Polygon(coords)
                        let color = ''
@@ -1007,9 +1009,11 @@
                            color = global.DC.Namespace.Cesium.Color.fromBytes(r, g, b, 150)
                        }
                        let position = ''
                        // 面坐标字符串
                        polygon._positions.forEach(item => {
                            position += item._lng + ',' + item._lat + ';'
                        })
                        item.polygonPositionStr = position
                        this.$EventBus.$emit('layerPolygonAdd', {
                            layerName: 'newCarDrawLayers',
                            positions: position,
@@ -1022,8 +1026,7 @@
                        coords.forEach(item => {
                            positionStr += item[0] + ',' + item[1] + ';'
                        })
                        this.getRegionList(positionStr)
                        // }
                        // this.getRegionList(positionStr)
                        this.$EventBus.$emit('layerPolylineAdd', {
                            layerName: 'newCarDrawLayers',
                            positions: positionNewArr,
@@ -1042,7 +1045,6 @@
                                carId: item.carId
                            },
                        })

                    } else if (item.type == 3 && pointShow) {
                        let positionObj = this.convertBillboardPositionDate(item.position, 'policecar', item.id, item.carId, item.deptId)
                        this.$EventBus.$emit('layerPointAdd', {
@@ -1606,7 +1608,8 @@
            this.lineWidth = e.overlay.attrParams.width != -1 ? e.overlay.attrParams.width : 100
            this.chooseColor = e.overlay.attrParams.color != '' ? e.overlay.attrParams.color : '#FF0000'
            this.policeIconId = e.overlay.attrParams.id
            this.linePosition = e.overlay.attrParams.positionStr
            this.linePosition = e.overlay.attrParams.linePositionStr
            this.polygonPosition = e.overlay.attrParams.polygonPositionStr
            if (this.userInfo.dept_id == '1123598813738675201' || this.userInfo.dept_id == this.activityDeptId) {
                this.lineEditVisible = true
            } else {
@@ -1867,6 +1870,7 @@

        // 观看视频
        watchVideo () {
            this.getRegionList(this.polygonPosition)
            this.videoShow = true
            if (tc) {
                tc.clear()
@@ -1877,6 +1881,7 @@
                scale: 0.5
            })
            tc.addTrack(track)
            this.lineEditVisible = false
        },

        // 保存巡逻路线信息