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

shuishen

2022-01-12 acb45c731c3ccd0a67061efb4e7bdf4f56005672

 src/components/map/components/campusBuildingSearch.vue

@@ -3,7 +3,7 @@
        <div class="map-campus-search"
             id="CampusSearchPanel">
            <el-input class="search-input"
                      placeholder="校园搜索…"
                      placeholder="社区搜索…"
                      v-model="searchInput"
                      @input="searchValueChange"
                      @focus="shortcutFlag = true">
@@ -62,36 +62,42 @@
                    bgimg: '/img/search/org.png',
                    title: '党群机构',
                    type: 'orgnav',
                    path: '/pcLayout/default/orgnav/masses',
                    code: 1
                },
                {
                    bgimg: '/img/search/ofc.png',
                    title: '职能部处',
                    type: 'orgnav',
                    path: '/pcLayout/default/orgnav/ofc',
                    code: 2
                },
                {
                    bgimg: '/img/search/teach.png',
                    title: '教学科研',
                    type: 'orgnav',
                    code: 4
                    type: 'arc',
                    path: '/pcLayout/default/arc/teaching',
                    code: 2
                },
                {
                    bgimg: '/img/search/venue.png',
                    title: '校内场馆',
                    title: '社区场馆',
                    type: 'arc',
                    path: '/pcLayout/default/arc/venue',
                    code: 3
                },
                {
                    bgimg: '/img/search/dorm.png',
                    title: '学生宿舍',
                    title: '社区宿舍',
                    type: 'arc',
                    path: '/pcLayout/default/arc/dorm',
                    code: 4
                },
                {
                    bgimg: '/img/search/scenery.png',
                    title: '文化风景',
                    type: 'arc',
                    path: '/pcLayout/default/arc/culture',
                    code: 5
                }
            ],
@@ -104,7 +110,7 @@
    computed: {
        ...mapGetters([
            'viewer',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag',
            'orgNavBarFlag',
            'arcNavBarFlag'
@@ -136,6 +142,11 @@

        openModelPopup (param) {
            var list = []
            if (this.$route.path.indexOf('/service') != -1) {
                this.$store.dispatch('delVisitedViews', this.$route)
                this.$router.push('/pcLayout/default')
            }

            if (param.type == 'orgnav') {
                var path = this.$route.path
                if (path.indexOf('/arc') != -1) {
@@ -172,7 +183,8 @@
                            QRImg: item.codeurl,
                            address: item.address,
                            telephone: item.telephone,
                            introduce: item.introduce
                            introduce: item.introduce,
                            videourl: item.videourl
                        })
                    })

@@ -234,7 +246,7 @@
            if (result.panoramaurl != '') {
                this.$store.commit('SET_PANORAMAURL', result.panoramaurl)
            }
            if (result.videourl != '') {
            if (result.videourl && result.videourl != '') {
                this.$store.commit('SET_MONITORURL', result.videourl)
            }
            this.$store.commit('SET_POPUPIMGATLAS', imgArr)
@@ -261,7 +273,7 @@
        },

        newPopup (item) {
            const position = this.DC.Transform.transformWGS84ToCartesian(new this.DC.Position(Number(item.jd), Number(item.wd), Number(item.gd), Number(item.heading), Number(item.pitch), Number(item.roll)))
            const position = this.DC.Transform.transformWGS84ToCartesian(new this.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, {
                domId: 'divFormsDomBox',