Merge branch 'master' of http://192.168.0.105:10010/r/school-web

shuishen

2022-03-18 bf58722dfd03ea1513f3acc7331d4d4403fca76e

 src/components/map/components/campusBuildingSearch.vue

@@ -52,7 +52,6 @@
    name: 'campusBuildingSearch',
    data () {
        return {
            DC: null,
            shortcutList: [
                {
                    bgimg: '/img/search/org.png',
@@ -113,7 +112,6 @@
    },
    computed: {
        ...mapGetters([
            'viewer',
            // 校区内导航的显示关闭
            'campusNavFlag',
            'orgNavBarFlag',
@@ -121,7 +119,6 @@
        ])
    },
    created () {
        this.DC = global.DC
    },
    methods: {
        searchValueChange () {
@@ -264,8 +261,8 @@
            }

            this.newPopup(param)
            this.viewer.flyToPosition(
                new this.DC.Position(
            global.viewer.flyToPosition(
                new global.DC.Position(
                    Number(param.jd),
                    Number(param.wd),
                    300,
@@ -279,11 +276,11 @@
        },

        newPopup (item) {
            const position = this.DC.Transform.transformWGS84ToCartesian(
                new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
            const position = global.DC.Transform.transformWGS84ToCartesian(
                new global.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd))
            )
            // eslint-disable-next-line no-unused-vars
            var popup = new this.DC.DivForms(this.viewer, {
            var popup = new global.DC.DivForms(global.viewer, {
                domId: 'divFormsDomBox',
                position: [position]
            })
@@ -386,7 +383,7 @@
    }

    .map-campus-shortcut {
        margin-top: 20px;
        margin-top: 40px;
        width: 100%;
        // height: 330px;
        height: auto;
@@ -394,19 +391,18 @@
        border-radius: 5px;

        .shortcut-box {
            padding-top: 36px;
            height: auto;
            ul {
                display: flex;
                width: 100%;
                height: auto;
                justify-content: flex-start;
                // justify-content: space-around;
                flex-wrap: wrap;

                li {
                    margin: 0 13px;
                    width: 84px;
                    height: 76px;
                    margin: 22.5px 0 0 22.5px;
                    width: 80px;
                    height: 70px;

                    .el-button {
                        width: 80px;
@@ -440,6 +436,10 @@
                        border: 1px solid #000;
                    }
                }

                li:last-child {
                    margin-bottom: 22.5px;
                }
            }
        }
    }