shuishen
2023-03-15 c3c1616c9c666e170b9ad10c38271d63bb9b2321
活动更改
3 files modified
37 ■■■■ changed files
src/components/map/index.vue 4 ●●●● patch | view | raw | blame | history
src/views/activity/components/videoControlBox.vue 5 ●●●● patch | view | raw | blame | history
src/views/activity/index.vue 28 ●●●● patch | view | raw | blame | history
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-03-10 09:35:24
 * @LastEditTime: 2023-03-15 11:44:38
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -303,7 +303,7 @@
            // global.viewer.addTerrain(terrain)
            // 内网
            // that.switchImg()
            that.switchImg()
            // 外网
            // global.viewer.imageryLayers.addImageryProvider(
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)
src/views/activity/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-03-09 15:22:53
 * @LastEditTime: 2023-03-15 09:15:07
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活
 *
@@ -816,7 +816,7 @@
                        chooseArrow.on(global.DC.MouseEventType.CLICK, this.reeditArrowClick)
                        let point = new global.DC.Point(pointPosition)
                        arrowsListLayer.addOverlay(point)
                        point.attrParams = { 'id': item.id, 'color': item.color, 'item':item ,'pointOverlayData':point}
                        point.attrParams = { 'id': item.id, 'color': item.color, 'item': item, 'pointOverlayData': point }
                        // point.on(global.DC.MouseEventType.CLICK, this.reeditArrowClick)
                        point.setStyle({
                            "color": color, //颜色
@@ -824,7 +824,7 @@
                            "outlineWidth": 0, //边框大小,
                            "pixelSize": 32,
                        })
                        chooseArrow.attrParams = { 'id': item.id, 'color': item.color, 'item':item ,'pointOverlayData':point}
                        chooseArrow.attrParams = { 'id': item.id, 'color': item.color, 'item': item, 'pointOverlayData': point }
                    } else if (item.type == 9 && showType == 'plot') {
                        position = position.split(';')[0].split(',')
                        position = new global.DC.Position(Number(position[0]), Number(position[1]))
@@ -834,7 +834,7 @@
                        arrowsListLayer.addOverlay(label)
                    }
                    if (chooseArrow != null) {
                        if(!(item.type == 6 || item.type == 7 || item.type == 8)){
                        if (!(item.type == 6 || item.type == 7 || item.type == 8)) {
                            chooseArrow.attrParams = { 'id': item.id, 'color': item.color, item }
                        }
                        chooseArrow.setStyle({
@@ -1035,7 +1035,7 @@
        },
        lookStartVideo () {
            this.$refs.VIDEOCONTROLBOX.watchVideo(curLinePolygonPosition)
            this.$refs.VIDEOCONTROLBOX.watchVideo(curLinePosition, curLinePolygonPosition)
        },
        loading () {
@@ -1129,7 +1129,7 @@
        getCarList () {
            getCarList().then(res => {
                res.data.data.forEach(item => {
                    policecarOption.push({ value: `${item.id}`, label: `${item.serialNumber}`, carType: `${item.carType}`,serialNumber:`${item.serialNumber}`,unitCode:`${item.unitCode}`,unitName:`${item.unitName}`,carNo:`${item.carNo}`,deptName:`${item.deptName}`})
                    policecarOption.push({ value: `${item.id}`, label: `${item.serialNumber}`, carType: `${item.carType}`, serialNumber: `${item.serialNumber}`, unitCode: `${item.unitCode}`, unitName: `${item.unitName}`, carNo: `${item.carNo}`, deptName: `${item.deptName}` })
                })
            })
        },
@@ -1166,7 +1166,7 @@
        addActivityPolice (params) {
            addActivityPolice(params).then(res => {
                if (res.data.success) {
                    this.$refs.DRAWBTNBOX.addNewPolice(res.data.data,'policecar')
                    this.$refs.DRAWBTNBOX.addNewPolice(res.data.data, 'policecar')
                    this.$message({
                        message: '添加成功',
                        type: 'success'
@@ -1512,10 +1512,10 @@
        // 双击修改箭头
        reeditArrowDbClick (e) {
            if(e.overlay.attrParams.item.type == 5){
            if (e.overlay.attrParams.item.type == 5) {
                let polygonNewPositions = []
                e.overlay.positions.forEach((item,index)=>{
                    if(index%2==0){
                e.overlay.positions.forEach((item, index) => {
                    if (index % 2 == 0) {
                        polygonNewPositions.push(item)
                    }
                })
@@ -1556,7 +1556,7 @@
        // 保存标绘修改
        savePlot () {
            this.$refs.DRAWBTNBOX.updateSecurityPlot({ id: plotOverlayData.overlay.attrParams.id, color: this.choosePlotColor + ',' + this.choosePlotColorAlpha },plotOverlayData.overlay)
            this.$refs.DRAWBTNBOX.updateSecurityPlot({ id: plotOverlayData.overlay.attrParams.id, color: this.choosePlotColor + ',' + this.choosePlotColorAlpha }, plotOverlayData.overlay)
            this.editPlotVisible = false
        },
@@ -1697,7 +1697,7 @@
            deleteSecurityPlot(id).then(res => {
                if (res.data.success) {
                    plotOverlayData.overlay.remove()
                    if('pointOverlayData' in plotOverlayData.overlay.attrParams){
                    if ('pointOverlayData' in plotOverlayData.overlay.attrParams) {
                        plotOverlayData.overlay.attrParams.pointOverlayData.remove()
                    }
                    this.$message({
@@ -1794,8 +1794,8 @@
        },
        // 获取标绘图层覆盖物
        getArrowsListLayerOverlayList(){
           return arrowsListLayer.getOverlays()
        getArrowsListLayerOverlayList () {
            return arrowsListLayer.getOverlays()
        },
    },