1
guanqb
2023-04-21 5e34acef0ba07353d7860d09bf6045fccca3ea7a
1
5 files modified
103 ■■■■ changed files
src/api/dept/index.js 8 ●●●● patch | view | raw | blame | history
src/components/map/index.vue 40 ●●●● patch | view | raw | blame | history
src/views/home/index.vue 8 ●●●● patch | view | raw | blame | history
src/views/house/index.vue 9 ●●●●● patch | view | raw | blame | history
src/views/layout/index.vue 38 ●●●● patch | view | raw | blame | history
src/api/dept/index.js
@@ -120,7 +120,7 @@
/**
 * 大搜
 * 大搜查询
 * @param {*} adcode
 * @returns
 */
@@ -149,7 +149,7 @@
        url: '/zhs/bs/search',
        // url: '/data/汇成观邸.json',
        method: 'get',
        // requestBaseUrl: 'fengtDS',
        requestBaseUrl: 'fengtDS',
        params: {
            ak,
            region,
@@ -166,8 +166,8 @@
 */
export const getSearchExtensivelyHousesdata = (ak, region, ids, infos) => {
    return request({
        // url: '/zhs/bs/search',
        url: '/data/汇成观邸-户室.json',
        url: '/zhs/bs/search',
        // url: '/data/汇成观邸-户室.json',
        // url: '/data/阳光小区独栋.json',
        method: 'get',
        requestBaseUrl: 'fengtDS',
src/components/map/index.vue
@@ -38,7 +38,6 @@
                </div>
            </el-tooltip>
            <div class="image-switch-img-btn" v-show="showImgBtn">
                <div class="layer-change-box">
                    <div class="title">
@@ -542,19 +541,20 @@
        // 重写定位方法
        const homeCenter = [117.99311892441567, 28.46938164123123]
        this.$nextTick(() => {
            console.log('dc-zoom-controller', document.querySelector('.dc-zoom-controller'))
            document.querySelector('.dc-zoom-controller').children[1].onclick =
                function () {
                    that.$EventBus.$emit('toPosition', {
                        siteJd: homeCenter[0] + 0.046,
                        siteWd: homeCenter[1] - 0.36,
                        siteGd: 36000,
                        siteHeading: -3,
                        sitePitch: -45
                    })
                }
            // console.log('dc-zoom-controller', document.querySelector('.dc-zoom-controller'))
            // if (document.querySelector('.dc-zoom-controller') == null) return
            // document.querySelector('.dc-zoom-controller').children[1].onclick =
            //     function () {
            //         that.$EventBus.$emit('toPosition', {
            //             siteJd: homeCenter[0] + 0.046,
            //             siteWd: homeCenter[1] - 0.36,
            //             siteGd: 36000,
            //             siteHeading: -3,
            //             sitePitch: -45
            //         })
            //     }
            document.querySelector('.dc-zoom-controller .refresh svg title').innerHTML = '初始化位置'
            // document.querySelector('.dc-zoom-controller .refresh svg title').innerHTML = '初始化位置'
        })
    },
@@ -826,16 +826,18 @@
        // 切换首页显示隐藏
        switchShowHomeContent () {
            this.$store.commit('SET_ISSHOWHOMECONTENT', !this.$store.state.popupParams.isShowHomeContent)
            console.log(document.querySelector('.screen-full-btn'), 1111222)
            console.log(document.querySelector('.dc-container'), 3333444)
            console.log(document.querySelector('.dc-zoom-controller'), 3333444)
            if (this.$store.state.popupParams.isShowHomeContent) {
                if (document.querySelector('.dc-container .dc-zoom-controller').classList.contains('homebottom')) return
                document.querySelector('.dc-container .dc-zoom-controller').classList.add('homebottom')
                // if (document.querySelector('.dc-container .dc-zoom-controller').classList.contains('homebottom')) return
                // document.querySelector('.dc-container .dc-zoom-controller').classList.add('homebottom')
                document.querySelector('.screen-full-btn').classList.add('homebottom')
                document.querySelector('.over-look-btn').classList.add('homebottom')
                document.querySelector('.image-switch-icon-btn').classList.add('iconbottom')
            } else {
                if (!document.querySelector('.dc-container .dc-zoom-controller').classList.contains('homebottom')) return
                document.querySelector('.dc-container .dc-zoom-controller').classList.remove('homebottom')
                // if (!document.querySelector('.dc-container .dc-zoom-controller').classList.contains('homebottom')) return
                // document.querySelector('.dc-container .dc-zoom-controller').classList.remove('homebottom')
                document.querySelector('.screen-full-btn').classList.remove('homebottom')
                document.querySelector('.over-look-btn').classList.remove('homebottom')
                document.querySelector('.image-switch-icon-btn').classList.remove('iconbottom')
@@ -1227,7 +1229,7 @@
        * @param {*} 
        */
        showThreeDimensions (positions, minHeight, maxHeight) {
            console.log('showThreeDimensions')
            console.log('showThreeDimensions--map')
            if (curPolygon != null) {
                global.viewer.scene.primitives.remove(curPolygon)
                curPolygon = null
src/views/home/index.vue
@@ -587,7 +587,7 @@
            circleLayer = new global.DC.PrimitiveLayer('circleLayer')
            global.viewer.addLayer(circleLayer)
            document.querySelector('.dc-container .dc-zoom-controller').classList.add('homebottom')
            // document.querySelector('.dc-container .dc-zoom-controller').classList.add('homebottom')
            // document.querySelector('.dc-container .dc-location-bar').classList.add('homebottom')
            document.querySelector('.screen-full-btn').classList.add('homebottom')
            document.querySelector('.over-look-btn').classList.add('homebottom')
@@ -1943,8 +1943,8 @@
        showHomeContentBtnStyle () {
            if (!this.$store.state.popupParams.isShowHomeContent) {
                this.$store.commit('SET_ISSHOWHOMECONTENT', true)
                if (document.querySelector('.dc-container .dc-zoom-controller').classList.contains('homebottom')) return
                document.querySelector('.dc-container .dc-zoom-controller').classList.add('homebottom')
                // if (document.querySelector('.dc-container .dc-zoom-controller').classList.contains('homebottom')) return
                // document.querySelector('.dc-container .dc-zoom-controller').classList.add('homebottom')
                document.querySelector('.screen-full-btn').classList.add('homebottom')
                document.querySelector('.over-look-btn').classList.add('homebottom')
                document.querySelector('.image-switch-icon-btn').classList.add('iconbottom')
@@ -2051,7 +2051,7 @@
            this.flvPlayer = null
        }
        document.querySelector('.dc-container .dc-zoom-controller').classList.remove('homebottom')
        // document.querySelector('.dc-container .dc-zoom-controller').classList.remove('homebottom')
        // document.querySelector('.dc-container .dc-location-bar').classList.remove('homebottom')
        document.querySelector('.screen-full-btn').classList.remove('homebottom')
        document.querySelector('.over-look-btn').classList.remove('homebottom')
src/views/house/index.vue
@@ -202,7 +202,6 @@
                                                @click="residentDetailsClick(value)"
                                                :class="{ on: floorChoosed == value.sname }">
                                                {{ value.sname }}室
                                                <div class="warning"></div>-->
                                            </div>
                                        </div>
                                    </div>
@@ -1154,8 +1153,12 @@
            this.choosedBuildId = item.build_id
            // 重点人口户籍人口
            this.getVillagePersonStatisticInfoByBuildId(item.build_id)
            // 楼栋单元楼层户室查询
            this.getHouses(item.build_id, "361102", aoiArr)
            // 楼栋单元楼层户室查询-大搜
            this.getUnitHousesData(
                "ebf48ecaa1fd436fa3d40c4600aa051f",
                "361100",
                item.build_id,
                "1|3")
            this.floorsType = 1
            document.querySelector(".floor-num").style.left = "0px"
            this.lastFloorShow = false
src/views/layout/index.vue
@@ -69,16 +69,16 @@
        <!-- <div class="userIcon" :class="{on: userOn == true}" @click="openUser">
                <div class="userDetail" v-if="isShowUserDetail">
                    <div class="triangle"></div>
                                                                                                <div class="userName">用户名:{{userName}}</div>
                                                                                                <div class="userBtn">
                                                                                                    <div class="edit" @click="goTOLogin">
                                                                                                        >
                                                                                                        <img src="../../../public/img/editLogin.webp" alt />
                                                                                                    </div>
                                                                                                    <div class="return" @click="goTOFllow">返回引导页</div>
                                                                                                </div>
                                                                                            </div>
                                                                                        </div>-->
                                                                                                                        <div class="userName">用户名:{{userName}}</div>
                                                                                                                        <div class="userBtn">
                                                                                                                            <div class="edit" @click="goTOLogin">
                                                                                                                                >
                                                                                                                                <img src="../../../public/img/editLogin.webp" alt />
                                                                                                                            </div>
                                                                                                                            <div class="return" @click="goTOFllow">返回引导页</div>
                                                                                                                        </div>
                                                                                                                    </div>
                                                                                                                </div>-->
        </div>
        <div class="main-container">
@@ -207,7 +207,8 @@
                this.currentUrl = newPath.path
                this.$nextTick(() => {
                    document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                    // if (document.querySelector('.dc-container .dc-zoom-controller') == null) return
                    // document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                    document.querySelector('.screen-full-btn').classList.remove('shrink-btn')
                    document.querySelector('.over-look-btn').classList.remove('shrink-btn')
                    document.querySelector('.image-switch-icon-btn').classList.remove('shrink-btn')
@@ -268,14 +269,15 @@
            if (this.$refs['target-name'].boxResize) this.$refs['target-name'].boxResize(this.show)
            if (this.show) {
                document.querySelector('.dc-container .dc-zoom-controller').classList.add('shrink-btn')
                // if (document.querySelector('.dc-container .dc-zoom-controller') == null) return
                // document.querySelector('.dc-container .dc-zoom-controller').classList.add('shrink-btn')
                document.querySelector('.screen-full-btn').classList.add('shrink-btn')
                document.querySelector('.over-look-btn').classList.add('shrink-btn')
                document.querySelector('.image-switch-icon-btn').classList.add('shrink-btn')
            } else {
                document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                // if (document.querySelector('.dc-container .dc-zoom-controller') == null) return
                // document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                document.querySelector('.screen-full-btn').classList.remove('shrink-btn')
                document.querySelector('.over-look-btn').classList.remove('shrink-btn')
                document.querySelector('.image-switch-icon-btn').classList.remove('shrink-btn')
@@ -291,15 +293,15 @@
            this.$nextTick(() => {
                if (this.show) {
                    document.querySelector('.dc-container .dc-zoom-controller').classList.add('shrink-btn')
                    // if (document.querySelector('.dc-container .dc-zoom-controller') == null) return
                    // document.querySelector('.dc-container .dc-zoom-controller').classList.add('shrink-btn')
                    document.querySelector('.screen-full-btn').classList.add('shrink-btn')
                    document.querySelector('.over-look-btn').classList.add('shrink-btn')
                    document.querySelector('.image-switch-icon-btn').classList.add('shrink-btn')
                } else {
                    document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                    // if (document.querySelector('.dc-container .dc-zoom-controller') == null) return
                    // document.querySelector('.dc-container .dc-zoom-controller').classList.remove('shrink-btn')
                    document.querySelector('.screen-full-btn').classList.remove('shrink-btn')
                    document.querySelector('.over-look-btn').classList.remove('shrink-btn')
                    document.querySelector('.image-switch-icon-btn').classList.remove('shrink-btn')