修改

shuishen

2023-03-07 4fd41d31cc5bf5563df3977c66694b8e6ae5e855

修改

 src/views/activity/components/drawBtnBox.vue

@@ -125,7 +125,7 @@

                        overlay.policeType = policeType

                        that.$parent.overlayObj = overlay
                        that.$emit('setOverlayObj', overlay)

                        document.oncontextmenu = function () {
                            if (flag == true && poltType == 'billboard') {
@@ -135,7 +135,8 @@
                                    that.$parent.choosePoliceColor = '#FF0000'
                                    that.$parent.policeChooseVisible = true
                                } else if (policeType == 'policecar') {
                                    that.$parent.policeOption = that.$parent.policecarOption
                                    that.$emit('setPoliceOption')

                                    that.$parent.chooseCarColor = '#FF0000'
                                    that.$parent.policeChooseCarVisible = true
                                }
@@ -199,7 +200,6 @@
                    }
                }, { material: global.DC.Color.RED })
            } else if (type == 'billboard') {
                console.log(11)
                const that = this
                let flag = false

@@ -338,8 +338,11 @@
    },

    destroyed () {
        this.removeDraw()
        this.removeDrawArrow()
        drawLayers.remove()
        drawLayers = null

        drawArrowLayers.clear()
        drawArrowLayers = null
    },
}
</script>

 src/views/activity/components/mapSearchBox.vue

@@ -135,7 +135,6 @@
            layerName: 'searchLayer',
            type: 'VectorLayer'
        })

    }
}
</script>

 src/views/activity/components/videoControlBox.vue

@@ -115,8 +115,8 @@
</template>

<script>
let tc = undefined
let track = undefined
let tc = null
let track = null

let flvListPlayer = {
    flvPlayer1: null,
@@ -470,11 +470,7 @@
            type: 'VectorLayer'
        })

        console.log(tc, 56555)

        if (tc) {
            tc.clear()
        }
        tc = null
    },
}
</script>

 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-07 16:42:58
 * @LastEditTime: 2023-03-07 17:24:22
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活
 *
@@ -71,7 +71,8 @@

        <draw-btn-box ref="DRAWBTNBOX" :dialogVisible="dialogVisible" :isShowActivityEditBox="isShowActivityEditBox"
            :showingSecurityId="showingSecurityId" :policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch"
            :arrowBtnSwitch="arrowBtnSwitch" :policeIconId="policeIconId" :lineWidth="lineWidth"></draw-btn-box>
            :arrowBtnSwitch="arrowBtnSwitch" :policeIconId="policeIconId" :lineWidth="lineWidth"
            @setOverlayObj="setOverlayObj" @setPoliceOption="setPoliceOption"></draw-btn-box>

        <div class="second-container" :class="{ 'spread': boxShow, 'take-back': !boxShow }">
            <el-tree :data="treeData" show-checkbox node-key="id" @check="treeCheckClick"></el-tree>
@@ -541,6 +542,14 @@
    },

    methods: {
        setOverlayObj (e) {
            overlayObj = e
        },

        setPoliceOption () {
            this.policeOption = policecarOption
        },

        // 时间选中值触发
        activityTimeChange () {
            let startTime = ''
@@ -907,7 +916,6 @@
                this.isHaveLine = res.data.data.some(item => {
                    return item.type == 1
                })
                console.log(type, pointShow, res.data.data.filter(item => item.type == 3))

                type == 'car' && pointShow && this.addMapCarAndPersonLayers(
                    res.data.data.filter(item => item.type == 3),
@@ -1001,6 +1009,7 @@
                item.polygonPositionStr = positionStr

                let lineObj = new global.DC.Polyline(positionNewArr)

                lineLayer.addOverlay(lineObj)
                lineObj.setStyle({
                    'material': lineColor,
@@ -1068,10 +1077,6 @@
        preventFocusLost (event) {
            event.preventDefault()
        },





        // 下拉选择值变化
        activityTypeChange () {
@@ -1871,18 +1876,19 @@
        })

        arrowsListLayer.remove()
        arrowsListLayer = null

        lineLayer.remove()
        if (pointCircleManLayer != null) {
            pointCircleManLayer.remove()
        }
        lineLayer = null

        if (pointCircleCarLayer != null) {
            pointCircleCarLayer.remove()
        }
        pointCircleManLayer.remove()
        pointCircleManLayer = null

        if (polylineAreaLayer) {
            polylineAreaLayer.remove()
        }
        pointCircleCarLayer.remove()
        pointCircleCarLayer = null

        polylineAreaLayer.remove()
        polylineAreaLayer = null

        this.$parent.$parent.resize('0px')
    }