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

shuishen

2023-04-27 ac80f107e232a40aaca1b79f2a331dc9417452a4

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

 src/views/house/index.vue

@@ -128,7 +128,7 @@
                            <div class="content">
                                <div>
                                    <div>电梯</div>
                                    <div style="color:#72fff8x">{{ floorInfo.elev == 1 ? '有' : '无' }}</div>
                                    <div style="color:#72fff8x">{{ floorInfo.elev }}</div>
                                </div>
                                <div v-if="isShowFloorCount">
                                    <div>楼层总数</div>
@@ -168,13 +168,13 @@
                            </div>
                            <el-main v-loading="pictLoading" element-loading-background="rgba(0, 0, 0, 0.5)"
                                element-loading-text="数据正在加载中" element-loading-spinner="el-icon-loading"
                                style="overflow:hidden;padding:0px;">
                                style="overflow:hidden;padding:0px;height: 240px;">
                                <div class="floor-outBox">
                                    <div @click="lastFloorBtn" class="floorBtn" v-show="lastFloorShow">
                                        <i class="el-icon-caret-left"></i>
                                    </div>
                                    <div class="floor-box">
                                        <div class="floor-num" style="left: 0">
                                        <div class="floor-num" style="left: 0;">
                                            <div :class="{ on: floorsType == index }" @click="floorsType = index"
                                                v-for="index in Math.ceil(unitChoosedArr.length / 5)" :key="index">
                                                {{ unitChoosedArr[index * 5 - 5].sname }}{{ unitChoosedArr[index * 5
@@ -993,7 +993,7 @@
                            })
                        })
                        this.unitChoosedArr = this.unitAllArr.children_infos[0].children_infos
                        this.floorInfo.elev = this.unitAllArr.children_infos[0].elev
                        this.floorInfo.elev = this.unitAllArr.children_infos[0].elev == 1 ? '有' : '无'
                        // this.floorInfo.floor_num = this.unitAllArr.children_infos[0].children_infos.length
                        this.isShowFloorCount = false
                        this.getVillagePersonStatisticInfoByBuildId(this.unitAllArr.uid)
@@ -1193,8 +1193,12 @@
                })
            }
            this.buildingChoosed = item
            this.floorInfo.elev = item.elev
            this.floorInfo.floor_num = item.floor_num
            this.floorInfo.elev = ''
            this.floorInfo.floor_num = ''
            setTimeout(() => {
                this.floorInfo.elev = item.elev == 1 ? '有' : '无'
                this.floorInfo.floor_num = item.floor_num
            }, 200)
            this.isShowFloorCount = true
            // 获取户籍人口重点人口数据
            this.choosedBuildId = item.build_id