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

guanqb

2023-02-28 6ff9bf8cffefc6045a1a288df413aa69b59f0bbf

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

 pnpm-lock.yaml

New file
Diff too large

 public/img/mx.png

 src/components/map/components/mapPopup.vue

@@ -21,14 +21,8 @@
                                    <div class="close" @click="closePopup" title="关闭"></div>
                                </div>
                                <div class="change-btn" v-show="detailsPopup.showBtn">
                                    <div
                                        @click="currentBtn = '接警信息'"
                                        :class="{ on: currentBtn == '接警信息' }"
                                    >接警信息</div>
                                    <div
                                        @click="currentBtnChange('出警信息')"
                                        :class="{ on: currentBtn == '出警信息' }"
                                    >出警信息</div>
                                    <div @click="currentBtn = '接警信息'" :class="{ on: currentBtn == '接警信息' }">接警信息</div>
                                    <div @click="currentBtnChange('出警信息')" :class="{ on: currentBtn == '出警信息' }">出警信息</div>
                                </div>

                                <div v-show="currentBtn == '接警信息'" class="label-content">
@@ -70,10 +64,7 @@
                                    </div>
                                </div>

                                <div
                                    v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) != '{}'"
                                    class="label-content"
                                >
                                <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) != '{}'" class="label-content">
                                    <div class="item">
                                        <div>处警单位:</div>
                                        <div>{{ CJdata.CJDWMC }}</div>
@@ -112,10 +103,8 @@
                                    </div>
                                </div>

                                <div
                                    v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) == '{}'"
                                    class="label-content no-data"
                                >暂无数据</div>
                                <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) == '{}'"
                                    class="label-content no-data">暂无数据</div>
                            </div>
                        </div>
                        <div class="b-t-l"></div>
@@ -195,9 +184,11 @@
        },

        popupDetailShow () {
            if (this.detailsPopup.showBtn == true) {
                this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup)
            if (this.detailsPopup.openMenu != '' && this.detailsPopup.openMenu == 'policeInfor') {
                this.$EventBus.$emit('PoliceInforSiteClick', this.dataPopup)
            } else {
                this.detailsPopup.showBtn == true ?
                    this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup) :
                this.$EventBus.$emit('housingPoliceSiteClick', this.dataPopup)
            }
        }
@@ -228,20 +219,16 @@
}

.divForms-theme .area {
    background-image: linear-gradient(
            135deg,
    background-image: linear-gradient(135deg,
            transparent 30px,
            #1831a79a 30px,
            #3f487ba6 50%,
            transparent 50%
        ),
        linear-gradient(
            -45deg,
            transparent 50%),
        linear-gradient(-45deg,
            transparent 30px,
            #1831a79a 30px,
            #3f487ba6 50.1%,
            transparent 50%
        );
            transparent 50%);
}

.divForms .area {

 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-02-23 17:31:31
 * @LastEditTime: 2023-02-28 14:16:16
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -22,18 +22,38 @@
            </el-tooltip>
        </div>
        <!-- 切换矢量图按钮 -->
        <div class="image-switch-icon-btn" title="切换影像" @mouseover="showImgBtn = true" @mouseleave="showImgBtn = false">
            <div class="icon-box">
        <div class="image-switch-icon-btn">
            <div class="icon-box" @click.stop="showImgBtn = !showImgBtn">
                <img src="/img/base_map.png" alt />
            </div>

            <div class="image-switch-img-btn" v-show="showImgBtn" @mouseover="showImgBtn = true"
                @mouseleave="showImgBtn = false">
            <div class="image-switch-img-btn" v-show="showImgBtn">
                <div class="layer-change-box">
                    <div class="title">
                        底图
                        <div class="close" @click.stop="showImgBtn = false" title="关闭"></div>
                    </div>
                    <div class="content">
                <div class="img" @click="switchImg">
                    <span :class="{ on: imgtype == 0 }">影像</span>
                </div>
                <div class="elec" @click="switchElec">
                    <span :class="{ on: imgtype == 1 }">矢量</span>
                        </div>
                    </div>
                </div>
                <div class="layer-change-box">
                    <div class="title">
                        模型
                    </div>
                    <div class="content">
                        <div class="img light" @click="highOrLightChange('light')">
                            <span :class="{ on: tilesetLayerType == 'light' }">轻量</span>
                        </div>
                        <div class="elec high" @click="highOrLightChange('high')">
                            <span :class="{ on: tilesetLayerType == 'high' }">高精</span>
                        </div>
                    </div>
                </div>
            </div>
        </div>
@@ -45,6 +65,54 @@
</template>

<script>


let tile3DUrl = ''

if (process.env.NODE_ENV == 'development') {
    // 开发
    tile3DUrl = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET_TILEURL
} else {
    // 部署
    tile3DUrl = window.BASE_URL_CONFIG.VUE_APP_INTRANET_TILEURL
}

let label = [
    '01',
    '02',
    '03',
    '04',
    '05',
    '06',
    '07',
    '08',
    '09',
    '10',
    '11',
    '12',
    '13',
    '14',
    '15',
    '16',
    '17',
    '18',
    '19',
    '20',
    '21',
    '22',
    '23',
    '24',
    '25',
    '26',
    '27',
    '28',
    '29',
    '30',
    '31',
    '32',
    '33',
    '34'
]

var siteEntitylayers = null

@@ -114,6 +182,7 @@
            carTotal: 0,
            showImgBtn: false,
            imgtype: 0,
            tilesetLayerType: ''
        }
    },

@@ -432,6 +501,46 @@
    },

    methods: {
        /**
         * @description: 高精度模型和轻量模型切换
         * @param {*} type
         * @return {*}
         */
        highOrLightChange (type) {
            this.removeMxTileset('sdTilesetLayer', this.housingIndent)

            // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)


            if (this.tilesetLayerType == type) {
                this.tilesetLayerType = ''

            } else {
                this.tilesetLayerType = type

                type == 'light' ?
                    label.forEach(item => {
                        this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/all/${item}/tileset.json`, this.housingIndent)
                    }) :
                    label.forEach(item => {
                        this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/all1/${item}/tileset.json`, this.housingIndent)
                    })
            }

            this.showImgBtn = false
        },

        /**
         * @description: 社区感知下，模型的点击事件
         * @param {*} e
         * @return {*}
         */
        housingIndent (e) {
            if (this.$route.path == '/layout/house') {
                this.$EventBus.$emit('housingIndent', e)
            }
        },

        // 模型的点击事件
        tilesetClick (e) {
            if (this.$route.path != "/layout/house") {

 src/store/modules/popupParams.js

@@ -2,7 +2,8 @@
    state: {
        detailsPopup: {
            showBox: false,
            showBtn: true
            showBtn: true,
            openMenu: ''
        },
        dataPopup: {}
    },

 src/styles/dc/index.scss

@@ -137,16 +137,29 @@

.image-switch-img-btn {
    display: flex;
    align-items: center;
    justify-content: center;
    flex-direction: column;
    position: absolute;
    font-size: 20px;
    font-weight: normal;
    color: #fff;
    background: #fff;
    background: $bg-color;
    border-radius: 5px;
    z-index: 97;
    // background-color: $table-header-bg-color !important;
    cursor: pointer;
    transform: translate(0, -50%);


    .layer-change-box {
        display: flex;
        flex-direction: column;

        .title {}

        .content {
            display: flex;
        }
    }

    .img,
    .elec {
@@ -155,17 +168,17 @@
        background-size: 100% 100%;
        width: 80px;
        height: 60px;
        border: 2px solid $table-header-bg-color;

        span {
            position: absolute;
            right: 2px;
            bottom: 2px;
            padding: 0 2px;
            left: 0;
            bottom: 0;
            background: rgba(0, 0, 0, 0.5);

        }

        &>.on {
            background-color: $table-header-bg-color;
            color: #337fe5;
        }
    }

@@ -178,4 +191,12 @@
    .elec {
        background-image: url(/img/elec.png);
    }

    .light {
        background-image: url(/img/mx.png);
    }

    .high {
        background-image: url(/img/mx.png);
    }
}

 src/styles/media/index.scss

@@ -2446,25 +2446,70 @@
                    bottom: countSizeVh(390) !important;
                }


                .image-switch-img-btn {
                    top: 0;
                    left: countSizeVw(40, 1920);
                    font-size: countSizeVh(20);
                    left: countSizeVw(46, 1920);
                    font-size: countSizeVh(16);
                    border-radius: countSizeVh(5);

                    .img,
                    .elec {
                    .layer-change-box {
                        .title {
                            position: relative;
                            padding: 0 countSizeVw(8, 1920);
                            height: countSizeVh(32);
                            line-height: countSizeVh(32);
                            text-align: left;

                            .close {
                                position: absolute;
                                right: 5px;
                                top: 0;
                            }

                            .close::before {
                                font-family: element-icons;
                                content: '\e6db';
                                cursor: pointer;
                                font-size: 16px;
                            }

                            .close:hover::before {
                                color: #3d95f3;
                            }
                        }

                        .content {
                            padding: 0 countSizeVw(8, 1920);
                            height: countSizeVh(66);
                            line-height: countSizeVh(66);

                            &>div:last-child {
                                margin: 0;
                            }

                            &>div {
                                margin-right: countSizeVw(8, 1920);
                        width: countSizeVh(80);
                        height: countSizeVh(60);
                        border: countSizeVh(2) solid $table-header-bg-color;
                                height: 100%;
                                border: 2px solid #fff;
                                border-radius: countSizeVw(4, 1920);
                                overflow: hidden;

                        span {
                            right: countSizeVh(2);
                            bottom: countSizeVh(2);
                            padding: 0 countSizeVh(2);
                                    width: 100%;
                                    height: countSizeVh(24);
                                    line-height: countSizeVh(24);
                        }
                    }
                }
                    }

                    .layer-change-box:last-child {
                        margin-bottom: countSizeVw(8, 1920);
                    }

                }

                .equiment-details-box {
                    .el-dialog {

 src/styles/media/index1.scss

@@ -1026,6 +1026,40 @@
                    width: countSizeVh(36);
                    height: countSizeVh(36);
                    font-size: countSizeVh(20);


                    .image-switch-img-btn {
                        left: countSizeVw(46, 1920);
                        bottom: countSizeVh(190);
                        font-size: countSizeVh(20);
                        border-radius: countSizeVh(5);


                        .layer-change-box {
                            .title {
                                height: countSizeVh(32);
                                line-height: countSizeVh(32);
                            }

                            .content {
                                padding: 0 countSizeVw(18, 1920);
                                height: countSizeVh(66);
                                line-height: countSizeVh(66);
                            }
                        }

                        .img,
                        .elec {
                            width: countSizeVh(80);
                            height: countSizeVh(60);

                            span {
                                right: countSizeVh(2);
                                bottom: countSizeVh(2);
                                padding: 0 countSizeVh(2);
                            }
                        }
                    }
                }

                .image-switch-icon-btn.iconbottom {
@@ -1041,25 +1075,6 @@
                    bottom: countSizeVh(390) !important;
                }

                .image-switch-img-btn {
                    left: countSizeVw(46, 1920);
                    bottom: countSizeVh(190);
                    font-size: countSizeVh(20);
                    border-radius: countSizeVh(5);

                    .img,
                    .elec {
                        width: countSizeVh(80);
                        height: countSizeVh(60);
                        border: countSizeVh(2) solid $table-header-bg-color;

                        span {
                            right: countSizeVh(2);
                            bottom: countSizeVh(2);
                            padding: 0 countSizeVh(2);
                        }
                    }
                }
            }
        }


 src/views/home/components/rightContainer.vue

@@ -15,7 +15,10 @@
                        <el-table-column prop="contact" label="联系方式"></el-table-column>
                    </el-table>
                    <div class="pointList">
                        <div class="point" v-for="(item, index) in schedulingDeptList" :key="index" @click="getSchedlingList(item)"></div>
                        <el-tooltip class="item" effect="dark" :content="item.dept" placement="top" v-for="(item, index) in schedulingDeptList" :key="index">
                            <div class="point"  @click="getSchedlingList(item)">
                            </div>
                        </el-tooltip>
                    </div>
                </div>
            </div>

 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-02-24 17:21:13
 * @LastEditTime: 2023-02-28 11:40:39
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -253,7 +253,7 @@
            </div>
        </el-dialog>

        <el-dialog title="警情信息" :modal="true" :visible.sync="policeSituationVisible"
        <el-dialog title="警情信息" :modal="true" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :close-on-click-modal="true" class="policeSituation-details-box">
            <div class="btn-change">
                <div :class="{ on: policeInformationType == '接警信息' }" @click="alarmOrActAsPolice('接警信息')">接警信息</div>
@@ -675,6 +675,7 @@
        // 加载首页下拉列表数据
        getPoliceStationTree (type, id = '') {
            getPoliceStationTree(type, id).then(res => {

                if (this.destroyFlag == false) return
                if (type == 1) {

@@ -713,16 +714,16 @@
                    })
                } else {
                    this.housingOptions = res.data.data
                    res.data.data.length > 0 && res.data.data.forEach(item => {
                        let itPositionStr = item.position[0].replace(/POINT\(/g, '')
                        itPositionStr = itPositionStr.replace(/\)/g, '')
                        let positionArr = [Number(itPositionStr.split(' ')[0]), Number(itPositionStr.split(' ')[1])]

                    this.housingOptions.forEach(item => {
                        const positions = JSON.parse(item.position[0]).coordinates

                        this.$EventBus.$emit('layerPointAdd', {
                            layerName: 'polygonLayer',
                            type: 'billboard',
                            params: {
                                lng: positionArr[0],
                                lat: positionArr[1],
                                lng: Number(positions[0]),
                                lat: Number(positions[1]),
                                alt: 1,
                                url: '/img/icon/house.png',
                                id: item.id
@@ -731,6 +732,7 @@
                            distanceDisplayCondition: { "near": 0, "far": 200000 }
                        })
                    })

                }
            })
        },
@@ -875,13 +877,14 @@
            // } else {
            //     this.initLivingLayer(item)
            // }
            let itPositionStr = item.position[0].replace(/POINT\(/g, '')
            itPositionStr = itPositionStr.replace(/\)/g, '')
            let positionArr = [Number(itPositionStr.split(' ')[0]), Number(itPositionStr.split(' ')[1])]

            const positions = JSON.parse(item.position[0]).coordinates

            this.$EventBus.$emit('toPosition', {
                siteJd: positionArr[0],
                siteWd: positionArr[1],
                siteGd: 100,
                siteJd: Number(positions[0]),
                siteWd: Number(positions[1]) - 0.0021,
                siteGd: 240,
                sitePitch: -45
            })
        },


 src/views/house/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-02-24 17:20:51
 * @LastEditTime: 2023-02-28 13:52:26
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -469,58 +469,8 @@
</template>

<script>

let tile3DUrl = ''

if (process.env.NODE_ENV == 'development') {
    // 开发
    tile3DUrl = window.BASE_URL_CONFIG.VUE_APP_OUTER_NET_TILEURL
} else {
    // 部署
    tile3DUrl = window.BASE_URL_CONFIG.VUE_APP_INTRANET_TILEURL
}

let circleLayer = null
let timer = []

let label = [
    '01',
    '02',
    '03',
    '04',
    '05',
    '06',
    '07',
    '08',
    '09',
    '10',
    '11',
    '12',
    '13',
    '14',
    '15',
    '16',
    '17',
    '18',
    '19',
    '20',
    '21',
    '22',
    '23',
    '24',
    '25',
    '26',
    '27',
    '28',
    '29',
    '30',
    '31',
    '32',
    '33',
    '34',
    '35',
    '36'
]

import {
    getSearchExtensively, getHouses, getSearchExtensivelyBgAoiDeepdata,
@@ -670,6 +620,10 @@
            that.housingPoliceSiteClick(params)
        })

        this.$EventBus.$on('housingIndent', (e) => {
            that.housingIndent(e)
        })

        window.addEventListener('resize', this.setTableHeight)
    },

@@ -684,20 +638,6 @@

            this.searchHouse = this.$route.query.searchName

            label.forEach(item => {
                this.$EventBus.$emit('addMxTileset', {
                    titlesetName: 'sdTilesetLayer',
                    titlesetUrl: `${tile3DUrl}/sf3d/361102/model/all/${item}/tileset.json`,
                    incident: that.getAoiByPtStd
                })
            })

            this.$EventBus.$emit('addMxTileset', {
                titlesetName: 'sdTilesetLayer',
                titlesetUrl: `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`,
                incident: that.getAoiByPtStd
            })

            if (wallLayer == null) {
                wallLayer = new global.DC.VectorLayer('wallLayer')
                global.viewer.addLayer(wallLayer)
@@ -709,6 +649,9 @@
    },

    methods: {
        housingIndent (e) {
            this.getAoiByPtStd(e)
        },
        /**
         * @description: 顶部搜索条件更改
         * @param {*} val
@@ -1511,10 +1454,6 @@
    },

    destroyed () {
        this.$EventBus.$emit('removeMxTileset', {
            titlesetName: 'sdTilesetLayer'
        })

        this.$store.commit('SET_DETAILSPOPUP', {
            showBox: false,
            showBtn: false

 src/views/policeInfor/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-02-24 17:34:13
 * @LastEditTime: 2023-02-27 10:08:47
 * @FilePath: \srs-police-affairs\src\views\policeInfor\index.vue
 * @Description: 辖区管理
 * 
@@ -71,9 +71,14 @@

        </div>

        <el-dialog title="报警信息" :modal="true" :visible.sync="policeSituationVisible" :append-to-body="true"
        <el-dialog title="警情信息" :modal="true" :visible.sync="policeSituationVisible" :modal-append-to-body="false"
            :before-close="policeSituationBeforeClose" :close-on-click-modal="true" class="policeSituation-details-box">
            <div class="box">
            <div class="btn-change">
                <div :class="{ on: policeInformationType == '接警信息' }" @click="alarmOrActAsPolice('接警信息')">接警信息</div>
                <div :class="{ on: policeInformationType == '出警信息' }" @click="alarmOrActAsPolice('出警信息')">出警信息</div>
            </div>

            <div v-show="policeInformationType == '接警信息'" class="box">
                <div class="item">
                    <div>接警单位编号:</div>
                    <div>{{ policeSituationDetailObj.JJDWBH }}</div>
@@ -131,7 +136,67 @@
                    <div>{{ policeSituationDetailObj.MEMO }}</div>
                </div>
            </div>

            <div v-show="policeInformationType == '出警信息' && JSON.stringify(CJdata) != '{}'" class="box">
                <div class="item">
                    <div>处警单位编号:</div>
                    <div>{{ CJdata.CJDWBH }}</div>
                </div>
                <div class="item">
                    <div>处警单位名称:</div>
                    <div>{{ CJdata.CJDWMC }}</div>
                </div>
                <div class="item">
                    <div>处警单编号:</div>
                    <div>{{ CJdata.CJDBH }}</div>
                </div>
                <div class="item">
                    <div>处警员编号:</div>
                    <div>{{ CJdata.CJYBH }}</div>
                </div>
                <div class="item">
                    <div>处警员姓名:</div>
                    <div>{{ CJdata.CJYXM }}</div>
                </div>
                <div class="item">
                    <div>接警时间:</div>
                    <div>{{ CJdata.JJSJ }}</div>
                </div>
                <div class="item">
                    <div>到达现场时间:</div>
                    <div>{{ CJdata.DDXCSJ }}</div>
                </div>
                <div class="item">
                    <div>首次反馈时间:</div>
                    <div>{{ CJdata.SCFKSJ }}</div>
                </div>
                <div class="item">
                    <div>处理完毕时间:</div>
                    <div>{{ CJdata.CLWBSJ }}</div>
                </div>
                <div class="item">
                    <div>出动人员:</div>
                    <div>{{ CJdata.CDRY }}</div>
                </div>
                <div class="item">
                    <div>出动车辆:</div>
                    <div>{{ CJdata.CDCL }}</div>
                </div>

                <div class="item">
                    <div>处警类型:</div>
                    <div>{{ CJdata.CJLX }}</div>
                </div>

                <div class="dialog-content">
                    <div>备注:</div>
                    <div>{{ CJdata.MEMO }}</div>
                </div>
            </div>

            <div v-show="policeInformationType == '出警信息' && JSON.stringify(CJdata) == '{}'" class="box no-data">暂无数据</div>
        </el-dialog>

    </div>
</template>

@@ -139,7 +204,7 @@
let policeInforSiteLayer = null
let timer = []

import { getAnswerPolices, getAlarmList } from "@/api/home/index.js"
import { getActAsPoliceList, getAnswerPolices, getAlarmList } from "@/api/home/index.js"

export default {
    inject: ['userInfo'],
@@ -186,14 +251,25 @@
                }]
            },

            policeInformationType: '接警信息',
            policeSituationDetailObj: {},
            policeSituationVisible: false,

            CJdata: {},

        }
    },

    created () {
        const that = this

        this.defaultDate()

        this.$EventBus.$on('PoliceInforSiteClick', (params) => {
            that.siteClick(params)
        })
    },

    mounted () {
        this.$parent.$parent.resize('400px', true)

@@ -204,7 +280,23 @@

        window.addEventListener('resize', this.setTableHeight)
    },

    methods: {
        // 接出警切换
        alarmOrActAsPolice (type) {
            this.policeInformationType = type

            if (type == '出警信息') {
                this.CJdata = {}

                getActAsPoliceList(this.policeSituationDetailObj.JJDBH, this.userInfo.dept_id).then(res => {
                    if (res.data.data.records.length > 0) {
                        this.CJdata = res.data.data.records[0]
                    }
                })
            }
        },

        // 设置默认时间
        defaultDate () {
            var current = new Date()
@@ -244,211 +336,211 @@

        // 获取实时接警记录
        getAnswerPolices () {
            getAnswerPolices({ deptId: this.userInfo.dept_id }).then(res => {
                this.realPoliceInforData = []
            // getAnswerPolices({ deptId: this.userInfo.dept_id }).then(res => {
            //     this.realPoliceInforData = []

                if (res.data.result.length > 0) {
                    this.realPoliceInforData = res.data.result.map((item, index) => {
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
                    })
                } else {
                    this.realPoliceInforData = []
                }

                this.addPoliceInforSiteLayer(this.realPoliceInforData)
            })

            // this.realPoliceInforData = [{
            //     ZDDWXZB: 117.97,
            //     ZDDWYZB: 28.45,
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // }]

            // this.realPoliceInforData = this.realPoliceInforData.map((item, index) => {
            //     if (res.data.result.length > 0) {
            //         this.realPoliceInforData = res.data.result.map((item, index) => {
            //     return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            // })
            //     } else {
            //         this.realPoliceInforData = []
            //     }

            // this.addPoliceInforSiteLayer(this.realPoliceInforData)
            // })

            this.realPoliceInforData = [{
                ZDDWXZB: 117.97,
                ZDDWYZB: 28.45,
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            }]

            this.realPoliceInforData = this.realPoliceInforData.map((item, index) => {
                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            })

            this.addPoliceInforSiteLayer(this.realPoliceInforData)
        },

        // 获取历史接警记录
        getAlarmList (params) {
            getAlarmList({ ...params, size: this.pages.size, jjdwbh: this.userInfo.dept_id }).then(res => {
                this.pages.total = 0
                this.historyPoliceInforData = []
            // getAlarmList({ ...params, size: this.pages.size, jjdwbh: this.userInfo.dept_id }).then(res => {
            //     this.pages.total = 0
            //     this.historyPoliceInforData = []

                if (res.data.data.records.length > 0) {
                    this.pages.total = res.data.data.pages
                    this.historyPoliceInforData = res.data.data.records.map((item, index) => {
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
                    })
                } else {
                    this.pages.total = 0
                    this.historyPoliceInforData = []
                }

                this.addPoliceInforSiteLayer(this.historyPoliceInforData)
            })

            // this.historyPoliceInforData = [{
            //     ZDDWXZB: 112,
            //     ZDDWYZB: 25,
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // },
            // {
            //     JJDWMC: '信州公安局派出所',
            //     JJYXM: '欧阳西门',
            //     BJSJ: '2022-12-12 12:12:12',
            //     BJRXM: '西门庆祝',
            //     LXDH: 17335843642,
            //     BJNR: '今日在某小区查获私人赌博场所',
            //     SFDZ: '上饶市信州区万达华府小区',
            //     BJLX: '聚众赌博',
            //     MEMO: '人群聚集赌博'
            // }]

            // this.historyPoliceInforData = this.historyPoliceInforData.map((item, index) => {
            //     if (res.data.data.records.length > 0) {
            //         this.pages.total = res.data.data.pages
            //         this.historyPoliceInforData = res.data.data.records.map((item, index) => {
            //     return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            // })
            //     } else {
            //         this.pages.total = 0
            //         this.historyPoliceInforData = []
            //     }

            // this.addPoliceInforSiteLayer(this.historyPoliceInforData)
            // })

            this.historyPoliceInforData = [{
                ZDDWXZB: 112,
                ZDDWYZB: 25,
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所,今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            },
            {
                JJDWMC: '信州公安局派出所',
                JJYXM: '欧阳西门',
                BJSJ: '2022-12-12 12:12:12',
                BJRXM: '西门庆祝',
                LXDH: 17335843642,
                BJNR: '今日在某小区查获私人赌博场所',
                SFDZ: '上饶市信州区万达华府小区',
                BJLX: '聚众赌博',
                MEMO: '人群聚集赌博'
            }]

            this.historyPoliceInforData = this.historyPoliceInforData.map((item, index) => {
                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            })

            this.addPoliceInforSiteLayer(this.historyPoliceInforData)
        },

        addPoliceInforSiteLayer (data) {
@@ -488,9 +580,11 @@
         * @return {*}
         */
        siteClick (e) {
            if ('overlay' in e) {
            this.$store.commit('SET_DETAILSPOPUP', {
                showBox: true,
                showBtn: false
                    showBtn: true,
                    openMenu: 'policeInfor'
            })

            this.$store.commit('SET_DATAPOPUP', e.overlay.attrParams)
@@ -506,6 +600,11 @@
                    )
                ]
            })
            } else {
                this.policeSituationDetailObj = e
                this.policeInformationType = '接警信息'
                this.policeSituationVisible = true
            }
        },

        /**
@@ -577,7 +676,8 @@

                this.$store.commit('SET_DETAILSPOPUP', {
                    showBox: true,
                    showBtn: false
                    showBtn: true,
                    openMenu: 'policeInfor'
                })

                this.$store.commit('SET_DATAPOPUP', item)
@@ -595,8 +695,7 @@
                    ]
                })
            } else {
                this.policeSituationDetailObj = item
                this.policeSituationVisible = true
                this.siteClick(item)
            }
        },

@@ -614,7 +713,8 @@

        this.$store.commit('SET_DETAILSPOPUP', {
            showBox: false,
            showBtn: false
            showBtn: false,
            openMenu: ''
        })

        for (let i = 0; i < timer.length; i++) {