guanqb
2023-03-21 f53d8617a2e0c3403cc0f60c667969b4363253c9
Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
2 files modified
95 ■■■■ changed files
src/components/map/index.vue 4 ●●●● patch | view | raw | blame | history
src/views/house/index.vue 91 ●●●● patch | view | raw | blame | history
src/components/map/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 17:00:30
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-18 09:19:55
 * @LastEditTime: 2023-03-21 09:53:10
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 公用地图组件
 * 
@@ -580,7 +580,7 @@
                this.removeMxTileset(`sdTilesetLayer${item}`, this.housingIndent)
            })
            this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
            // this.addMxTileset('sdTilesetLayer', `${tile3DUrl}/sf3d/361102/model/wanda/tileset.json`, this.housingIndent)
            if (this.tilesetLayerType == type) {
                this.tilesetLayerType = ''
src/views/house/index.vue
@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2023-03-17 10:07:45
 * @LastEditTime: 2023-03-21 10:02:22
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -27,24 +27,25 @@
                <el-input ref="searchTreeInput" v-model="searchTreeName" @input="searchInputTree"
                    @focus="searchTreeShowFlag = true" @blur="searchTreeShowFlag = false" v-popover:popover
                    placeholder="请输入搜索条件" style="cursor: pointer;"></el-input>
            </div>
                placeholder="请输入搜索条件" style="cursor: pointer;"></el-input>
        </div>
            <div v-show="contentShow" class="result-content" ref="resultContentBox">
                <div class="housing-estate-info" ref="housingEstateInfoBox">
                    <div class="housing-title">
                        {{ villageInfo.name }}
        <div v-show="contentShow" class="result-content" ref="resultContentBox">
            <div class="housing-estate-info" ref="housingEstateInfoBox">
                <div class="housing-title">
                    {{ villageInfo.name }}
                        <div class="progress"></div>
                    </div>
                    <div class="housing-bg">
                        <div class="block">
                            <el-carousel height="150px">
                                <el-carousel-item v-for="(item, index) in villageInfo.pic_url_list" :key="index">
                                    <el-image style=" height: 100%" :src="item"
                                        :preview-src-list="villageInfo.pic_url_list"></el-image>
                                </el-carousel-item>
                            </el-carousel>
                        </div>
                        <!-- <div class="block">
                                                    <el-carousel height="150px">
                                                        <el-carousel-item v-for="(item, index) in villageInfo.pic_url_list" :key="index">
                                                            <el-image style=" height: 100%" :src="item"
                                                                :preview-src-list="villageInfo.pic_url_list"></el-image>
                                                        </el-carousel-item>
                                                    </el-carousel>
                                                </div> -->
                        <el-empty image-size="120" description="暂无图片"></el-empty>
                    </div>
                    <div class="housing-introduce">
                        <div>
@@ -140,9 +141,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>
@@ -164,17 +165,17 @@
                                <div>
                                    <div>120</div>
                                    <div>出租</div>
                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                        <div>
                                                                                                                                                                                                                                                            <div>160</div>
                                                                                                                                                                                                                                                            <div>自住</div>
                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                        <div>
                                                                                                                                                                                                                                                            <div>8</div>
                                                                                                                                                                                                                                                            <div>空置</div>
                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                                                </div>-->
                                                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                                                        <div>
                                                                                                                                                                                                                                                                                            <div>160</div>
                                                                                                                                                                                                                                                                                            <div>自住</div>
                                                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                                                        <div>
                                                                                                                                                                                                                                                                                            <div>8</div>
                                                                                                                                                                                                                                                                                            <div>空置</div>
                                                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                                                    </div>
                                                                                                                                                                                                                                                                                </div>-->
                        <div class="house-element-info" v-if="isShowHouseBox">
                        <!-- 选择单元 -->
                        <div class="condo" v-show="isShowUnitChoose">
@@ -219,17 +220,17 @@
                                    <div>
                                        <span class="zizhu"></span>
                                        自住
                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                <span class="kongzhi"></span>
                                                                                                                                                                                                                                                                空置
                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                <span class="shangye"></span>
                                                                                                                                                                                                                                                                商业
                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                        </div>
                                                                                                                                                                                                                                                    </div>-->
                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                <span class="kongzhi"></span>
                                                                                                                                                                                                                                                                                                空置
                                                                                                                                                                                                                                                                                            </div>
                                                                                                                                                                                                                                                                                            <div>
                                                                                                                                                                                                                                                                                                <span class="shangye"></span>
                                                                                                                                                                                                                                                                                                商业
                                                                                                                                                                                                                                                                                            </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">
@@ -266,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>
@@ -1607,6 +1608,12 @@
                .housing-bg {
                    margin-top: 6px;
                    height: 200px;
                    :deep(.el-empty__description) {
                        p {
                            color: #fff;
                        }
                    }
                }
                .housing-introduce {