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

shuishen

2023-02-09 bedc4713b9eaffba4d3fa5bb25158ea650cf0a9a

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

 src/views/activity/index.vue

@@ -1668,7 +1668,7 @@

        this.$EventBus.$emit('mapClearLayer', {
            layerName: 'searchLayer',
            type: 'label'
            type: 'VectorLayer'
        })

        analyseLayer.clear()

 src/views/house/index.vue

@@ -1435,7 +1435,7 @@
        this.$parent.$parent.resize('0px')
        this.$EventBus.$emit('mapClearLayer', {
            layerName: 'searchLayer',
            type: 'label'
            type: 'VectorLayer'
        })
        this.$EventBus.$emit('mapClearLayer', {
            layerName: 'deepDataLayer',

 src/views/police/index.vue

@@ -724,7 +724,7 @@

        this.$EventBus.$emit('mapClearLayer', {
            layerName: 'searchLayer',
            type: 'label'
            type: 'VectorLayer'
        })

        tc.pause()

 src/views/video/list.vue

@@ -685,7 +685,7 @@

        this.$EventBus.$emit('mapClearLayer', {
            layerName: 'searchLayer',
            type: 'label'
            type: 'VectorLayer'
        })

        graphicLayer.destroy()

 src/views/video/region.vue

@@ -43,10 +43,10 @@
                                @cell-click="rowClick"
                            >
                                <el-table-column prop="name" label="范围名称" min-width="50%"></el-table-column>
                                <el-table-column prop="extent" label="长度" min-width="50%">
                                <el-table-column prop="extent" label="长度/km" min-width="50%">
                                    <!-- <template slot-scope="scope">
                                        <span v-if="scope.row.type == 1">线</span>
                                        <span v-else>面</span>
                                        <span>{{ scope.row.extent }}</span>
                                        <span>千米</span>
                                    </template>-->
                                </el-table-column>
                                <el-table-column prop="id" label="操作" min-width="50%">
@@ -642,6 +642,11 @@
                let monitorData = res.data.data.list
                console.log(res.data.data.list, 123)
                this.monitoringList = res.data.data.list
                this.$EventBus.$emit('mapRemoveLayer', {
                    layerName: 'monitoringLayers',
                    type: 'VectorLayer'
                })
                this.initMonitoringIcon()
                this.monitorOption = []
                monitorData.forEach((item, index) => {
                    let flvUrl = ''