Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

guanqb

2023-03-15 c0a6f83459f63f7d4f17874dd8ed5970828526be

 src/views/activity/components/videoControlBox.vue

@@ -281,10 +281,12 @@

                    }
                })
            }, {
                headingOffset: -90
            })

            track.setModel('/model/qiche.gltf', {
                scale: 0.8
                scale: 1.2
            })

            tc.addTrack(track)
@@ -315,6 +317,7 @@
         * @return {*}
         */
        getRegionList (positionNewStr) {
            console.log(positionNewStr)
            getRegionList({ page: 1, count: 15, range: positionNewStr }).then(res => {
                let monitorData = res.data.data.list
                this.initMonitoringIcon(monitorData)