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

shuishen

2023-09-07 208442c68ddadc7be33178ff190b97f8c409b703

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

 src/styles/base/index.scss

@@ -332,7 +332,7 @@
    .el-dialog {
        display: flex;
        flex-direction: column;
        width: 1000px;
        width: 1100px;
        height: 560px;

        .el-table__header-wrapper {

 src/styles/media/index.scss

@@ -2169,7 +2169,7 @@

                    .keyPerson-details-box-two {
                        .el-dialog {
                            width: countSizeVw(1000, 1920);
                            width: countSizeVw(1100, 1920);
                            height: countSizeVh(560);
                        }


 src/views/house/index.vue

@@ -621,7 +621,7 @@
                        <template slot-scope="scope">{{ scope.row.isNonage == 1 ? '是' : '否' }}</template>
                    </el-table-column>
                    <el-table-column label="户室">
                        <template slot-scope="scope">{{ scope.row.address.split(villageInfo.name)[1] }}</template>
                        <template slot-scope="scope">{{ scope.row.reAddress.split(villageInfo.name)[1] }}</template>
                    </el-table-column>
                    <el-table-column prop="phone" label="电话"></el-table-column>
                    <el-table-column prop="policeStationName" label="所属派出所"></el-table-column>
@@ -1710,6 +1710,7 @@
            }, 200)
            this.isShowFloorCount = true
            // 获取户籍人口重点人口数据
            console.log(item, 'item-------------')
            this.choosedBuildUid = item.build_uid
            this.choosedBuildStdId = item.build_std_addr_id
            // 重点人口户籍人口
@@ -1894,15 +1895,17 @@
            this.keyPersonVisible = true
            this.keyPeopleType = status
            this.peoplePage.currentPage = 1
            this.keyPersonTitle = status == 1 ? "户籍人口详情" : status == 2 ? "实有人口详情" : "重点人口详情"
            this.keyPersonTitle = status == 1 ? "户籍人口详情" : status == 2 ? "实有人口详情" : status == 3 ? "重点人口详情" : "未成年人口详情"
            this.peopleNoDataText = ' '
            this.keyPeopleLoading = true
            this.personDetailArr = []
            

            this.getVillagePersonInfo(
                "",
                this.choosedBuildUid,
                {type: status}
                // this.choosedBuildUid,//之前无法获取人口数据
                this.choosedBuildStdId,
                { type: status },
                this.peoplePage.currentPage,
            )
        },

@@ -2112,16 +2115,10 @@
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = currentPage
            this.personDetailArr = []
            let typeObj = {}
            if (this.keyPeopleType == 1 || this.keyPeopleType == 2) {
                typeObj = { peopletype: this.keyPeopleType }
            } else {
                typeObj = { status: 2 }
            }
            this.getVillagePersonInfo(
                "",
                this.choosedBuildUid,
                typeObj,
                this.choosedBuildStdId,
                { type: this.keyPeopleType },
                currentPage
            )
        },
@@ -2214,9 +2211,12 @@
                                this.peopleNoDataText = '暂无户籍人口信息'
                            } else if (this.keyPeopleType == 2) {
                                this.peopleNoDataText = '暂无实有人口信息'
                            } else {
                            } else if (this.keyPeopleType == 3) {
                                this.peopleNoDataText = '暂无重点人口信息'
                                // 户室为楼栋情况
                            } else if (this.keyPeopleType == 4) {
                                this.peopleNoDataText = '暂无未成年人口信息'
                            } else {
                                this.residentNoDataText = '暂无户室信息'
                            }
                        }
@@ -2241,8 +2241,13 @@
                        this.peopleNoDataText = '暂无户籍人口信息'
                    } else if (this.keyPeopleType == 2) {
                        this.peopleNoDataText = '暂无实有人口信息'
                    } else {
                    } else if (this.keyPeopleType == 3) {
                        this.peopleNoDataText = '暂无重点人口信息'
                        // 户室为楼栋情况
                    } else if (this.keyPeopleType == 4) {
                        this.peopleNoDataText = '暂无未成年人口信息'
                    } else {
                        this.residentNoDataText = '暂无户室信息'
                    }
                }, 500)
            })
@@ -2255,16 +2260,10 @@
            this.peopleName = ""
            this.peoplePage.currentPage = 1
            this.personDetailArr = []
            let typeObj = {}
            if (this.keyPeopleType == 1 || this.keyPeopleType == 2) {
                typeObj = { peopletype: this.keyPeopleType }
            } else {
                typeObj = { status: 2 }
            }
            this.getVillagePersonInfo(
                "",
                this.choosedBuildUid,
                typeObj,
                this.choosedBuildStdId,
                { type: this.keyPeopleType },
                this.peoplePage.currentPage
            )
        },
@@ -2274,16 +2273,10 @@
            this.keyPeopleLoading = true
            this.peoplePage.currentPage = 1
            this.personDetailArr = []
            let typeObj = {}
            if (this.keyPeopleType == 1 || this.keyPeopleType == 2) {
                typeObj = { peopletype: this.keyPeopleType }
            } else {
                typeObj = { status: 2 }
            }
            this.getVillagePersonInfo(
                "",
                this.choosedBuildUid,
                typeObj,
                this.choosedBuildStdId,
                { type: this.keyPeopleType },
                this.peoplePage.currentPage,
                this.peopleName,
                this.callPhone