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

shuishen

2022-01-20 3ea790ec7b0280a55cc406d2c3dc9fa5411a7471

 src/components/map/components/campusBuildingSearch.vue

@@ -233,8 +233,6 @@
            var result = param.list

            var imgArr = result.tpurl.split(',')
            var tabOne = param.jx.split(',')
            var tabTwo = param.sh.split(',')

            this.$store.commit('SET_POPUPBGURL', imgArr[0])
            this.$store.commit('SET_POPUPQRURL', result.codeurl)
@@ -250,13 +248,15 @@
                this.$store.commit('SET_MONITORURL', result.videourl)
            }
            this.$store.commit('SET_POPUPIMGATLAS', imgArr)
            if (param.jx != '') {
            if (param.jx != undefined && param.jx != '') {
                var tabOne = param.jx.split(',')
                this.$store.commit('SET_TEACHLIST', tabOne)
            } else {
                this.$store.commit('SET_TEACHLIST', [])
            }

            if (param.sh != '') {
            if (param.sh != undefined && param.sh != '') {
                var tabTwo = param.sh.split(',')
                this.$store.commit('SET_LIVELIST', tabTwo)
            } else {
                this.$store.commit('SET_LIVELIST', [])
@@ -393,7 +393,7 @@
                display: flex;
                width: 100%;
                height: 120px;
                justify-content: start;
                justify-content: flex-start;
                flex-wrap: wrap;

                li {