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

shuishen

2023-03-23 69b869b6d82dcd74d728a93e2afbd0c66dad687e

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

 src/components/map/index.vue

@@ -310,18 +310,18 @@
            // global.viewer.addTerrain(terrain)

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

            // 外网
            global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                    url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
                    subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
                    format: 'image/jpeg',
                    show: true,
                    maximumLevel: 18
                })
            )
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
            //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
            //         format: 'image/jpeg',
            //         show: true,
            //         maximumLevel: 18
            //     })
            // )

            // 设置地图初始位置，角度等
            global.viewer.camera.setView({

 src/views/activity/components/drawBtnBox.vue

@@ -448,9 +448,16 @@
                let lineOverlayData = overlayData.attrParams.lineObj
                plot.edit(lineOverlayData, (e) => {
                    let position = ''
                    lineOverlayData._positions.forEach(item => {
                        position += item._lng + ' ' + item._lat + ','
                    let lineNewPositions = []
                    lineOverlayData._positions.forEach((item, index) => {
                        if (index % 2 == 0) {
                            position += item._lng + ' ' + item._lat + ','
                            lineNewPositions.push(item)
                        }
                    })
                    overlayData.attrParams.lineObj.positions = lineNewPositions


                    position = position.slice(0, position.length - 1)
                    this.updateActivityCar({ id: this.policeIconId, color: this.$parent.chooseColor, width: this.lineWidth, type: 1, position: position }, overlayData)
                })

 src/views/activity/index.vue

@@ -686,8 +686,6 @@
                    return lngOrlat
                }).join(';')

                console.log(newPolyData, 9599666)

                this.$EventBus.$emit('layerWallAdd', {
                    layerName: 'polygonWallLayer',
                    positions: newPolyData,
@@ -1318,7 +1316,6 @@
            // 清除定时器
            if (realPoliceTimer != {}) {
                for (let item in realPoliceTimer) {
                    console.log(`定时器realPoliceTimer[${item}]关闭了`)
                    clearInterval(realPoliceTimer[item])
                }
            }
@@ -1351,7 +1348,6 @@
         */
        clearLayerIconForMap (layerName) {
            realPoliceTimer[layerName] && clearInterval(realPoliceTimer[layerName])
            console.log(`定时器realPoliceTimer[${layerName}]关闭了`)
            this.$EventBus.$emit('mapClearLayer', {
                layerName: layerName,
                type: 'VectorLayer'
@@ -1421,7 +1417,6 @@

        // 定时查找实时警力资源
        searchRealResources (layerName) {
            console.log(`定时器realPoliceTimer[${layerName}]开启了`)
            console.log(`定时器[${layerName}]开启了`)
            let type = ''
            if (layerName == 'activityCarLayers') {
@@ -2022,7 +2017,6 @@
        // 清除定时器
        if (realPoliceTimer != {}) {
            for (let item in realPoliceTimer) {
                console.log(`定时器realPoliceTimer[${item}]关闭了`)
                clearInterval(realPoliceTimer[item])
            }
        }