修改

guanqb

2023-04-03 73cd7da80b140dd01ba253dab5300c0485cb7c08

修改

 src/views/house/index.vue

@@ -189,7 +189,7 @@
                                                <!-- :class="[{ 'chuzu': value.houseType == '出租' }, { 'zizhu': value.houseType == '自住' }, { 'kongzhi': value.houseType == '空置' }, { 'shangye': value.houseType == '商业' }]" -->
                                                {{ value.properties.fojcu }}
                                                <!-- <div class="flow"></div>
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        <div class="warning"></div>-->
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -239,28 +239,32 @@
                </div>

                <div class="police-info" v-if="navType == 1" ref="policeTableBox">
                    <el-table :data="callPoliceData" style="width: 100%" :height="currentTableHeight"
                        :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                        :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                        :row-class-name="tableRowClassName" @row-click="clickData" empty-text="暂无警情信息">
                        <el-table-column prop="JJDWMC" :show-overflow-tooltip="true" label="接警单位"
                            min-width="34%"></el-table-column>
                        <el-table-column label="报警时间" min-width="26%">
                            <template slot-scope="scope">
                                <span>{{ scope.row.BJSJ.substring(0, 10) }}</span>
                            </template>
                        </el-table-column>
                        <el-table-column prop="JJYXM" :show-overflow-tooltip="true" label="接警员"
                            min-width="20%"></el-table-column>
                        <el-table-column prop="BJRXM" :show-overflow-tooltip="true" label="报警人"
                            min-width="20%"></el-table-column>
                    </el-table>
                    <el-main v-loading="policeInfoLoading" element-loading-text="拼命加载中"
                        element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.2)">
                        <el-table :data="callPoliceData" style="width: 100%" :height="currentTableHeight"
                            :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                            :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75' }"
                            :row-class-name="tableRowClassName" @row-click="clickData" :empty-text="jqNoDataText">
                            <el-table-column prop="JJDWMC" :show-overflow-tooltip="true" label="接警单位"
                                min-width="34%"></el-table-column>
                            <el-table-column label="报警时间" min-width="26%">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.BJSJ.substring(0, 10) }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column prop="JJYXM" :show-overflow-tooltip="true" label="接警员"
                                min-width="20%"></el-table-column>
                            <el-table-column prop="BJRXM" :show-overflow-tooltip="true" label="报警人"
                                min-width="20%"></el-table-column>
                        </el-table>

                    <div class="pages all-pagination-sty" ref="ElPagination">
                        <el-pagination background layout="prev, pager, next" :page-size="callPolicePage.pageSize"
                            :page-count="callPolicePage.count" :current-page="callPolicePage.currentPage"
                            @current-change="handleCurrentChange"></el-pagination>
                    </div>
                        <div class="pages all-pagination-sty" ref="ElPagination">
                            <el-pagination background layout="prev, pager, next" :page-size="callPolicePage.pageSize"
                                :page-count="callPolicePage.count" :current-page="callPolicePage.currentPage"
                                @current-change="handleCurrentChange"></el-pagination>
                        </div>
                    </el-main>

                </div>
            </div>
        </div>
@@ -360,7 +364,8 @@
                element-loading-background="rgba(0, 0, 0, 0.2)">
                <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': 'default' }">
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                    :empty-text="peopleNoDataText">
                    <el-table-column label="序号" type="index" width="50" align="center">
                        <template slot-scope="scope">
                            <span>{{ (peoplePage.currentPage - 1) * peoplePage.pageSize + scope.$index + 1 }}</span>
@@ -415,8 +420,10 @@
        return {
            // 下拉搜索--树状数据相关
            searchTreeShowFlag: false,
            peopleNoDataText: '暂无人口数据',
            peopleNoDataText: ' ',
            jqNoDataText: ' ',
            keyPeopleLoading: false,
            policeInfoLoading: false,
            isHaveNoPic: false,
            residentLoading: false,
            searchTreeName: "",
@@ -709,7 +716,6 @@
                circleLayer = null
            }
            this.subNavType = 1
            this.getResidentialQuartersInfo(current.id, "361102")
            this.getSearchExtensivelyBgAoiDeepdata(
                "ebf48ecaa1fd436fa3d40c4600aa051f",
                "361100",
@@ -725,6 +731,8 @@
            this.navType = e.target.dataset.type

            if (this.navType == 1) {
                this.policeInfoLoading = true
                this.jqNoDataText = '  '
                this.callPolicePage.currentPage = 1
                this.getAlarmList()
            } else {
@@ -774,7 +782,6 @@
                    res.data.result[0].deep_infos.deep_info.length
                ) {
                    let deepData = res.data.result[0].deep_infos.deep_info
                    console.log("deepData------", deepData)
                    this.parkingLotData = []
                    this.comeOutData = []
                    this.businessData = []
@@ -839,7 +846,6 @@

                if (res.data != null && houseData.nwwqd.features != []) {
                    let unitData = houseData.nwwqd.features
                    console.log(unitData.length, 223366)
                    this.floorInfo.house_num = unitData.length
                    if (houseData.hwtxa.features.length > 1) {
                        this.isShowUnitChoose = true
@@ -965,7 +971,9 @@
            this.floorInfo.floor_num = item.floor_num
            // 获取户籍人口重点人口数据
            this.choosedBuildId = item.build_id
            // 重点人口户籍人口
            this.getVillagePersonStatisticInfoByBuildId(item.build_id)
            // 楼栋单元楼层户室查询
            this.getHouses(item.build_id, "361102", aoiArr)
            console.log("buildingClick-end")
            this.floorsType = 1
@@ -1118,7 +1126,7 @@
            this.keyPeopleType = status
            this.peoplePage.currentPage = 1
            this.keyPersonTitle = status == 1 ? "户籍人口详情" : "重点人口详情"
            this.peopleNoDataText = status == 1 ? "暂无户籍人口数据" : "暂无重点人口数据"
            this.peopleNoDataText = ' '
            this.keyPeopleLoading = true
            this.getVillagePersonInfo(
                "",
@@ -1129,9 +1137,12 @@

        // 获取历史接警记录
        getAlarmList () {
            circleLayer.clear()
            circleLayer.remove()
            circleLayer = null
            if (circleLayer != null) {
                circleLayer.clear()
                circleLayer.remove()
                circleLayer = null
            }

            circleLayer = new global.DC.PrimitiveLayer("circleLayer")
            global.viewer.addLayer(circleLayer)

@@ -1154,7 +1165,6 @@
                            lat: item.ZDDWYZB,
                        }
                    })

                    this.callPoliceData.forEach((item, index) => {
                        if (item.lng != "" && item.lat != "") {
                            let center = new global.DC.Position(item.lng, item.lat)
@@ -1184,9 +1194,18 @@
                    })
                } else {
                    this.callPoliceData = []
                    setTimeout(() => {
                        this.jqNoDataText = '暂无报警信息'
                        this.policeInfoLoading = false
                    }, 500)
                }

                this.setTableHeight()
            }).catch(res => {
                setTimeout(() => {
                    this.jqNoDataText = '暂无报警信息'
                    this.policeInfoLoading = false
                }, 500)
            })
        },

@@ -1263,10 +1282,13 @@
        // 分页选择事件
        handleCurrentChange (currentPage) {
            this.callPolicePage.currentPage = currentPage
            this.policeInfoLoading = true
            this.jqNoDataText = '  '
            this.getAlarmList()
        },

        peopleHandleCurrentChange (currentPage) {
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = currentPage
            this.getVillagePersonInfo(
                "",
@@ -1322,14 +1344,32 @@
            ).then((res) => {
                if (buildId) {
                    this.personDetailArr = res.data.data.records

                    this.peoplePage.pageSize = res.data.data.size
                    this.peoplePage.total = res.data.data.total
                    setTimeout(() => {
                        this.keyPeopleLoading = false
                        this.residentLoading = false
                        if (res.data.data.records.length == 0) {
                            if (status == '') {
                                this.peopleNoDataText = '暂无户籍人口信息'
                            } else {
                                this.peopleNoDataText = '暂无重点人口信息'
                            }
                        }
                    }, 500)
                } else {
                    this.houseDate = res.data.data.records
                }
            }).catch((res) => {
                setTimeout(() => {
                    this.keyPeopleLoading = false
                    this.residentLoading = false
                    if (status == '') {
                        this.peopleNoDataText = '暂无户籍人口信息'
                    } else {
                        this.peopleNoDataText = '暂无重点人口信息'
                    }
                }, 500)
            })
        },
@@ -2140,6 +2180,10 @@
            }

            .police-info {
                .el-main {
                    padding: 0;
                }

                .tableClass {
                    margin: 0 auto;
                    width: 600px;

 vue.config.js

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