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

shuishen

2023-03-30 ccd24c63863a973da0c334ac4874e01d35c59525

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

 src/components/map/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-30 11:06:04
 * @LastEditTime: 2023-03-30 15:46:06
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -331,15 +331,16 @@
            // that.highOrLightChange('light')

            // 外网
            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({

 src/components/mapSearchBox/index.vue

@@ -94,6 +94,10 @@
        },

        clearSearchValue () {
            this.$EventBus.$emit('mapRemoveLayer', {
                layerName: 'searchLayer',
                type: 'VectorLayer'
            })
            this.searchExtensivelyValue = ''
            this.searchExtensivelyChange()
        },

 src/views/home/components/bottomContainer.vue

@@ -44,7 +44,7 @@
                    <li>
                        <span class="num">序号</span>
                        <span class="receiving-alarm-unit">接警单位</span>
                        <span class="receiving-alarm-people">接警员</span>
                        <span class="receiving-alarm-people">接待警员</span>
                        <span class="receiving-alarm-time">报警时间</span>
                        <span class="call-people">报警人</span>
                        <span class="call-phone">联系电话</span>
@@ -104,6 +104,8 @@
                    <el-table-column :show-overflow-tooltip="true" prop="SFDZ" label="事发地址"
                        min-width="12%"></el-table-column>
                    <el-table-column :show-overflow-tooltip="true" prop="BJLX" label="报警类型"
                        min-width="8%"></el-table-column>
                    <el-table-column :show-overflow-tooltip="true" prop="position" label="坐标"
                        min-width="8%"></el-table-column>
                    <el-table-column :show-overflow-tooltip="true" prop="MEMO" label="备注" min-width="12%"></el-table-column>
                </el-table>
@@ -440,7 +442,7 @@

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

 src/views/home/components/leftContainer.vue

@@ -34,7 +34,9 @@
                        <div class="type">境外人口</div>
                    </div>-->
                </div>
                <div id="PersonEcharts" class="echarts-box"></div>
                <div id="PersonEcharts" class="echarts-box">
                </div>

                <div class="back" title="返回上一级" v-show="dataDeep == 2 && peopletype == 0 && showBack" @click="backBegin">
                </div>
            </div>
@@ -43,10 +45,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" />
@@ -56,10 +58,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>
@@ -128,11 +130,11 @@
            </svg>
        </div>

        <el-dialog title="学校" :modal="false" :visible.sync="xxPopupShow" :before-close="landBeforeClose"
        <el-dialog title="学校" :modal="false" :visible.sync="xxPopupShow" :before-lcose="landBeforeClose"
            :close-on-click-modal="true" class="land-details-box">
            <el-table :data="xxArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'pointer' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">

                <el-table-column :show-overflow-tooltip="true" prop="XSQ" label="县（市、区）"></el-table-column>
                <el-table-column :show-overflow-tooltip="true" prop="name" label="学校名称"></el-table-column>
@@ -200,7 +202,6 @@
    },

    created () {
        console.log(schoolJSON, 1111)
    },

    mounted () {
@@ -221,6 +222,7 @@
                        this.$EventBus.$emit('layerPointAdd', {
                            layerName: 'schoolJSONlayer',
                            type: "billboard",
                            layerType: 'ClusterLayer',
                            params: {
                                lng: Number(item.x),
                                lat: Number(item.y),
@@ -251,6 +253,7 @@

            this.xxPopupShow = false
        },

        /**
         * @description: 获取首页的所有数据
         * @return {*}
@@ -305,7 +308,6 @@
                    this.getPoliceStationInfo()

                } else {

                    this.getVillagePersonStatisticInfoByPoliceStationId(this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id)

                }
@@ -370,7 +372,17 @@
                        })
                    }

                    homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate, colors), true)
                    homePersonmyChart.showLoading({
                        text: '拼命加载中',
                        color: '#c23531',
                        textColor: '#FFF',
                        maskColor: 'rgba(17, 38, 163, 0.6)',
                        zlevel: 0,
                    })
                    setTimeout(() => {
                        homePersonmyChart.hideLoading()
                        homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate, colors), true)
                    }, 500)
                    this.clickPeopleChart()

                    setTimeout(() => { this.dataDeep = 2 }, 1000)
@@ -402,7 +414,17 @@
                })
            }

            homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate, ['#06B5D7', '#44C0C1', '#71C8B1']))
            homePersonmyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 1)',
                zlevel: 0,
            })
            setTimeout(() => {
                homePersonmyChart.hideLoading()
                homePersonmyChart.setOption(this.initPersonOptions(xDate, yDate, ['#06B5D7', '#44C0C1', '#71C8B1']))
            }, 500)
        },

        /**
@@ -570,7 +592,17 @@
        inithouseEcharts (xDate, yDate) {
            var chartDom = document.getElementById('houseEcharts')
            houseMyChart = this.$echarts.init(chartDom)
            houseMyChart.setOption(this.initHouseOptions(xDate, yDate))
            houseMyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                zlevel: 0,
            })
            setTimeout(() => {
                houseMyChart.hideLoading()
                houseMyChart.setOption(this.initHouseOptions(xDate, yDate))
            }, 500)
        },

        initHouseOptions (xDate, y1Date, y2Date) {
@@ -633,12 +665,20 @@
                        zlevel: 2,
                        itemStyle: {
                            normal: {
                                barBorderRadius: [0, 30, 30, 0],
                                // barBorderRadius: [0, 30, 30, 0],
                                //     color: function (params) {
                                //         var num = myColor.length
                                //         return myColor[params.dataIndex % num]
                                //     },
                                color: '#ed7c2f'
                                color: '#ed7c2f',
                                label: {
                                    show: true, //开启显示
                                    position: 'right', //在上方显示
                                    textStyle: { //数值样式
                                        color: '#ed7c2f',
                                        fontSize: 16
                                    }
                                }
                            }
                        },
                    },
@@ -659,7 +699,8 @@
                grid: {
                    top: '2%',
                    left: '2%',
                    right: '-1%',
                    // right: '-1%',
                    right: '5%',
                    bottom: '2%',
                    containLabel: true
                },
@@ -770,6 +811,12 @@
        clickPeopleChart () {
            homePersonmyChart.on('click', params => {
                if (params.data.type == 'policeStation') {
                    const center = this.$parent.getPoliceStationCenter(params.data.id)
                    this.$EventBus.$emit('toPosition', {
                        layerName: 'carLayers',
                        siteJd: center[0],
                        siteWd: center[1]
                    })
                    this.getVillagePersonStatisticInfoByPoliceStationId(params.data.id)
                } else {
                    this.$emit('showpeopledetail', params.data.id, params.data.name)
@@ -804,12 +851,21 @@

            }

            keyPersonmyChart.setOption(this.initkeyPersonOption(personInfo))


            keyPersonmyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                zlevel: 0,
            })
            setTimeout(() => {
                keyPersonmyChart.hideLoading()
                keyPersonmyChart.setOption(this.initkeyPersonOption(personInfo))
            }, 500)

            this.clickkeyPersonChart()
        },

        /**
         * @description: 调用接口获取重点人员数据
         * @return {*}
@@ -998,7 +1054,18 @@

            landMyChart = this.$echarts.init(chartDom)

            landMyChart.setOption(this.initLandOptions(landData[0], landData[1]))

            landMyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                zlevel: 0,
            })
            setTimeout(() => {
                landMyChart.hideLoading()
                landMyChart.setOption(this.initLandOptions(landData[0], landData[1]))
            }, 500)

            this.clickLandChart()
        },

 src/views/home/components/rightContainer.vue

@@ -232,12 +232,14 @@
        getSchedlingList (item) {
            this.$emit("showschedulingdetail", item.dept, item.dept, "type")
        },

        //获取值班单位信息
        getSchedulingDeptList () {
            getSchedulingDeptList().then((res) => {
                this.schedulingDeptList = res.data.data
            })
        },

        // actTabClick (type) {
        //     this.acttype = type
        //     this.$refs.activityTable.bodyWrapper.scrollTop = 0
@@ -338,9 +340,17 @@

            eventchangemychart.clear()
            const optionsData = await this.getCaseAll(date[0], date[1])
            eventchangemychart.setOption(
                this.initEventChangeOption(optionsData.xData, optionsData.yData)
            )
            eventchangemychart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                zlevel: 0,
            })
            setTimeout(() => {
                eventchangemychart.hideLoading()
                eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))
            }, 500)
        },

        // 设置默认时间
@@ -407,9 +417,17 @@

            const optionsData = await this.getCaseAll(date[0], date[1])

            eventchangemychart.setOption(
                this.initEventChangeOption(optionsData.xData, optionsData.yData)
            )
            eventchangemychart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                zlevel: 0,
            })
            setTimeout(() => {
                eventchangemychart.hideLoading()
                eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))
            }, 500)
        },

        // 案件统计的options
@@ -623,7 +641,18 @@
                }
            })

            equipmentmyChart.setOption(this.initEquipmentOptions(newData))
            equipmentmyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(17, 38, 163, 0.6)',
                zlevel: 0,
            })
            setTimeout(() => {
                equipmentmyChart.hideLoading()
                equipmentmyChart.setOption(this.initEquipmentOptions(newData))
            }, 500)


            this.clickEquimentChart()

@@ -738,6 +767,7 @@
                            },
                        },
                        label: {
                            formatter: '{b} {c}',
                            color: function (params) {
                                let colorList = []
                                if ("carCount" in params.data) {

 src/views/home/components/schedulingList.vue

@@ -16,7 +16,9 @@

            <el-table :data="schedulingTableData" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'pointer' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-loading="chedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">

                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
@@ -46,6 +48,7 @@
    data () {
        return {
            person: '',
            chedulingLoading: false,
            contact: '',
            // 值班搜索条件
            schedulingSearchVal: '',
@@ -67,6 +70,7 @@
        //初始化
        init (data) {
            this.schedulingVisible = true
            this.chedulingLoading = true
            this.schedulingTitle = data.name + "值班信息"
            this.dept = data.dept
            this.getSchedulingtPaging()
@@ -88,6 +92,7 @@
         * @return {*}
         */
        searchScheduling () {
            this.chedulingLoading = true
            this.page.currentPage = 1
            this.getSchedulingtPaging()
        },
@@ -97,6 +102,7 @@
         * @return {*}
         */
        clearSearchScheduling () {
            this.chedulingLoading = true
            this.page.currentPage = 1
            this.person = ''
            this.contact = ''
@@ -126,6 +132,9 @@
                        this.schedulingTableData = res.data.data.records
                        this.page.total = res.data.data.total
                    }
                    setTimeout(() => {
                        this.chedulingLoading = false
                    }, 500)
                })
        },
    }

 src/views/home/index.vue

@@ -84,7 +84,7 @@

        <!-- 户籍人口 -->
        <el-dialog :title="peopleTitle" :modal="true" :visible.sync="peopleVisible" :before-close="personInfoClose"
            :close-on-click-modal="true" class="area-details-box" v-loading="peopleKeypeopleLoading">
            :close-on-click-modal="true" class="area-details-box">
            <div class="header">
                <div>
                    人员名称：
@@ -100,7 +100,9 @@

            <el-table :data="peopleInfoList" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-loading="peopleKeypeopleLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
                        <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
@@ -124,22 +126,23 @@
    <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>
                                 人员名称：
                                 <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
                             </div>
                             <div>
                                 联系电话：
                                 <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
                             </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>
                                                                                                            人员名称：
                                                                                                            <input type="text" v-model="peoplePoliceName" placeholder="请输入人员名称" />
                                                                                                        </div>
                                                                                                        <div>
                                                                                                            联系电话：
                                                                                                            <input type="text" v-model="peopleCallPhone" placeholder="请输入联系电话" />
                                                                                                        </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> -->

            <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">
                v-show="!isMaoJiaLin" v-loading="keyPeopleLoading" element-loading-text="拼命加载中"
                element-loading-spinner="el-icon-loading" element-loading-background="rgba(17, 38, 163, 1)">>
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
                        <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
@@ -153,7 +156,7 @@
            <!-- <el-table-column :show-overflow-tooltip="true" prop="areaName" label="所属责任区"></el-table-column> -->
            <el-table-column label="操作" align="center" :min-width="typeValue == 0 || typeValue == 2 ? '30%' : '18%'">
                <template slot-scope="scope">
                    <el-button @click="rowClick(scope.row)" type="text" size="small" title="定位">
                    <el-button @click="rowClick(scope.row)" type="etxt" size="small" title="定位">
                            <i class="el-icon-location"></i>
                        </el-button>
                    </template>
@@ -161,14 +164,15 @@
            </el-table>

            <!-- <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> -->
                                                                                       <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> -->
        </el-dialog>

        <el-dialog :title="equimentTitle" :modal="true" :visible.sync="equimentVisible" :before-close="equimentBeforeClose"
            :close-on-click-modal="true" class="equiment-details-box">
            :close-on-click-modal="true" class="equiment-details-box"
            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
            <div class="header">
                <div>
                    设备名称：
@@ -181,7 +185,9 @@

            <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">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" :row-class-name="tableRowClassName"
                v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
                        <span>{{ (currentPage - 1) * pagesize + scope.$index + 1 }}</span>
@@ -235,7 +241,9 @@

            <el-table :data="landDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-loading="landLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column label="序号" type="index" align="center">
                    <template slot-scope="scope">
                        <span>{{ (landPage.currentPage - 1) * landPage.pageSize + scope.$index + 1 }}</span>
@@ -396,6 +404,8 @@
let cylinderLayer = null
let circleLayer = null
let DataSourcesArray = []
let loading = null


let treeData = [
    {
@@ -517,6 +527,9 @@

    data () {
        return {
            keyPeopleLoading: false,
            equimentLoading: false,
            landLoading: false,
            peopleKeypeopleLoading: false,
            // 是否显示辖区
            areaPolygonLayerShow: true,
@@ -674,6 +687,7 @@
                        this.$EventBus.$emit('layerPointAdd', {
                            layerName: 'keypeopleslay',
                            type: "billboard",
                            layerType: 'ClusterLayer',
                            params: {
                                lng: Number(item.X),
                                lat: Number(item.Y),
@@ -684,6 +698,11 @@

                })
            }
        })

        const that = this
        this.$EventBus.$on('closeLoading', () => {
            that.closeLoading()
        })

        window.addEventListener('resize', this.setDomStyle)
@@ -707,6 +726,21 @@
            })

            this.keyPersonVisible = false
        },

        // 获取派出所中心点
        getPoliceStationCenter (id) {
            let clickPoliceStation = this.policeStationOptions.filter(item => item.id === id)
            const center = this.getRegionCenter(clickPoliceStation[0].position)
            return center
        },

        // 获取责任区中心点
        getAreaCenter (id) {
            // let clickPoliceStation = this.policeStationOptions.filter(item => item.id === id)
            // const center = this.getRegionCenter(clickPoliceStation[0].position)
            // return center
            // this.(getPoliceStationTree2, item.id)
        },

        // 加载首页下拉列表数据
@@ -823,6 +857,7 @@
                                this.$EventBus.$emit('layerPointAdd', {
                                    layerName: 'cameraLayers',
                                    type: 'label',
                                    layerType: 'ClusterLayer',
                                    params: {
                                        lng: item.longitude,
                                        lat: item.latitude,
@@ -852,6 +887,7 @@
                }
            })
        },

        // 接出警切换
        alarmOrActAsPolice (type) {
            this.policeInformationType = type
@@ -1019,6 +1055,7 @@
                    this.$EventBus.$emit('layerPointAdd', {
                        layerName: 'houseLayers',
                        type: "billboard",
                        layerType: 'ClusterLayer',
                        params: item,
                        incident: this.houseSiteClick
                    })
@@ -1051,6 +1088,7 @@

        cameraChange (e) {
            if (e == true) {
                this.loading()
                this.$EventBus.$emit('layerShow', {
                    layerName: 'cameraLayers',
                    flag: true
@@ -1060,6 +1098,23 @@
                    layerName: 'cameraLayers',
                    flag: false
                })
            }
        },

        loading () {
            loading = this.$loading({
                lock: true,
                text: '拼命加载中',
                spinner: 'el-icon-loading',
                background: 'rgba(0, 0, 0, 0.7)'
            })
            setTimeout(() => { loading.close() }, 1000)
        },

        closeLoading () {
            console.log('closeLoading---------')
            if (loading != null) {
                loading.close()
            }
        },

@@ -1088,6 +1143,7 @@
                    this.$EventBus.$emit('layerPointAdd', {
                        layerName: 'panoramaLayers',
                        type: "billboard",
                        layerType: 'ClusterLayer',
                        params: item,
                        incident: this.panoramaSiteClick
                    })
@@ -1373,7 +1429,6 @@
            })

            this.policeStationOptions.forEach((item, index) => {

                if (item.position && item.position.length > 0) {
                    item.position.forEach((sourceItem, sourceIndex) => {

@@ -1656,12 +1711,14 @@
         * @return {*}
         */
        async showequimentdetail (name, typeVale, type) {
            this.equimentLoading = true
            this.equimentTitle = name

            this.equimentCurrentSelect = {}

            this.equimentCurrentSelect[type] = typeVale

            this.equimentTableData = []
            await this.getEquipmentPaging(this.equimentCurrentSelect)

            this.equimentVisible = true
@@ -1688,6 +1745,7 @@
         * @return {*}
         */
        searchEquiment () {
            this.equimentLoading = true
            this.currentPage = 1
            this.getEquipmentPaging(this.equimentCurrentSelect)
        },
@@ -1697,6 +1755,7 @@
         * @return {*}
         */
        clearSearchEquiment () {
            this.equimentLoading = true
            this.currentPage = 1
            this.equimentSearchVal = ''
            this.getEquipmentPaging(this.equimentCurrentSelect)
@@ -1713,16 +1772,16 @@
            }).then(res => {
                this.equimentTableData = []
                this.equimentPagingTotal = 0

                if (res.data.data.list.length > 0) {
                    this.equimentTableData = res.data.data.list

                    this.equimentPagingTotal = res.data.data.total
                } else {
                    this.equimentTableData = []

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

@@ -1833,6 +1892,8 @@
         * @return {*}
         */
        showkeypersondetail (name) {
            this.keyPersonVisible = true
            this.keyPeopleLoading = true
            this.keyPersonTitle = name

            if (this.userInfo.dept_id == '1596020515064381442') {
@@ -1858,9 +1919,6 @@
                this.getPersonInfoPage(2)
            }

            // this.keyPersonDetailArr

            this.keyPersonVisible = true
        },

        /**
@@ -1905,7 +1963,10 @@
                    this.peopleInfoList = []
                    this.peoplePage.total = 0
                }
                this.peopleKeypeopleLoading = false
                setTimeout(() => {
                    this.peopleKeypeopleLoading = false
                    this.keyPeopleLoading = false
                }, 500)
            })
        },

@@ -1922,7 +1983,6 @@
         */
        getPanoramaList () {
            getPanoramaList().then(res => {
                console.log('getPanoramaList')
                if (res.data.code == 200) {
                    this.panoramaList = res.data.data.map(e => {
                        const item = {
@@ -1952,6 +2012,7 @@
         */
        showlanddetail (name, type, id) {
            this.landVisible = true
            this.landLoading = true
            this.landTitle = name
            this.landType = type
            this.landDetailId = id
@@ -1960,6 +2021,7 @@
        },

        clearLandDetailSearchValue () {
            this.landLoading = true
            this.policeName = ''
            this.callPhone = ''
            this.landSearchAoiName = ''
@@ -1972,6 +2034,7 @@
         * @return {*}
         */
        searchLandDetail () {
            this.landLoading = true
            this.landPage.currentPage = 1
            this.getLandDetail(this.landType, this.landDetailId, this.landPage.currentPage, this.policeName, this.callPhone, this.landSearchAoiName)
        },
@@ -2007,6 +2070,9 @@
                    this.landDetailArr = []
                    this.landPage.total = 0
                }
                setTimeout(()=>{
                    this.landLoading = false
                },500)
            })
        },

@@ -2030,6 +2096,7 @@
         */
        clearPeopleDetailSearchValue () {
            this.peoplePoliceName = ''
            this.peopleKeypeopleLoading = true
            this.peopleCallPhone = ''
            this.peoplePage.currentPage = 1


 src/views/house/index.vue

@@ -142,9 +142,9 @@
                                <div class="two">
                                    <div>
                                        <div>98</div>
                                                                          <div>户籍人口</div>
                                                                      </div>
                                                                      <div>
                                                                                                          <div>户籍人口</div>
                                                                                                      </div>
                                                                                                      <div>
                                        <div style="color:#0E88FF">20</div>
                                        <div>流动人口</div>
                                    </div>
@@ -165,17 +165,17 @@
                                </div>
                                <div>
                                    <div>120</div>
                                                                <div>出租</div>
                                                                  </div>
                                                                      <div>160</div>
                                                                      <div>自住</div>
                                                                  </div>
                                                                  <div>
                                                                      <div>8</div>
                                                                      <div>空置</div>
                                                                  </div>
                                                              </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>-->
                                                                                                <div>出租</div>
                                                                                                  </div>
                                                                                                      <div>160</div>
                                                                                                      <div>自住</div>
                                                                                                  </div>
                                                                                                      <div>8</div>
                                                                                                  <div>
                                                                                                      <div>空置</div>
                                                                                                  </div>
                                                                                              </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>-->
                        <div class="house-element-info" v-if="isShowHouseBox">
                        <!-- 选择单元 -->
                        <div class="condo" v-show="isShowUnitChoose">
@@ -220,17 +220,17 @@
                                    <div>
                                        <span class="zizhu"></span>
                                        自住
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <span class="kongzhi"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                空置
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <span class="shangye"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                商业
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <span class="kongzhi"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                空置
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <span class="shangye"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                商业
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    </div>-->
                            <el-main v-loading="pictLoading" element-loading-background="rgba(17, 38, 163, .1)"
                                element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                                v-show="isShowHouseBox">
@@ -267,8 +267,8 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div class="focus"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <div class="warning"></div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div class="focus"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -410,7 +410,9 @@
            :before-close="residentDetailsClose" :close-on-click-modal="true" class="resident-details-box" width="24%">
            <el-table :data="houseDate"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }" v-loading="residentLoading"
                element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column prop="realName" label="姓名"></el-table-column>
                <el-table-column prop="phone" label="电话"></el-table-column>
                <el-table-column prop="cardNo" label="身份证号"></el-table-column>
@@ -433,7 +435,9 @@
            </div>
            <el-table :data="personDetailArr" style="width: 100%"
                :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'pointer' }">
                :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                v-loading="keyPeopleLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(17, 38, 163, 1)">
                <el-table-column label="序号" type="index" width="50" align="center">
                    <template slot-scope="scope">
                        <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
@@ -478,6 +482,8 @@
        return {
            // 下拉搜索--树状数据相关
            searchTreeShowFlag: false,
            keyPeopleLoading: false,
            residentLoading: false,
            searchTreeName: '',
            searchTreeData: [],
            props: {
@@ -905,6 +911,7 @@
            this.getVillagePersonInfo(params.properties.snxmi)
            this.residentDetailsTitle = `${curHousingName}${this.unitOptions.filter(item => item.value == this.unitValue)[0].label}${params.properties.fojcu}住户信息`
            this.residentDetailsShow = true
            this.residentLoading = true
            console.log('residentDetailsClick-params', params)
            this.$EventBus.$emit('showHouse3D', { positions: params.properties.kmj3a, minHeight: params.properties.szhfr, maxHeight: params.properties.szhfr + params.properties.hnagn })
        },
@@ -1052,6 +1059,7 @@
            this.keyPeopleType = status
            this.peoplePage.currentPage = 1
            this.keyPersonTitle = status == 1 ? '户籍人口详情' : '重点人口详情'
            this.keyPeopleLoading = true
            this.getVillagePersonInfo('', this.choosedBuildId, status == 1 ? '' : status)
        },

@@ -1217,11 +1225,16 @@
                } else {
                    this.houseDate = res.data.data.records
                }
                setTimeout(() => {
                    this.keyPeopleLoading = false
                    this.residentLoading = false
                }, 500)
            })
        },

        // 清空人员列表搜索内容
        clearPeopleDetailSearchValue () {
            this.keyPeopleLoading = true
            this.callPhone = ''
            this.peopleName = ''
            this.peoplePage.currentPage = 1
@@ -1230,6 +1243,7 @@

        // 搜索指定人员
        searchPeopleDetail () {
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = 1
            this.getVillagePersonInfo('', this.choosedBuildId, this.keyPeopleType == 1 ? '' : this.keyPeopleType, this.peoplePage.currentPage, this.peopleName, this.callPhone)
        },

 src/views/police/index.vue

@@ -30,7 +30,8 @@
                    <el-table :data="equimentTableData"
                        :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', borderColor: '#324e75' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75', cursor: 'pointer' }"
                        :height="currentTableHeight">
                        :height="currentTableHeight" v-loading="equimentLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(17, 38, 163, 1)">
                        <el-table-column prop="newName" :show-overflow-tooltip="true" label="名称"
                            :min-width="typeValue == 0 || typeValue == 2 ? '56%' : '68%'"></el-table-column>
                        <el-table-column prop="status" label="状态"
@@ -145,6 +146,7 @@
    data () {
        return {
            navType: 0,
            equimentLoading: false,
            dialogTitle: '',
            dialogVisible: false,
            searchValue: '',
@@ -231,7 +233,7 @@
                layerName: 'policeMonitoringLayers',
                type: 'VectorLayer'
            })

            this.equimentLoading =true
            this.getEquipmentPaging({ type: this.navType })
        },
        // 设备分页处理
@@ -315,6 +317,9 @@

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

@@ -332,6 +337,7 @@
                this.navType = type
            }

            this.equimentLoading = true
            this.searchValue = ''

            this.equimentPage.currentPage = 1

 vue.config.js

@@ -161,8 +161,8 @@
        proxy: {
            "/api": {
                // target用于配置你允许访问数据的计算机名称，即是你的api接口的服务器地址
                target: "http://localhost:82",
                // target: "http://172.16.13.130: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