修改

guanqb

2023-04-01 8dd47126adbb0748f06858dff30f441e6c2cb61c

修改

 public/depend/element-ui.css

@@ -3031,7 +3031,7 @@
.el-date-range-picker .el-picker-panel__body {
  min-width: 513px;
}
.el-date-range-picker  {
.el-date-range-picker {
  margin: 0;
}
.el-date-range-picker__header {

 src/views/home/components/leftContainer.vue

@@ -34,8 +34,12 @@
                        <div class="type">境外人口</div>
                    </div>-->
                </div>
                <div id="PersonEcharts" class="echarts-box">
                </div>
                <el-main v-loading="personEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    <div id="PersonEcharts" class="echarts-box">
                    </div>
                </el-main>


                <div class="back" title="返回上一级" v-show="dataDeep == 2 && peopletype == 0 && showBack" @click="backBegin">
                </div>
@@ -45,10 +49,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" />
@@ -58,10 +62,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>
@@ -87,7 +91,10 @@
                        <div class="tab-title-small">{{ keyPlaceNum ? keyPlaceNum : 0 }}栋</div>
                    </div>
                </div>
                <div id="houseEcharts" class="echarts-box"></div>
                <el-main v-loading="houseEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    <div id="houseEcharts" class="echarts-box"></div>
                </el-main>
            </div>

            <svg class="border-svg">
@@ -118,7 +125,10 @@
                    </div>
                </div>

                <div id="landEcharts" class="echarts-box"></div>
                <el-main v-loading="landEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    <div id="landEcharts" class="echarts-box"></div>
                </el-main>
            </div>

            <svg class="border-svg">
@@ -155,6 +165,9 @@
    data () {
        return {
            tabType: 0,
            personEchartsLoading: false,
            houseEchartsLoading: false,
            landEchartsLoading: false,
            peopletype: 0,
            tabTypeTwo: 0,
            tabTypeThree: 0,
@@ -243,6 +256,7 @@
        personTabClick (type) {
            this.tabType = type
            this.dataDeep = 1
            this.personEchartsLoading = true

            this.disposeEchart()

@@ -252,18 +266,14 @@
                    this.getPoliceStationInfo()

                } else {

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

                }


            } else if (type == 1) {

                this.initkeyPersonEcharts()

            }


        },

        /**
@@ -285,7 +295,14 @@
                    //异步，因此放进接口方法内部
                    this.initPersonEcharts()
                    this.clickPeopleChart()
                    setTimeout(() => {
                        this.personEchartsLoading = false
                    }, 500)
                }
            }).catch(res => {
                setTimeout(() => {
                    this.personEchartsLoading = false
                }, 500)
            })
        },

@@ -316,22 +333,19 @@
                        })
                    }

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

                    setTimeout(() => { this.dataDeep = 2 }, 1000)
                    setTimeout(() => {
                        this.dataDeep = 2,
                            this.personEchartsLoading = false
                    }, 1000)

                }
            }).catch(res => {
                setTimeout(() => {
                    this.personEchartsLoading = false
                }, 500)
            })
        },

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

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

        /**
@@ -530,24 +534,21 @@
                } else {
                    this.inithouseEcharts(xDate, yDate)
                }
                setTimeout(() => {
                    this.houseEchartsLoading = false
                }, 500)
                this.clickHouseChart()
            }).catch(res => {
                setTimeout(() => {
                    this.houseEchartsLoading = false
                }, 500)
            })
        },

        inithouseEcharts (xDate, yDate) {
            var chartDom = document.getElementById('houseEcharts')
            houseMyChart = this.$echarts.init(chartDom)
            houseMyChart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })
            setTimeout(() => {
                houseMyChart.hideLoading()
                houseMyChart.setOption(this.initHouseOptions(xDate, yDate))
            }, 500)
            houseMyChart.setOption(this.initHouseOptions(xDate, yDate))
        },

        initHouseOptions (xDate, y1Date, y2Date) {
@@ -688,6 +689,8 @@
        houseTabClick (type) {
            this.tabTypeTwo = type

            this.houseEchartsLoading = true

            this.disposeHouseEchart()
            if (type == 0) {
                this.getHouseStatisticInfo(2)
@@ -796,6 +799,7 @@
                        siteJd: center[0],
                        siteWd: center[1]
                    })
                    this.personEchartsLoading = true
                    this.getVillagePersonStatisticInfoByPoliceStationId(params.data.id)
                } else {
                    this.$emit('showpeopledetail', params.data.id, params.data.name)
@@ -832,22 +836,14 @@

            if (this.userInfo.dept_id == '1596020515064381442') {
                personInfo = [{ count: 8, name: '征地拆迁群体', value: 8 }, { count: 4, name: '非涉法涉诉重点个访人员', value: 4 }, { count: 4, name: '涉法涉诉重点个访人员', value: 4 }, { count: 1, name: '楼盘业主维权群体', value: 1 }]

            }

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

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

        /**
@@ -982,6 +978,7 @@
         */
        landTabClick (type) {
            this.tabTypeThree = type
            this.landEchartsLoading = true

            this.disposeLandEchart()
            if (type == 0) {
@@ -1023,8 +1020,15 @@
                    })
                    landData = [nameArr, countArr]
                }
                setTimeout(() => {
                    this.landEchartsLoading = false
                }, 500)

                this.initLandEcharts(landData)
            }).catch(res => {
                setTimeout(() => {
                    this.landEchartsLoading = false
                }, 500)
            })
        },

@@ -1039,17 +1043,7 @@

            landMyChart = this.$echarts.init(chartDom)

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

            this.clickLandChart()
        },
@@ -1294,11 +1288,16 @@
            }
        }

        :deep(.el-main) {
            padding: 0;
        }

        .echarts-box {
            padding: 12px;
            padding-top: 0;
            flex: 1;
            width: 100%;
            height: 100%;
        }
    }


 src/views/home/components/rightContainer.vue

@@ -10,7 +10,8 @@
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
                        :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }" :row-class-name="tableRowClassName"
                        empty-text="暂无值班信息">
                        empty-text="暂无值班信息" v-loading="schedulingLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                        <el-table-column prop="dept" label="值班单位"></el-table-column>
                        <el-table-column prop="person" label="姓名"></el-table-column>
                        <el-table-column prop="contact" label="联系方式"></el-table-column>
@@ -26,8 +27,9 @@
                <div class="table-box" v-show="showMJL">
                    <el-table size="small" :height="tableHeight" :data="schedulingList" style="width: 100%"
                        :show-header="false" :header-cell-style="{ 'text-align': 'center' }"
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }"
                        :row-class-name="tableRowClassName">
                        :cell-style="{ 'text-align': 'center', borderColor: '#324e75' }" :row-class-name="tableRowClassName"
                        v-loading="schedulingLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                        element-loading-background="rgba(0, 0, 0, 0.2)">
                        <el-table-column :show-overflow-tooltip="true" v-for="(item, index) in transTitle" :label="item"
                            :key="index" align="center">
                            <template slot-scope="scope">
@@ -57,7 +59,10 @@
                            :picker-options="pickerOptions"></el-date-picker>
                    </div>
                </div>
                <div id="EventChangeEcharts" class="echarts-box"></div>
                <el-main v-loading="eventChangeEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    <div id="EventChangeEcharts" class="echarts-box"></div>
                </el-main>
            </div>

            <svg class="border-svg">
@@ -106,7 +111,10 @@
                        <span :class="{ choosed: linetype == 1 }" @click="initEquipmentEcharts(1)">设备状态</span>
                    </div>
                </div>
                <div style="overflow: hidden" id="EquipmentEcharts" class="echarts-box"></div>
                <el-main v-loading="equipmentEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                    <div style="overflow: hidden" id="EquipmentEcharts" class="echarts-box"></div>
                </el-main>
            </div>

            <svg class="border-svg">
@@ -153,6 +161,9 @@
    data () {
        return {
            eventTime: [],
            equipmentEchartsLoading: false,
            eventChangeEchartsLoading: false,
            schedulingLoading: false,
            pickerOptions: {
                shortcuts: [
                    {
@@ -270,6 +281,7 @@

        getSchedulingList () {
            console.log(this.userInfo, 4567)
            this.schedulingLoading = true
            if (this.userInfo.dept_id == "1596020515064381442") {
                const data = [
                    {
@@ -322,6 +334,9 @@
                    this.schedulingList = res.data.data.records
                })
            }
            setTimeout(() => {
                this.schedulingLoading = false
            }, 1000)
        },

        echartsResize () {
@@ -399,6 +414,7 @@

        // 初始化案件统计
        async initEventChangeEcharts () {
            this.eventChangeEchartsLoading = true
            var chartDom = document.getElementById("EventChangeEcharts")

            if (
@@ -416,16 +432,11 @@

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

            eventchangemychart.showLoading({
                text: '拼命加载中',
                color: '#c23531',
                textColor: '#FFF',
                maskColor: 'rgba(0, 0, 0, 0.2)',
                zlevel: 0,
            })

            eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))

            setTimeout(() => {
                eventchangemychart.hideLoading()
                eventchangemychart.setOption(this.initEventChangeOption(optionsData.xData, optionsData.yData))
                this.eventChangeEchartsLoading = false
            }, 500)
        },

@@ -553,8 +564,8 @@

            let data = []
            this.regionTotal = 0

            const dataAll = getEquipment(
            let dataAll = null
            dataAll = getEquipment(
                this.policeStaionID != "" ? this.policeStaionID : this.userInfo.dept_id
            ).then((res) => {
                if (this.linetype == 0) {
@@ -611,6 +622,8 @@

                    return data
                }
            }).catch(res => {
                dataAll = '请求错误'
            })

            return dataAll
@@ -619,6 +632,7 @@
        // 现有设备饼图初始化
        async initEquipmentEcharts (type) {
            this.linetype = type
            this.equipmentEchartsLoading = true

            if (
                equipmentmyChart != null &&
@@ -634,24 +648,18 @@

            const data = await this.getEquipment()

            if (data == '请求错误') {
                setTimeout(() => {
                    this.equipmentEchartsLoading = false
                }, 500)
            }
            const newData = data.filter((item) => {
                if (item.value != 0) {
                    return item
                }
            })

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

            equipmentmyChart.setOption(this.initEquipmentOptions(newData))

            this.clickEquimentChart()

@@ -662,6 +670,9 @@
                equipmentmyChart.off("mouseover")
                equipmentmyChart.off("mouseout")
            }
            setTimeout(() => {
                this.equipmentEchartsLoading = false
            }, 500)
        },

        // 现有设备options饼图数据
@@ -956,6 +967,11 @@
        //     margin-left: 8px;
        // }


        :deep(.el-main) {
            padding: 0;
        }

        .box {
            display: flex;
            position: absolute;
@@ -1033,6 +1049,8 @@
        .echarts-box {
            padding: 12px;
            flex: 1;
            height: 100%;
            width: 100%;
        }

        .table-box {
@@ -1053,6 +1071,10 @@
                    cursor: pointer;
                }
            }

            :deep(.el-table .cell) {
                white-space: pre-line;
            }
        }

        #peopleList {

 src/views/home/index.vue

@@ -100,7 +100,7 @@
            </div>

            <el-main v-loading="peopleKeypeopleLoading" element-loading-text="拼命加载中"
                element-loading-spinner="el-icon-loading" element-e-background="rgba(0, 0, 0, 0.2)">
                element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                <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' }"
@@ -131,17 +131,17 @@
    <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' }"
@@ -169,10 +169,10 @@
            </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"

 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>
                                                                                                                          </div>
                                                                                                                              <div>160</div>
                                                                                                                              <div>自住</div>
                                                                                                                          </div>
                                                                                                                              <div>8</div>
                                                                                                                          <div>
                                                                                                                              <div>空置</div>
                                                                                                                          </div>
                                                                                                                      </div>
                                                                                                                          <div>160</div>
                                                                                                                          <div>自住</div>
                                                                                                                      </div>
                                                                                                                          <div>8</div>
                                                                                                                      <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>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <span class="kongzhi"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    空置
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                <div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <span class="shangye"></span>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    商业
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                </div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </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>
@@ -730,7 +730,9 @@
            if (current.hasChildren == true) return
            this.filterText = ''
            this.prop = current.name
            this.searchTreeName = current.name
            if (current.type == 3) {
                this.searchTreeName = current.name
            }
            if (circleLayer && circleLayer != null && circleLayer != undefined) {
                circleLayer.clear()
                circleLayer.remove()

 src/views/police/index.vue

@@ -14,7 +14,7 @@
        <div v-show="boxShow" class="container-content">
            <el-main v-loading="equimentLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
                element-loading-background="rgba(0, 0, 0, 0.2)">
                <div class="switch-box" v-show="!detailFlag && !equimentLoading">
                <div class="switch-box" v-show="!detailFlag">
                    资源类别：
                    <el-select v-model="typeValue" @change="navClick" placeholder="请选择" class="type-select-css">
                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"
@@ -22,7 +22,7 @@
                    </el-select>
                </div>

                <div class="list-show" v-if="!detailFlag && !equimentLoading">
                <div class="list-show" v-if="!detailFlag">
                    <div class="search-box">
                        资源名称：
                        <input v-model="searchValue" @input="searchChange" type="text" placeholder="请输入…" />