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

guanqb

2023-03-08 557cbac020c3156ccd910402c5f711d1a5a2af97

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

 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-07 11:18:45
 * @LastEditTime: 2023-03-08 09:47:02
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -788,7 +788,9 @@
                    outlineWidth: params.outW || 4, // 边框大小，
                    font: '16px sans-serif',
                    pixelOffset: { x: 0, y: -30 },
                    distanceDisplayCondition: distanceDisplayCondition
                    distanceDisplayCondition: distanceDisplayCondition,
                    heightReference: 0,
                    disableDepthTestDistance: Number.POSITIVE_INFINITY
                })
                labelElement.attrParams = params
                layersObjcect[layerName].addOverlay(labelElement)

 src/styles/base/index.scss

@@ -98,6 +98,7 @@
            align-items: center;
            justify-content: center;
            width: 100%;
            position: relative;
        }
    }
}

 src/styles/media/index.scss

@@ -2789,7 +2789,8 @@
        }

        .el-dialog__body {
            padding: 0 countSizeVh(10);
            padding: countSizeVh(10);
            padding-top: 0;
            height: calc(100% - countSizeVh(40));
            font-size: countSizeVh(16);


 src/views/activity/components/drawBtnBox.vue

@@ -3,7 +3,7 @@
        <div class="left">
            <h3>预案布置</h3>
            <div>
                <span>警力资源：</span>
                <span>要素资源：</span>
                <ul>
                    <li>
                        <button @click="draw('billboard', 'policeman')" title="警员">
@@ -245,10 +245,10 @@
                    if (iconType == 'icon1') {
                        that.$parent.plotSaveType = 6
                        overlay.size = [24, 24]
                    }else if (iconType == 'icon2') {
                    } else if (iconType == 'icon2') {
                        that.$parent.plotSaveType = 7
                        overlay.size = [32, 32]
                    }else if (iconType == 'icon3') {
                    } else if (iconType == 'icon3') {
                        that.$parent.plotSaveType = 8
                    }
                    overlay.icon = `/img/icon/${iconType}.png`
@@ -261,7 +261,7 @@

                            document.oncontextmenu = function () {
                                if (flag) {
                                    that.$parent.choosePlotColor = iconType == 'icon3'?'#d81e06':'#409EFF'
                                    that.$parent.choosePlotColor = iconType == 'icon3' ? '#d81e06' : '#409EFF'
                                    that.$parent.choosePlotColorAlpha = 100
                                    that.$parent.polygonAddVisible = true
                                    that.$parent.isNeedName = false
@@ -376,8 +376,8 @@
                        type: 'error'
                    })
                }
                this.$parent.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'billboard')
                this.$parent.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'plot')
                this.$parent.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'billboard')
                this.$parent.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'plot')
            })
        },


 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 17:24:22
 * @LastEditTime: 2023-03-08 10:32:34
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活
 *
@@ -87,7 +87,7 @@

        <div class="plan-control" v-show="dialogVisible && (isHavePolice || isHaveArrow || isHaveLine)">
            <div class="row-box" v-show="isHavePolice">
                <div class="category">警力资源：</div>
                <div class="category">要素资源：</div>
                <div class="category-value">
                    <el-switch v-model="policeSwitch" @change="switchChange" active-color="#13ce66"
                        inactive-color="#ccc"></el-switch>
@@ -262,7 +262,8 @@
let lineObjdata = null
let plotOverlayData = null
let policecarOption = []

let cameraList = []
let carList = []


export default {
@@ -429,7 +430,6 @@
            isShowActivityEditBox: false,
            editPlotVisible: false,
            plotId: '',
            cameraList: [],
            policeTreeData: [],
            policeDefaultProps: {
                children: 'children',
@@ -670,8 +670,8 @@
            this.getSecurityPoliceList(item.id, this.policeSwitch)
            this.getSecurityCarList(item.id, this.policeSwitch, this.polylineBtnSwitch)
            // 作战标绘
            this.getSecurityPlotList(item.id, this.policeSwitch,'billboard')
            this.getSecurityPlotList(item.id, this.arrowBtnSwitch,'plot')
            this.getSecurityPlotList(item.id, this.policeSwitch, 'billboard')
            this.getSecurityPlotList(item.id, this.arrowBtnSwitch, 'plot')


            this.activityDetails = item
@@ -707,15 +707,15 @@
        switchChange (e) {
            this.getSecurityCarList(this.showingSecurityId, this.policeSwitch, this.polylineBtnSwitch, 'car')
            this.getSecurityPoliceList(this.showingSecurityId, this.policeSwitch)
            this.getSecurityPlotList(this.showingSecurityId, this.policeSwitch,'billboard')
            this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'plot')
            this.getSecurityPlotList(this.showingSecurityId, this.policeSwitch, 'billboard')
            this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'plot')

        },

        // 切换作战标绘
        switchArrowBtnChange (e) {
            this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'plot')
            this.getSecurityPlotList(this.showingSecurityId, this.policeSwitch,'billboard')
            this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'plot')
            this.getSecurityPlotList(this.showingSecurityId, this.policeSwitch, 'billboard')
        },

        // 切换轨迹播放控件
@@ -800,16 +800,16 @@
                        let iconImgName = ''
                        if (item.type == 6) {
                            iconImgName = 'icon1'
                        }else if (item.type == 7) {
                        } else if (item.type == 7) {
                            iconImgName = 'icon2'
                        }else if (item.type == 8) {
                        } else if (item.type == 8) {
                            iconImgName = 'icon3'
                        }
                        position = position.split(';')[0].split(',')
                        let pointPosition = new global.DC.Position(Number(position[0]), Number(position[1]))
                        position = new global.DC.Position(Number(position[0]), Number(position[1]),0.5)
                        position = new global.DC.Position(Number(position[0]), Number(position[1]), 0.5)
                        chooseArrow = new global.DC.Billboard(position, `/img/icon/${iconImgName}.png`)
                        chooseArrow.size = item.type == 6 ?[24, 24]:[32,32]
                        chooseArrow.size = item.type == 6 ? [24, 24] : [32, 32]
                        arrowsListLayer.addOverlay(chooseArrow)
                        chooseArrow.attrParams = { 'id': item.id, 'color': item.color, item }
                        chooseArrow.setStyle({
@@ -834,14 +834,14 @@
                        label.on(global.DC.MouseEventType.RIGHT_DOWN, this.$refs.DRAWBTNBOX.labelDowm)
                        arrowsListLayer.addOverlay(label)
                    }
                    if(chooseArrow!=null){
                    if (chooseArrow != null) {
                        chooseArrow.attrParams = { 'id': item.id, 'color': item.color, item }
                        chooseArrow.setStyle({
                            "material": color,
                        })
                        chooseArrow.on(global.DC.MouseEventType.CLICK, this.reeditArrowClick)
                    }
                    


                    // let position1 = new global.DC.Position(117.94218262137659, 28.434842894894153)
                    // let Label = new global.DC.Label(position1, 'test')
@@ -1268,8 +1268,8 @@
            if (e2.checkedNodes.some(item => {
                return item.label == '视频监控'
            })) {
                if (this.cameraList.length > 0) {
                    this.cameraList.forEach(item => {
                if (cameraList.length > 0) {
                    cameraList.forEach(item => {
                        if (item.longitude && item.latitude) {
                            this.$EventBus.$emit('layerPointAdd', {
                                layerName: 'activityCameraLayers',
@@ -1507,8 +1507,8 @@
                        type: 'error'
                    })
                }
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'billboard')
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'plot')
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'billboard')
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'plot')
            })
        },

@@ -1716,8 +1716,8 @@
                        type: 'error'
                    })
                }
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'billboard')
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch,'plot')
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'billboard')
                this.getSecurityPlotList(this.showingSecurityId, this.arrowBtnSwitch, 'plot')
            })
        },

@@ -1731,9 +1731,9 @@
        getEquipmentAll (params) {
            getEquipmentAll({ ...params, deptId: this.userInfo.dept_id }).then(res => {
                if (params.type == 0) {
                    this.carList = res.data.data
                    carList = res.data.data
                } else {
                    this.cameraList = res.data.data
                    cameraList = res.data.data
                }
            })
        },

 src/views/home/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 17:00:25
 * @LastEditTime: 2023-03-08 09:41:47
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -1343,36 +1343,36 @@



                    // this.$EventBus.$emit('layerPointAdd', {
                    //     layerName: 'polygonLayer',
                    //     type: 'label',
                    //     params: {
                    //         lng: center[0],
                    //         lat: center[1],
                    //         alt: 0,
                    //         text: `${item.name}`,
                    //         outW: 20
                    //     },
                    //     distanceDisplayCondition: { "near": 0, "far": 200000 }
                    // })

                    this.$EventBus.$emit('layerPolygonAdd', {
                    this.$EventBus.$emit('layerPointAdd', {
                        layerName: 'areaPolygonLabel',
                        positions: `${center[0] - 0.01},${center[1] - 0.0020};
                                    ${center[0] + 0.01},${center[1] - 0.0020};
                                    ${center[0] + 0.01},${center[1] + 0.0020};
                                    ${center[0] - 0.01},${center[1] + 0.0020};`,
                        material: new global.DC.Namespace.Cesium.ImageMaterialProperty({
                            image: that.drawText({
                                fontSize: 16,
                                color: 'red',
                                text: item.name
                            }),
                            transparent: true,
                            color: global.DC.Namespace.Cesium.Color.WHITE
                        }),
                        type: 'label',
                        params: {
                            lng: center[0],
                            lat: center[1],
                            alt: 0,
                            text: `${item.name}`,
                            outW: 20
                        },
                        distanceDisplayCondition: { "near": 0, "far": 200000 }
                    })

                    // this.$EventBus.$emit('layerPolygonAdd', {
                    //     layerName: 'areaPolygonLabel',
                    //     positions: `${center[0] - 0.01},${center[1] - 0.0020};
                    //                 ${center[0] + 0.01},${center[1] - 0.0020};
                    //                 ${center[0] + 0.01},${center[1] + 0.0020};
                    //                 ${center[0] - 0.01},${center[1] + 0.0020};`,
                    //     material: new global.DC.Namespace.Cesium.ImageMaterialProperty({
                    //         image: that.drawText({
                    //             fontSize: 16,
                    //             color: 'red',
                    //             text: item.name
                    //         }),
                    //         transparent: true,
                    //         color: global.DC.Namespace.Cesium.Color.WHITE
                    //     }),
                    // })

                    // this.$EventBus.$emit('layerPointAdd', {
                    //     layerName: 'personNumLayer',
                    //     type: 'label',

 src/views/video/list.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 14:44:23
 * @LastEditTime: 2023-03-08 10:04:26
 * @FilePath: \srs-police-affairs\src\views\video\list.vue
 * @Description: 辖区管理
 * 
@@ -89,8 +89,11 @@

        <el-dialog :title="dialogTitle" :modal="false" :visible.sync="dialogVisible" :before-close="dialogBeforeClose"
            :close-on-click-modal="true" class="car-video-box">
            <video-loading v-show="videoPlayShow"></video-loading>

            <video id="videoElement" autoplay controls width="100%" height="100%" style="object-fit: fill"></video>
        </el-dialog>

        <el-dialog :title="drawDialogTitle" :modal="false" :visible.sync="drawDialogVisible"
            :before-close="drawDialogBeforeClose" :close-on-click-modal="true" class="video-draw-box">
            <div>
@@ -197,6 +200,8 @@
                'hsla(209, 100%, 56%)',
                '#c7158577'
            ],

            videoPlayShow: false
        }
    },

@@ -228,6 +233,8 @@
        },

        async siteClick (e) {
            this.videoPlayShow = true

            if (this.flvPlayer != null) {
                this.flvPlayer.pause()
                this.flvPlayer.unload()
@@ -237,6 +244,7 @@
            }

            this.dialogTitle = e.overlay.attrParams.name
            this.dialogVisible = true

            let flvUrl = ''

@@ -246,11 +254,9 @@

            if (typeof flvUrl === 'object') {
                this.$message.error(flvUrl.msg)

                this.dialogVisible = false
                return
            }

            this.dialogVisible = true

            if (flvjs.isSupported()) {
                this.$nextTick(() => {
@@ -263,6 +269,7 @@
                    })
                    this.flvPlayer.attachMediaElement(videoElement)
                    this.flvPlayer.load()
                    this.videoPlayShow = false
                    this.flvPlayer.play()
                })
            }
@@ -674,7 +681,8 @@
                    lng: node.longitude,
                    lat: node.latitude,
                    alt: 1,
                    text: node.name
                    text: node.name,
                    channelId: node.id
                },
                incident: this.siteClick
            })
@@ -695,7 +703,7 @@

            getTreeDevicesNearby({ longitude, latitude, mileage: 1 }).then(res => {
                res.data.data.forEach(item => {
                    if (item.longitude && item.latitude) {
                    if (item.longitude && item.latitude && item.channelId != node.id) {
                        this.$EventBus.$emit('layerPointAdd', {
                            layerName: 'treeValAllLayer',
                            type: "billboard",