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

shuishen

2023-02-04 17806a386297ccd32850e82b6e601e08e54d935c

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

 src/api/dept/index.js

@@ -196,6 +196,17 @@
    })
}

// 派出所默认展示小区
export const getPoliceSationVillageInfo = (deptId) => {
    return request({
        url: `/api/villageInfo/villageInfo/details`,
        method: 'get',
        params: {
            deptId
        }
    })
}

// 户籍人口、重点人口信息
export const getVillagePersonStatisticInfoByBuildId = (buildId) => {
    return request({

 src/views/house/index.vue

@@ -246,7 +246,7 @@
                                </div>
                            </div>
                        </div>-->
                        <div class="house-element-info">
                        <div class="house-element-info" v-if="isShowHouseBox">
                            <!-- 选择单元 -->
                            <div class="condo">
                                <div class="type">选择单元</div>
@@ -316,6 +316,7 @@
                                element-loading-background="rgba(17, 38, 163, 0.1)"
                                element-loading-text="数据正在加载中"
                                element-loading-spinner="el-icon-loading"
                                v-show="isShowHouseBox"
                            >
                                <div class="floor-outBox">
                                    <div
@@ -661,7 +662,7 @@
    getSearchExtensively, getHouses, getSearchExtensivelyBgAoiDeepdata,
    getPoliceStationLazyTree, getPoliceStationTrees, getVillageInfo,
    getVillagePersonStatisticInfoByBuildId, getVillagePersonInfo,
    getResidentialQuartersInfo, getAoiByBgId
    getResidentialQuartersInfo, getAoiByBgId, getPoliceSationVillageInfo
} from '@/api/dept/index.js'
import { getAlarmList } from "@/api/home/index.js"

@@ -763,10 +764,13 @@
            peopleName: '',
            callPhone: '',
            pictLoading: false,
            isShowHouseBox: true,
        }
    },

    created () {



        // 首页跳转社区包含参数
        if (this.$route.query.id) {
@@ -778,11 +782,21 @@
            // 使用首页传过来的小区id获取停车场出入口商场和 小区名称类型地址数据
            this.getSearchExtensivelyBgAoiDeepdata('ebf48ecaa1fd436fa3d40c4600aa051f', '361100', this.$route.query.id, '1|3')
        } else {
            //直接进入社区 默认获取万达广场的责任民警及所属辖区
            this.getVillageInfo('644A2C4049024A3C8C76D96EEE4366FD')
            // 大搜之搜索面详细数据（停车场出入口商场）--默认万达华府
            this.getSearchExtensivelyBgAoiDeepdata('ebf48ecaa1fd436fa3d40c4600aa051f', '361100', '644A2C4049024A3C8C76D96EEE4366FD', '1|3')
            this.getResidentialQuartersInfo('6E513C5E5D1611EAB6183C15FB00027B', '361102')
            console.log(this.userInfo.dept_id, 56789)
            // 获得对应派出所默认展示小区
            getPoliceSationVillageInfo(this.userInfo.dept_id).then(res => {
                let villageId = res.data.data.aoiId
                console.log(9999999, villageId)
                //直接进入社区 默认获取万达广场的责任民警及所属辖区
                // this.getVillageInfo('644A2C4049024A3C8C76D96EEE4366FD')
                this.getVillageInfo(villageId)
                // 大搜之搜索面详细数据（停车场出入口商场）--默认万达华府
                // this.getSearchExtensivelyBgAoiDeepdata('ebf48ecaa1fd436fa3d40c4600aa051f', '361100', '644A2C4049024A3C8C76D96EEE4366FD', '1|3')
                this.getSearchExtensivelyBgAoiDeepdata('ebf48ecaa1fd436fa3d40c4600aa051f', '361100', villageId, '1|3')
                // this.getResidentialQuartersInfo('6E513C5E5D1611EAB6183C15FB00027B', '361102')
                this.getResidentialQuartersInfo(villageId, '361102')
            })

        }

        window.addEventListener('resize', this.setTableHeight)
@@ -966,27 +980,34 @@
        // 楼栋单元楼层户室查询
        getHouses (build_id, adcode) {
            getHouses(build_id, adcode).then(res => {
                let unitData = res.data.data.unit[this.unitValue - 1].house
                this.floorInfo.house_num = unitData.length
                let houseFloorList = []
                unitData.forEach(item => {
                    if (houseFloorList.indexOf(Number(item.floor_num)) === -1) {
                        houseFloorList.push(Number(item.floor_num))
                    }
                })
                houseFloorList = houseFloorList.sort((a, b) => {
                    return a - b
                })
                let newArr = []
                houseFloorList.forEach(floor => {
                    let houseArr = unitData.filter(item => {
                        return Number(item.floor_num) == floor
                console.log(3333, res.data.data, res.data.data == null)
                if (res.data.data != null) {
                    let unitData = res.data.data.unit[this.unitValue - 1].house
                    this.floorInfo.house_num = unitData.length
                    let houseFloorList = []
                    unitData.forEach(item => {
                        if (houseFloorList.indexOf(Number(item.floor_num)) === -1) {
                            houseFloorList.push(Number(item.floor_num))
                        }
                    })
                    newArr.push({ floor_num: floor, floor_house: houseArr })
                })
                this.unitHouseChoosed = newArr
                this.pictLoading = false
                console.log('unitHouseChoosed', this.unitHouseChoosed)
                    houseFloorList = houseFloorList.sort((a, b) => {
                        return a - b
                    })
                    let newArr = []
                    houseFloorList.forEach(floor => {
                        let houseArr = unitData.filter(item => {
                            return Number(item.floor_num) == floor
                        })
                        newArr.push({ floor_num: floor, floor_house: houseArr.slice(0, 4) })
                    })
                    this.unitHouseChoosed = newArr
                    this.pictLoading = false
                    console.log('unitHouseChoosed', this.unitHouseChoosed)
                } else {
                    this.isShowHouseBox = false
                    console.log('noHouseData')
                }

            })
        },


 src/views/video/list.vue

@@ -13,7 +13,7 @@
    <div class="list container">
        <div v-show="boxShow" class="container-content">
            <div class="search-box">
                设备名称：
                点位名称：
                <input
                    v-model="searchValue"
                    @input="searchChange"
@@ -57,13 +57,13 @@
                            <el-table-column
                                :show-overflow-tooltip="true"
                                prop="name"
                                label="设备名称"
                                label="点位名称"
                                min-width="35%"
                            ></el-table-column>
                            <el-table-column
                                :show-overflow-tooltip="true"
                                prop="pTZTypeText"
                                label="设备类型"
                                label="点位类型"
                                min-width="35%"
                            ></el-table-column>
                            <el-table-column