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

guanqb

2023-04-04 dee269b59f7d12af1ae84d0b4a20c0317ebd3289

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

 src/assets/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/imagesSelect/index.vue

New file
@@ -0,0 +1,103 @@
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-04-04 16:24:42
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-04 18:28:44
 * @FilePath: \srs-police-affairs\src\components\imagesSelect\index.vue
 * @Description: 
 * 
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
-->
<template>
    <div class="container">
        <div v-for="(item, index) in imageUrls" :key="index" @click.stop="curImgClick(item)">
            <div class="content">
                <img :src="item.url" alt="">
            </div>
            <div class="name">
                {{ item.name }}
            </div>
        </div>
    </div>
</template>

<script>
import axios from "axios"
export default {
    name: 'ImagesSelect',

    data () {
        return {
            imageUrls: []
        }
    },

    created () {
        this.requireImage()
    },

    methods: {
        requireImage () {
            axios.get('/images').then(res => {
                res.data.forEach(item => {
                    this.imageUrls.push({
                        url: `/images/${item}`,
                        name: item.substring(0, item.length - 4)
                    })


                })

                console.log(this.imageUrls, 4555)
            })
        },

        curImgClick (item) {
            this.$emit('curClick', item)
        }
    },
}
</script>

<style lang="scss" scoped>
.container {
    // position: absolute;
    // left: 0;
    // bottom: -10px;
    display: flex;

    width: 400px;
    height: 360px;

    &>div {
        margin: 10px;
        width: 60px;
        height: 80px;
        cursor: pointer;
        border: 1px solid #fff;
        border-radius: 8px;

        .content {
            position: relative;
            height: 60px;

            img {
                position: absolute;
                top: 0;
                left: 0;
                right: 0;
                bottom: 0;
                margin: auto;
                width: 60px;
                height: 60px;
            }
        }

        .name {
            height: 20px;
            line-height: 20px;
            font-size: 14px;
        }
    }
}
</style>

 src/components/map/index.vue

@@ -1,18 +1,8 @@
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-04-01 21:45:20
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-04 10:49:27
 * @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-04-02 16:18:38
 * @LastEditTime: 2023-04-04 18:18:42
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -96,6 +86,8 @@
        <assemble-box></assemble-box>

        <video-row-click-popup></video-row-click-popup>

        <!-- <images-select></images-select> -->
    </div>
</template>

@@ -223,15 +215,15 @@
                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'
                'https://tuan-gis.sit.fengtu.com.cn/361102/wanda/tileset.json'
            )
            // curTileset.setHeight(20)
            curTileset.setHeight(0)
            curTilesetLayer.addOverlay(curTileset)
            // let curTilesetLayer = new global.DC.TilesetLayer('curTilesetLayer')
            // global.viewer.addLayer(curTilesetLayer)
            // let curTileset = new global.DC.Tileset(
            //     // '/mx/tileset.json'
            //     'https://tuan-gis.sit.fengtu.com.cn/361102/wanda/tileset.json'
            // )
            // // curTileset.setHeight(20)
            // curTileset.setHeight(0)
            // curTilesetLayer.addOverlay(curTileset)

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

@@ -299,15 +291,15 @@
            that.switchImg()

            // 外网
            global.viewer.imageryLayers.addImageryProvider(
                new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
                    url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
                    subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
                    format: 'image/jpeg',
                    show: true,
                    maximumLevel: 18
                })
            )
            // global.viewer.imageryLayers.addImageryProvider(
            //     new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
            //         url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=e45274b0235bb913eceb393aabbf9c9c',
            //         subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
            //         format: 'image/jpeg',
            //         show: true,
            //         maximumLevel: 18
            //     })
            // )

            // 设置地图初始位置，角度等
            global.viewer.camera.setView({
@@ -496,6 +488,11 @@
            that.addMxTileset(params.titlesetName, params.titlesetUrl)
        })

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

        this.$EventBus.$on('tilesetLayerFlag', (type, cb) => {
            // eslint-disable-next-line no-unused-vars
            that.tilesetLayerFlag(type, cb)
@@ -504,11 +501,6 @@
        this.$EventBus.$on('removeMxTileset', (params) => {
            // eslint-disable-next-line no-unused-vars
            that.removeMxTileset(params.titlesetName)
        })

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

        this.$EventBus.$on('flytoLayer', (params) => {
@@ -596,6 +588,15 @@
                global.viewer.setPitchRange(-90, 0)
            }
        },

        closeMxTileset () {
            label.forEach(item => {
                this.removeMxTileset(`sdTilesetLayer${item}`)
            })

            this.tilesetLayerType = ''
        },

        /**
         * @description: 高精度模型和轻量模型切换
         * @param {*} type
@@ -632,6 +633,7 @@
         */
        housingIndent (e) {
            console.log(e, 'housingIndent-map')
            console.log(e, 56666)
            if (this.$route.path == '/layout/house') {
                this.$EventBus.$emit('housingIndent', e)
            }
@@ -1093,14 +1095,6 @@
            }

            cb(true)
        },

        activeControlRemoveTileset () {
            label.forEach(item => {
                this.removeMxTileset(`sdTilesetLayer${item}`)
            })

            this.tilesetLayerType = ''
        },

        /**

 src/styles/base/index.scss

@@ -303,6 +303,21 @@
        .el-main {
            padding: 0;
        }

        .state-box {
            width: 10px;
            height: 10px;
            line-height: 10px;
            text-align: center;
            margin: 0 auto;
            border-radius: 50%;
            background-color: #adadad;
        }

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

    }
}


 src/styles/media/index.scss

@@ -1014,9 +1014,7 @@
                                .el-table__body-wrapper {
                                    td {
                                        .cell {
                                            display: flex;
                                            justify-content: center;
                                            align-items: center;
                                            position: relative;
                                        }
                                    }
                                }
@@ -3123,4 +3121,21 @@

        }
    }

    .el-table {
        td {
            .cell {
                position: relative;

                .state-box {
                    position: absolute;
                    top: 0;
                    left: 0;
                    right: 0;
                    bottom: 0;
                    margin: auto !important;
                }
            }
        }
    }
}

 src/utils/turfPolygon.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-03-31 10:52:25
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-31 11:36:28
 * @LastEditTime: 2023-04-04 15:55:33
 * @FilePath: \srs-police-affairs\src\utils\turfPolygon.js
 * @Description: 
 * 
@@ -10,8 +10,28 @@
 */
import * as turf from '@turf/turf'

export const computerCapacity = (data) => {
    if (data.length) {
export const computerCapacity = (data, type) => {
    if (type == 'region') {
        const pointArr = data.reduce((pre, cur) => {
            cur.position && JSON.parse(cur.position).coordinates[0][0].forEach(item => {
                console.log(item, 959)
                item[0] && item[1] && pre.push(turf.point(item))
            })

            return pre
        }, [])


        const features = turf.featureCollection(pointArr)

        const scope = turf.envelope(features).bbox

        const poly = turf.polygon([[[scope[0], scope[1]], [scope[0], scope[3]], [scope[2], scope[1]], [scope[2], scope[3]]]])

        const scaledPoly = turf.transformScale(poly, 3)

        console.log(scope, scaledPoly, 5555)
    } else {
        let pointArr = []

        data.forEach(item => {
@@ -30,8 +50,12 @@

        const scope = turf.envelope(features).bbox

        console.log(scope, 5555)

        const poly = turf.polygon([[[0, 29], [3.5, 29], [2.5, 32], [0, 29]]])

        global.viewer.flyToBounds(scope,
            { heading: 0, pitch: -90, roll: 0 },
            { heading: 0, pitch: -45, roll: 0 },
            (e) => { },
            3
        )

 src/views/activity/components/customImageBox.vue

New file
@@ -0,0 +1,75 @@
<!--
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2023-04-04 18:30:49
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-04 18:35:29
 * @FilePath: \srs-police-affairs\src\views\activity\components\customImageBox.vue
 * @Description: 
 * 
 * Copyright (c) 2023 by ${git_name_email}, All Rights Reserved. 
-->
<template>
    <div>
        <el-dialog :title="curDialogTitle" :visible.sync="curDialogShow" class="activity-custom-img-box"
            :before-close="closeCurDialog">
            <div class="describe">
                <div class="label">
                    描述
                </div>
                <div class="val"></div>
            </div>
            <div class="select-image">
                <div class="label">
                    选择图片
                </div>
                <div class="image-button">
                    <el-button type="primary">选择图片</el-button>
                </div>
            </div>
            <div class="edit-line-btn-box">
                <el-button @click="editCustomImage">编辑</el-button>
                <el-button @click="saveCustomImage">保存</el-button>
                <el-button @click="deleteCustomImage">删除</el-button>
                <el-button @click="addCustomImage">添加</el-button>
                <el-button @click="closeCurDialog">取消</el-button>
            </div>
        </el-dialog>
    </div>
</template>

<script>
export default {
    data () {
        return {
            curDialogTitle: '',
            curDialogShow: false,

        }
    },

    methods: {
        addCustomImage () {

        },

        editCustomImage () {

        },

        saveCustomImage () {

        },

        deleteCustomImage () {

        },

        closeCurDialog () {
            this.curDialogShow = false
        },
    },

}
</script>

<style lang="scss" scoped></style>

 src/views/activity/index.vue

@@ -487,7 +487,7 @@
         * @return {*}
         */
        activityListClick (item, index) {
            item.plotType == 1 && this.$EventBus.$emit('activeControlRemoveTileset')
            item.plotType == 1 && this.$EventBus.$emit('closeMxTileset')
            item.plotType == 3 && this.$EventBus.$emit('highOrLightChange', 'light', 'default')

            // 当前选中的ID

 src/views/home/components/leftContainer.vue

@@ -41,10 +41,10 @@
                <defs>
                    <path id="border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                        d="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                        fill="transparent" />
                    <radialGradient id="border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c" cx="50%" cy="50%" r="50%">
                        <stop offset="0%" stop-color="#fff" stop-opacity="1" />
@@ -54,10 +54,10 @@
                        <circle cx="0" cy="0" r="150" fill="url(#border-box-8-gradient-974b4d7cfafa444396861ca1d1173c8c)">
                            <animateMotion dur="8s"
                                path="M0.27,0.03c52.66,0,105.34,0,158,0c1.67,2,3.33,4,5,6c1,0.33,2,0.67,3,1c1.33,1.67,2.67,3.33,4,5
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               c16,0,32,0,48,0c53.66,0,107.34,0,161,0c1.13,1.72,0.63,1.36,3,2c0,0.67,0,1.33,0,2c0.67,0,1.33,0,2,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               c0.01,104.58,0.01,206.44,0,309c-1.43,0.78-4.01,2.77-5,4c-12,0-24,0-36,0c-2.67-3.33-5.33-6.67-8-10c-21,0-42,0-63,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               c-1.08,2.32-2.35,4.25-4,6c-0.67,0.33-1.33,0.67-2,1c-0.33,1-0.67,2-1,3c-20,0-40,0-60,0c-66.66,0-133.34,0-200,0
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               c-1.28-1.57-2.76-2.25-4-4c-0.33,0-0.67,0-1,0c0-8.67,0-17.33,0-26c0-19.66,0-39.34,0-59C0.27,160.04,0.27,80.02,0.27,0.03z"
                                rotate="auto" repeatCount="indefinite" />
                        </circle>
                    </mask>
@@ -596,13 +596,14 @@
                        yDate = [14, 14]
                        this.inithouseEcharts(xDate, yDate)
                    }

                    this.clickHouseChart()
                } else {
                    this.inithouseEcharts(xDate, yDate)
                }
                setTimeout(() => {
                    this.houseEchartsLoading = false
                }, 500)
                this.clickHouseChart()
            }).catch(res => {
                setTimeout(() => {
                    this.houseEchartsLoading = false
@@ -875,7 +876,6 @@

        clickHouseChart () {
            houseMyChart.on('click', params => {
                console.log('clickHouseChart', params)
                if (params.name == '学校') {
                    this.$parent.xxPopupShow = true
                    this.$parent.houseArr = []

 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-03 16:38:51
 * @LastEditTime: 2023-04-04 17:02:25
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -119,7 +119,7 @@
                        min-width="140%"></el-table-column>
                    <el-table-column label="设备状态">
                        <template slot-scope="scope">
                            <i class="status-box" :class="{ online: Number(scope.row.status) === 1 }"></i>
                            <div class="state-box" :class="{ online: scope.row.status == '1' }"></div>
                        </template>
                    </el-table-column>
                    <el-table-column label="操作">
@@ -288,9 +288,9 @@

                <el-table-column label="操作" align="center">
                    <template slot-scope="scope">
                        <el-button @click="landRowClick(scope.row)" type="text" size="small"
                            :title="scope.row.X == '' ? '暂无位置信息' : '定位'" :disabled="scope.row.X == ''">
                            <i class="el-icon-location"></i>
                        <el-button :disabled="positionDisabled(scope.row)" @click="landRowClick(scope.row)" type="text"
                            size="small" :title="'定位'">
                            <i class="el-icon-location" :style="{ color: positionColor(scope.row) }"></i>
                        </el-button>
                    </template>
                </el-table-column>
@@ -521,6 +521,31 @@

    components: { leftContainer, rightContainer, bottomContainer, schedulingList, landDetailsBox, areaDetailsBox, keyPersonBox },

    computed: {
        positionColor () {
            return (row) => {
                if (row.X && row.X != 0
                    || row.lng && row.lng != 0
                    || row.longitude && row.longitude != 0
                    || row.x && row.x != 0) {
                    return "#1AFA29"
                } else {
                    return "#ccc"
                }
            }
        },

        positionDisabled () {
            return (row) => {
                if (row.X && row.X != 0 || row.lng && row.lng != 0 || row.longitude && row.longitude != 0 || row.x && row.x != 0) {
                    return false
                } else {
                    return true
                }
            }
        },
    },

    created () {
        const that = this

@@ -664,11 +689,11 @@

                } else if (type == 2) {
                    this.areaOptions = res.data.data
                    this.initAreaOptionLayer()
                    this.areaOptions.unshift({
                        name: '全部',
                        id: 1
                    })
                    this.initAreaOptionLayer()
                } else {
                    if (res.data.data.length == 0 || JSON.stringify(res.data.data) === "{}") {
                        this.selectHouseClass = true
@@ -1389,8 +1414,6 @@

            const center = this.getAllRegionCenter(this.policeStationOptions)

            console.log(center[0] + 0.046, center[1] - 0.36)

            this.$EventBus.$emit('toPosition', {
                siteJd: center[0] + 0.046,
                siteWd: center[1] - 0.36,
@@ -1451,8 +1474,8 @@

            this.$EventBus.$emit('toPosition', {
                siteJd: center[0] + 0.0046,
                siteWd: center[1] - 0.08,
                siteGd: 8000,
                siteWd: center[1] - 0.04,
                siteGd: 4000,
                siteHeading: -3,
                sitePitch: -45
            })
@@ -1465,9 +1488,9 @@
            let centerPosition = [center.geometry.coordinates[0], center.geometry.coordinates[1]]
            this.clearPolygonLayer()
            this.$EventBus.$emit('toPosition', {
                siteJd: centerPosition[0] + 0.004,
                siteWd: centerPosition[1] - 0.06,
                siteGd: 6000,
                siteJd: centerPosition[0] + 0.001,
                siteWd: centerPosition[1] - 0.018,
                siteGd: 2000,
                siteHeading: -3,
                sitePitch: -45
            })
@@ -1516,7 +1539,7 @@
            this.$EventBus.$emit('toPosition', {
                siteJd: positionArr[0],
                siteWd: positionArr[1],
                siteGd: 3000,
                siteGd: 1000,
                siteHeading: -3,
                sitePitch: -90
            })

 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-04 10:40:44
 * @LastEditTime: 2023-04-04 18:16:00
 * @FilePath: \srs-police-affairs\src\views\police\index.vue
 * @Description: 辖区管理
 * 
@@ -150,7 +150,6 @@
let track = null

import { initMapPosition } from '@/utils/mapPositionInit'

export default {
    inject: ['userInfo'],

@@ -216,6 +215,7 @@

        this.$nextTick(() => {
            initMapPosition()
            this.$EventBus.$emit('closeMxTileset')
        })
    },


 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-04-04 10:32:00
 * @LastEditTime: 2023-04-04 17:38:34
 * @FilePath: \srs-police-affairs\src\views\policeInfor\index.vue
 * @Description: 辖区管理
 * 
@@ -364,114 +364,114 @@
            this.realPoliceInforData = []
            this.realEmptyText = ""

            // getAnswerPolices({ deptId: this.userInfo.dept_id }).then(res => {
            getAnswerPolices({ deptId: this.userInfo.dept_id }).then(res => {

            //     if (res.data && res.data.length) {
            //         this.realPoliceInforData = res.data.map((item, index) => {
            //             const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE || ''
                if (res.data && res.data.length) {
                    this.realPoliceInforData = res.data.map((item, index) => {
                        const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE || ''

            //             return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText }
            //         })
            //     } else {
            //         this.realPoliceInforData = []
            //         this.realEmptyText = "暂无实时警情信息"
            //     }
                        return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, BJLX: bjlxText }
                    })
                } else {
                    this.realPoliceInforData = []
                    this.realEmptyText = "暂无实时警情信息"
                }

            //     this.addPoliceInforSiteLayer(this.realPoliceInforData)
            //     setTimeout(() => {
            //         loading && loading.close()
            //     }, 500)
            // })

            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)
                setTimeout(() => {
                    loading && loading.close()
                }, 500)
            })

            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: '人群聚集赌博'
            // }]

            setTimeout(() => {
                loading && loading.close()
            }, 500)
            // this.realPoliceInforData = this.realPoliceInforData.map((item, index) => {
            //     return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
            // })

            // this.addPoliceInforSiteLayer(this.realPoliceInforData)

            // setTimeout(() => {
            //     loading && loading.close()
            // }, 500)
        },

        // 获取历史接警记录

 vue.config.js

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-09-07 09:37:07
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-04-03 22:06:08
 * @LastEditTime: 2023-04-04 16:45:30
 * @FilePath: \srs-police-affairs\vue.config.js
 * @Description:
 *
@@ -161,8 +161,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                // target: "http://localhost:82",
                target: "http://192.168.0.100:82",
                target: "http://localhost:82",
                // target: "http://192.168.0.100:82",
                // target: "http://17.20.10.3:82",
                // target: "http://10.141.11.11:8081/api",
                // ws: true, //启用webSocket6566