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

guanqb

2023-04-03 5712810dfb7e933a161a10d0f9c50411ed2ca59d

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

 src/components/map/index.vue

@@ -1,8 +1,18 @@
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-04-01 21:45:20
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-02 18:09:39
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 
 * 
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
-->
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-31 18:41:15
 * @LastEditTime: 2023-04-02 16:18:38
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -98,58 +108,7 @@
    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',
    '35',
    '36',
    '37',
    '38',
    '39',
    '40',
    '41',
    '42',
    '43',
    '44',
    '45',
    '46',
    '47',
    '48',
    '49',
    '50'
]
import { label } from "./label"

var siteEntitylayers = null

@@ -258,13 +217,13 @@
                curTools[key].install(global.viewer)
            })

            let curTilesetLayer = new global.DC.TilesetLayer('curTilesetLayer')
            global.viewer.addLayer(curTilesetLayer)
            let curTileset = new global.DC.Tileset(
                '/mx/tileset.json'
            )
            curTileset.setHeight(20)
            curTilesetLayer.addOverlay(curTileset)
            // let curTilesetLayer = new global.DC.TilesetLayer('curTilesetLayer')
            // global.viewer.addLayer(curTilesetLayer)
            // let curTileset = new global.DC.Tileset(
            //     '/mx/tileset.json'
            // )
            // curTileset.setHeight(20)
            // curTilesetLayer.addOverlay(curTileset)

            global.viewer.setPitchRange(-90, -45)

@@ -521,9 +480,9 @@
            that.toPosition(params.siteJd, params.siteWd, params.siteGd, params.siteHeading, params.sitePitch, params.siteRoll, params.time)
        })

        this.$EventBus.$on('highOrLightChange', (type) => {
        this.$EventBus.$on('highOrLightChange', (type, status) => {
            // eslint-disable-next-line no-unused-vars
            that.highOrLightChange(type)
            that.highOrLightChange(type, status)
        })

        this.$EventBus.$on('addMxTileset', (params) => {
@@ -636,7 +595,7 @@
         * @param {*} type
         * @return {*}
         */
        highOrLightChange (type) {
        highOrLightChange (type, status = '') {
            label.forEach(item => {
                this.removeMxTileset(`sdTilesetLayer${item}`)
            })
@@ -644,7 +603,7 @@
            // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`)
            // this.addMxTileset('sdTilesetLayer', `/mx/01/tileset.json`)

            if (this.tilesetLayerType == type) {
            if (this.tilesetLayerType == type && status == '') {
                this.tilesetLayerType = ''
            } else {
                this.tilesetLayerType = type
@@ -873,9 +832,7 @@
            if (type == "billboard") {
                // pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), Number(alt)), params.url)
                pointElement = new global.DC.Billboard(new global.DC.Position(Number(params.lng), Number(params.lat), 4), params.url)
                params.disableDepthTestDistance && pointElement.setStyle({
                    disableDepthTestDistance: params.disableDepthTestDistance
                })
                pointElement.setStyle(params.setStyle)
                pointElement.size = [32, 32]
                pointElement.attrParams = params
                layersObjcect[layerName].addOverlay(pointElement)
@@ -1093,7 +1050,11 @@

            tilesetObject[titlesetName].setHeight(-72)

            tilesetObject[titlesetName].on(global.DC.MouseEventType.CLICK, this.housingIndent)
            if (this.$route.path.indexOf('/layout/house') != -1) {
                tilesetObject[titlesetName].on(global.DC.MouseEventType.CLICK, this.housingIndent)
            } else {
                tilesetObject[titlesetName].off(global.DC.MouseEventType.CLICK, this.housingIndent)
            }

            tilesetLayer.addOverlay(tilesetObject[titlesetName])


 src/components/map/label.js

New file
@@ -0,0 +1,102 @@
export const 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',
    '37',
    '38',
    '39',
    '40',
    '41',
    '42',
    '43',
    '44',
    '45',
    '46',
    '47',
    '48',
    '49',
    '50',
    '51',
    '52',
    '53',
    '54',
    '55',
    '56',
    '57',
    '58',
    '59',
    '60',
    '61',
    '62',
    '63',
    '64',
    '65',
    '66',
    '67',
    '68',
    '69',
    '70',
    '71',
    '72',
    '73',
    '74',
    '75',
    '76',
    '77',
    '78',
    '79',
    '80',
    '81',
    '82',
    '83',
    '84',
    '85',
    '86',
    '87',
    '88',
    '89',
    '90',
    '91',
    '92',
    '93',
    '94',
    '95',
    '96',
    '97',
    '98',
    '99',
    '100'
]

 src/components/select/index.vue

@@ -7,7 +7,7 @@
            <i class="el-icon-arrow-down"></i>
        </div>
        <!-- 下拉框大盒子 -->
        <div :class="{ 'options-box-show': !optionsShow, 'options-box-hide': optionsShow, issel: options.length >= 4 }"
        <div :class="{ 'options-box-show': !optionsShow && options.length, 'options-box-hide': optionsShow, issel: options.length >= 4 }"
            class="select-options">
            <!-- 下拉框 -->
            <div @click="cutValue(item, index)" v-for="(item, index) in options" :key="index">{{ item[optionsName] }}</div>
@@ -120,6 +120,7 @@
    }

    .select-options {
        display: none;
        width: 100%;
        max-height: 140px;
        overflow: auto;

 src/styles/base/index.scss

@@ -221,32 +221,10 @@

}

.equiment-details-box {
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 1000px;
        height: 620px;

        .el-dialog__body {
            flex: 1;

            .header input {
                font-size: 14px;
            }

            .el-card__body,
            .el-main {
                padding: 0;
                width: 100%;
            }

        }
    }
}

.area-details-box,
.land-details-box {
.keyPerson-details-box,
.land-details-box,
.equiment-details-box {
    .el-dialog {
        display: flex;
        flex-direction: column;
@@ -320,99 +298,6 @@
                padding: 6px 10px;
            }

        }
    }
}

.keyPerson-details-box {
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 1000px;
        height: 700px;

        .el-dialog__header {
            height: 40px;
            line-height: 40px;
        }

        .el-table__header-wrapper {
            height: 60px;
            line-height: 60px;
        }

        .el-table .cell {
            height: 30px;
            line-height: 30px;
        }

        .el-dialog__body {
            flex: 1;
        }

        .el-main {
            width: 100%;
            padding: 0;
        }

        .el-table {
            margin-bottom: 10px;
        }

        .el-pagination.is-background .el-pager li:not(.disabled).active {
            color: #C0C4CC !important;
        }

        .header {
            display: flex;
            margin-bottom: 10px;
            padding-left: 10px;

            &>div {
                display: flex;
                height: 32px;
                line-height: 32px;
                margin-right: 10px;

                input {
                    width: 150px;
                    height: 32px;
                    font-size: 12px;
                    text-indent: 1em;
                    color: #ffffff;
                    background-color: rgba(24, 79, 202, 0.6);
                    border: 1px solid rgb(0, 92, 169);
                    border-radius: 5px;
                }

                input:focus {
                    outline: none;
                }

                input::-webkit-input-placeholder {
                    color: rgba(238, 238, 238, 0.7);
                }
            }

            &>div:first-child input {
                width: 120px;
            }

            .el-button--primary {
                background-color: rgba(29, 92, 228, 0.6);
                border: 1px solid rgba(29, 92, 228, 0.6);
            }

            .el-button {
                padding: 6px 10px;
            }

        }

        .body {
            .el-table {
                height: 100% !important;
            }
        }
    }
}

 src/styles/media/index.scss

@@ -2012,7 +2012,9 @@
                    }

                    .area-details-box,
                    .land-details-box {
                    .keyPerson-details-box,
                    .land-details-box,
                    .equiment-details-box {
                        .el-dialog {
                            width: countSizeVw(1000, 1920);
                            height: countSizeVh(640);
@@ -2023,82 +2025,8 @@
                            right: countSizeVw(10, 1920);
                        }

                        .el-main {
                            height: calc(100% - countSizeVh(40));
                        }

                        .el-dialog .el-dialog__body .el-table {
                            height: calc(100% - countSizeVh(60)) !important;
                        }
                    }

                    .keyPerson-details-box {
                        .el-dialog {
                            width: countSizeVw(1000, 1920);
                            height: countSizeVh(800);
                        }

                        .el-dialog__header button {
                            font-size: countSizeVh(18);
                            right: countSizeVw(10, 1920);
                        }

                        .el-main {
                            height: calc(100% - countSizeVh(50));
                        }

                        .el-dialog__header {
                            height: countSizeVh(40);
                            line-height: countSizeVh(40);
                        }

                        .el-table__header-wrapper {
                            height: countSizeVh(60);
                            line-height: countSizeVh(60);
                        }

                        .el-table .cell {
                            height: countSizeVh(30);
                            line-height: countSizeVh(30);
                        }

                        .el-main {
                            height: calc(100% - countSizeVh(50));
                        }

                        .el-table {
                            height: calc(100% - countSizeVh(50));

                            margin-bottom: countSizeVh(10);
                        }

                        .header {
                            margin-bottom: countSizeVh(10);
                            padding-left: countSizeVw(10, 1920);

                            &>div {
                                height: countSizeVh(32);
                                line-height: countSizeVh(32);
                                margin-right: countSizeVw(10, 1920);

                                input {
                                    width: countSizeVw(150, 1920);
                                    height: countSizeVh(32);
                                    font-size: countSizeVh(12);
                                    border: countSizeVh(1) solid rgb(0, 92, 169);
                                    border-radius: countSizeVh(5);
                                }

                            }

                            &>div:first-child input {
                                width: countSizeVw(120, 1920);
                            }

                            .el-button--primary {
                                border: countSizeVh(1) solid rgba(29, 92, 228, 0.6);
                            }

                        }
                    }

@@ -2737,45 +2665,6 @@
                        }

                    }
                }

                .equiment-details-box {
                    .el-dialog {
                        width: countSizeVw(1000, 1920);
                        height: countSizeVh(640);
                    }

                    .el-dialog__header button {
                        font-size: countSizeVh(18);
                        right: countSizeVw(10, 1920);
                    }

                    .header input {
                        font-size: countSizeVh(14);
                    }

                    .status-box {
                        display: inline-block;
                        margin: auto;
                        width: countSizeVh(10);
                        height: countSizeVh(10);
                        text-align: center;
                        border-radius: 50%;
                        background-color: #adadad;
                    }

                    .online {
                        background-color: #4ccc7d;
                    }

                    .el-main {
                        height: calc(100% - countSizeVh(40));
                    }

                    .el-dialog .el-dialog__body .el-table {
                        height: calc(100% - countSizeVh(60)) !important;
                    }

                }

                .popup-dom .content .data-box .line {

 src/views/activity/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-24 16:36:55
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-02 10:05:16
 * @LastEditTime: 2023-04-02 15:53:23
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 
 * 
@@ -488,7 +488,7 @@
         */
        activityListClick (item, index) {
            item.plotType == 1 && this.$EventBus.$emit('activeControlRemoveTileset')
            item.plotType == 3 && this.$EventBus.$emit('highOrLightChange', 'light')
            item.plotType == 3 && this.$EventBus.$emit('highOrLightChange', 'light', 'default')

            // 当前选中的ID
            this.showingSecurityId = item.id

 src/views/home/components/bottomContainer.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-01-13 15:52:59
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-31 21:53:11
 * @LastEditTime: 2023-04-02 15:01:07
 * @FilePath: \srs-police-affairs\src\views\home\components\bottomContainer.vue
 * @Description: 
 * 
@@ -332,105 +332,105 @@

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

            //     if (res.data && res.data.length) {
            //         this.policeSituationRealtimeArr = res.data.map((item, index) => {
            //             return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
            //         })
            //     } else {
            //         this.policeSituationRealtimeArr = []
            //     }
                if (res.data && res.data.length) {
                    this.policeSituationRealtimeArr = res.data.map((item, index) => {
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
                    })
                } else {
                    this.policeSituationRealtimeArr = []
                }

            //     this.$emit('policeSituationChange')
            // })

            this.policeSituationRealtimeArr = [{
                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.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
                this.$emit('policeSituationChange')
            })

            this.$emit('policeSituationChange')
            // this.policeSituationRealtimeArr = [{
            //     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.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
            //     return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
            // })

            // this.$emit('policeSituationChange')
        },

        // 获取历史接警记录

 src/views/home/components/dialog/keyPersonBox.vue

@@ -2,7 +2,7 @@
    <!-- 重点人员 -->
    <el-dialog :title="keyPersonTitle" :modal="true" :visible.sync="keyPersonVisible" :before-close="personInfoClose"
        :close-on-click-modal="true" class="keyPerson-details-box">
        <!-- <div class="header" v-show="!isMaoJiaLin">
        <div class="header" v-show="userInfo.dept_id != '1596020515064381442'">
            <div>
                人员名称：
                <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
@@ -13,14 +13,13 @@
            </div>
            <el-button type="primary" icon="el-icon-search" @click="searchPeopleDetail">搜索</el-button>
            <el-button type="primary" icon="el-icon-delete" @click="clearPeopleDetailSearchValue">清空</el-button>
        </div> -->
        </div>

        <div v-loading="curLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
            element-loading-background="rgba(0, 0, 0, 0.2)" class="body">
            <el-table :data="keyPersonDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-show="!isMaoJiaLin">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
                        <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
@@ -41,13 +40,13 @@
                    </template>
                </el-table-column>
            </el-table>
        </div>

        <!-- <div class="pages all-pagination-sty" ref="tablePagination" v-show="!isMaoJiaLin">
            <el-pagination background layout="prev, pager, next, total" :page-size="peoplePage.pageSize"
                :total="peoplePage.total" :current-page="peoplePage.currentPage"
                @current-change="handlePersonPageChange"></el-pagination>
        </div> -->
            <div class="pages all-pagination-sty" ref="tablePagination" v-show="userInfo.dept_id != '1596020515064381442'">
                <el-pagination background layout="prev, pager, next, total" :page-size="peoplePage.pageSize"
                    :total="peoplePage.total" :current-page="peoplePage.currentPage"
                    @current-change="handlePersonPageChange"></el-pagination>
            </div>
        </div>
    </el-dialog>
</template>

@@ -77,8 +76,6 @@
                pageSize: 15,
                currentPage: 1
            },

            isMaoJiaLin: false,
        }
    },

@@ -177,6 +174,7 @@
         * @return {*}
         */
        searchPeopleDetail () {
            this.curLoading = true
            this.peoplePage.currentPage = 1
            this.getPersonInfoPage(2)
        },
@@ -186,6 +184,7 @@
         * @return {*}
         */
        clearPeopleDetailSearchValue () {
            this.curLoading = true
            this.peoplePoliceName = ''
            this.peopleCallPhone = ''
            this.peoplePage.currentPage = 1
@@ -199,6 +198,7 @@
         * @return {*}
         */
        handlePersonPageChange (current) {
            this.curLoading = true
            this.peoplePage.currentPage = current

            this.getPersonInfoPage(2)

 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-04-02 13:49:16
 * @LastEditTime: 2023-04-02 18:06:30
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -83,12 +83,8 @@
            </div>
        </el-dialog>




        <el-dialog :title="equimentTitle" :modal="true" :visible.sync="equimentVisible" :before-close="equimentBeforeClose"
            :close-on-click-modal="true" class="equiment-details-box"
            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
            :close-on-click-modal="true" class="equiment-details-box">
            <div class="header">
                <div>
                    设备名称：
@@ -98,12 +94,13 @@
                <el-button type="primary" icon="el-icon-search" @click="searchEquiment">搜索</el-button>
                <el-button type="primary" icon="el-icon-delete" @click="clearSearchEquiment">清空</el-button>
            </div>
            <el-main v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)">

            <div v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)" class="body">
                <el-table :data="equimentTableData" style="width: 100%"
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" :row-class-name="tableRowClassName"
                    v-show="!equimentLoading">
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                    :row-class-name="tableRowClassName">
                    <el-table-column label="序号" type="index" align="center">
                        <template slot-scope="scope">
                            <span>{{ (currentPage - 1) * pagesize + scope.$index + 1 }}</span>
@@ -130,13 +127,12 @@
                    </el-table-column>
                </el-table>

                <div class="pages all-pagination-sty" v-show="!equimentLoading">
                <div class="pages all-pagination-sty">
                    <el-pagination background layout="prev, pager, next, total" :total="equimentPagingTotal"
                        :page-size="pagesize" pager-count="3" :current-page="currentPage"
                        @current-change="handleCurrentChange"></el-pagination>
                </div>
            </el-main>

            </div>
        </el-dialog>


@@ -494,7 +490,7 @@
            equimentCurrentSelect: {},
            // 设备分页
            currentPage: 1,
            pagesize: 15,
            pagesize: 12,
            equimentPagingTotal: 0,

            // 现有设备视屏播放的
@@ -611,7 +607,6 @@
            }

            this.$EventBus.$emit('toPosition', {
                layerName: 'carLayers',
                siteJd: row.x,
                siteWd: row.y
            })
@@ -670,12 +665,13 @@
                        id: 1
                    })
                } else {
                    this.initHousingLayer()
                    if (res.data.data.length == 0 || JSON.stringify(res.data.data) === "{}") {
                        this.selectHouseClass = true
                        this.housingCheckValue = '该责任区暂无小区'
                        this.initHousingLayer()
                        return
                    }

                    this.selectHouseClass = false
                    this.housingCheckValue = '请选择小区'
                    this.housingOptions = res.data.data
@@ -683,6 +679,8 @@
                        name: '全部',
                        id: 1
                    })

                    this.initHousingLayer()
                }
            })
        },
@@ -716,7 +714,7 @@
                        res.data.data.forEach(item => {
                            if (item.longitude && item.latitude) {
                                this.$EventBus.$emit('layerPointAdd', {
                                    layerName: 'carLayers',
                                    layerName: 'homeCarLayers',
                                    type: "billboard",
                                    layerType: 'ClusterLayer',
                                    params: {
@@ -724,7 +722,9 @@
                                        lng: item.longitude,
                                        lat: item.latitude,
                                        url: '/img/icon/car.png',
                                        disableDepthTestDistance: Number.POSITIVE_INFINITY
                                        setStyle: {
                                            disableDepthTestDistance: Number.POSITIVE_INFINITY
                                        }
                                    },
                                    incident: this.phoneSiteClick
                                })
@@ -736,7 +736,7 @@
                        res.data.data.forEach(item => {
                            if (item.longitude && item.latitude) {
                                this.$EventBus.$emit('layerPointAdd', {
                                    layerName: 'cameraLayers',
                                    layerName: 'homeCameraLayers',
                                    type: "billboard",
                                    layerType: 'ClusterLayer',
                                    params: {
@@ -744,7 +744,9 @@
                                        lng: item.longitude,
                                        lat: item.latitude,
                                        url: '/img/icon/camera.png',
                                        disableDepthTestDistance: Number.POSITIVE_INFINITY
                                        setStyle: {
                                            disableDepthTestDistance: Number.POSITIVE_INFINITY
                                        }
                                    },
                                    incident: this.siteClick
                                })
@@ -813,6 +815,11 @@
            this.policeStationCheckValue = item.name
            this.selectHouseClass = true

            this.areaOptions = []
            this.housingOptions = []
            this.areaCheckValue = '请选择责任区'
            this.housingCheckValue = '请选择小区'

            if (item.name == "全部") {
                this.clearPolygonLayer()
                cylinderLayer.clear()
@@ -821,18 +828,10 @@

                this.initPoliceStationLayer()

                this.areaOptions = []
                this.housingOptions = []
                this.areaCheckValue = '请选择责任区'
                this.housingCheckValue = '请选择小区'

                this.policeStaionID = ''

            } else {
                cylinderLayer.clear()
                this.getPoliceStationTree(2, item.id)
                this.areaCheckValue = '请选择责任区'
                this.housingCheckValue = '请选择小区'

                this.policeStaionID = item.id
            }
@@ -852,14 +851,18 @@

        areaSelect (item) {
            this.areaCheckValue = item.name
            this.housingOptions = []

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

            if (item.name == "全部") {
                this.initAreaOptionLayer()
                this.housingOptions = []

            } else {

                this.getPoliceStationTree(3, item.id)
                this.areaChecked = item
                this.getPoliceStationTree(3, item.id)
            }
        },

@@ -950,7 +953,7 @@

        carChange (e) {
            this.$EventBus.$emit('mapClearLayer', {
                layerName: 'carLayers',
                layerName: 'homeCarLayers',
                type: 'VectorLayer'
            })

@@ -963,7 +966,7 @@

        cameraChange (e) {
            this.$EventBus.$emit('mapClearLayer', {
                layerName: 'cameraLayers',
                layerName: 'homeCameraLayers',
                type: 'VectorLayer'
            })

@@ -1467,16 +1470,6 @@
                positions: str,
                material: positionColor[0]
            })
            this.$EventBus.$emit('layerPointAdd', {
                layerName: 'polygonLayer',
                type: 'label',
                params: {
                    lng: center[0],
                    lat: center[1],
                    alt: 1,
                    text: this.areaChecked.name
                }
            })

            this.housingOptions.length > 0 && this.housingOptions.forEach(item => {
                if (item.name == '全部') return
@@ -1637,9 +1630,7 @@

        // 获取设备分页数据
        getEquipmentPaging (params) {
            setTimeout(() => {
                this.equimentLoading = false
            }, 500)

            getEquipmentPaging({
                page: this.currentPage,
                count: this.pagesize,
@@ -1657,6 +1648,9 @@
                    this.equimentPagingTotal = 0
                }

                setTimeout(() => {
                    this.equimentLoading = false
                }, 500)
            })
        },

@@ -1851,7 +1845,7 @@
        })

        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'carLayers',
            layerName: 'homeCarLayers',
            type: 'VectorLayer'
        })

@@ -1861,7 +1855,7 @@
        })

        this.$EventBus.$emit('mapRemoveLayer', {
            layerName: 'cameraLayers',
            layerName: 'homeCameraLayers',
            type: 'VectorLayer'
        })


 src/views/house/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: song
 * @LastEditTime: 2023-04-02 14:36:25
 * @LastEditTime: 2023-04-02 16:42:04
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -756,8 +756,19 @@
                    baseUrl = "http://10.141.11.11/"
                }

                

                // 小区名称类型地址
                let villageData = res.data.result[0]

                this.$EventBus.$emit("toPosition", {
                    ...villageData,
                    siteJd: Number(villageData.location.lng),
                    siteWd: Number(villageData.location.lat) - 0.0021,
                    siteGd: 240,
                    sitePitch: -45,
                })

                this.villageInfo.name = villageData.name
                this.villageInfo.address = villageData.address
                this.villageInfo.type_name = villageData.type_name.split("|")[0]
@@ -817,7 +828,7 @@

                    this.BuildListLoading = false

                    this.buildingClick(this.buildingList[0])
                    this.queryBuildings(this.buildingList[0])
                }

                this.callPolicePage.currentPage = 1
@@ -982,6 +993,25 @@
            this.unitValue = 1
        },

        queryBuildings (item, aoiArr) {
            this.unitHouseChoosed = []
            this.pictLoading = true
            if (!aoiArr) {
                this.$EventBus.$emit("clearHouse3D")
            }
            this.buildingChoosed = item
            this.floorInfo.elev = item.elev
            this.floorInfo.floor_num = item.floor_num
            // 获取户籍人口重点人口数据
            this.choosedBuildId = item.build_id
            this.getVillagePersonStatisticInfoByBuildId(item.build_id)
            this.getHouses(item.build_id, "361102", aoiArr)
            this.floorsType = 1
            document.querySelector(".floor-num").style.left = "0px"
            this.lastFloorShow = false
            this.unitValue = 1
        },

        nextBtn () {
            const boxWidth = parseInt(this.$refs.BuildOutBox.offsetWidth)
            // if (parseInt(document.querySelector(".build-box").offsetWidth) > Math.abs(parseInt(document.querySelector(".build-box").style.left)) + boxWidth) {

 src/views/police/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-04-02 14:07:15
 * @LastEditTime: 2023-04-02 16:14:59
 * @FilePath: \srs-police-affairs\src\views\police\index.vue
 * @Description: 辖区管理
 * 
@@ -62,7 +62,7 @@

                        <div class="pages all-pagination-sty" ref="tablePagination" style="padding-top:-15px">
                            <el-pagination background layout="prev, pager, next" :page-size="equimentPage.pageSize"
                                :page-count="equimentPage.count" :pager-count="4" :current-page="equimentPage.currentPage"
                                :total="equimentPage.total" :pager-count="4" :current-page="equimentPage.currentPage"
                                @current-change="handleCurrentChange"></el-pagination>
                        </div>

@@ -239,7 +239,7 @@
            })

            this.equimentPage.currentPage = 1
            this.equimentPage.count = 0
            this.equimentPage.total = 0
            // this.equimentTableData = []

            this.$EventBus.$emit('mapClearLayer', {
@@ -269,7 +269,6 @@
            this.emptyText = ""
            getEquipmentPaging({ page: this.equimentPage.currentPage, count: this.equimentPage.pageSize, ...params, query: this.searchValue, dwbh: this.userInfo.dept_id }).then(res => {
                var total = res.data.data.total
                console.log(total, 6666)
                if (total == 0) {
                    if (this.navType == 0) {
                        this.emptyText = "暂无警车数据"
@@ -348,14 +347,14 @@
                    })


                    this.equimentPage.count = res.data.data.pages
                    this.equimentPage.total = res.data.data.total
                    this.equimentLoading = false
                } else {
                    this.equimentTableData = []
                    this.equimentPage.total = 0
                    this.equimentLoading = false
                }

                this.equimentLoading = false
            })
        },

@@ -377,6 +376,7 @@
            this.searchValue = ''

            this.equimentPage.currentPage = 1
            this.equimentPage.total = 0

            this.$EventBus.$emit('mapClearLayer', {
                layerName: 'carLayers',
@@ -536,11 +536,9 @@
            this.$EventBus.$emit('layerPolylineAdd', {
                layerName: 'polylineLayer',
                positions: positionStr,
                material: new global.DC.PolylineImageTrailMaterialProperty({
                    color: global.DC.Color.GREEN,
                    speed: 10,
                    image: '/img/icon/arrow.png',
                    repeat: { x: 10, y: 1 }
                material: new global.DC.PolylineLightingTrailMaterialProperty({
                    color: global.DC.Color.RED,
                    speed: 5.0
                }),
                width: 6
            })

 src/views/policeInfor/index.vue

@@ -639,7 +639,6 @@
        clickData (item) {
            if (item.ZDDWXZB && item.ZDDWXZB != 0 && item.ZDDWYZB && item.ZDDWYZB != 0) {
                this.$EventBus.$emit('toPosition', {
                    layerName: 'policeSituationyLayers',
                    siteJd: Number(item.ZDDWXZB),
                    siteWd: Number(item.ZDDWYZB)
                })