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

shuishen

2022-02-15 9f1a8ac7b6743de4a222ebda9bb914c3624810d8

 src/components/map/components/campusBuildingSearch.vue

@@ -1,41 +1,37 @@
<template>
    <div>
        <div class="map-campus-search"
             id="CampusSearchPanel">
            <el-input class="search-input"
                      placeholder="社区搜索…"
                      v-model="searchInput"
                      @input="searchValueChange"
                      @focus="shortcutFlag = true">
            </el-input>
        <div class="map-campus-search" id="CampusSearchPanel">
            <el-input
                class="search-input"
                placeholder="社区搜索…"
                v-model="searchInput"
                @input="searchValueChange"
                @focus="shortcutFlag = true"
            ></el-input>
            <el-button-group>
                <el-button @click="navigationShow"
                           class="deblurring"
                           icon="el-icon-my-path"></el-button>
                <el-button @click="fuzzyQuery"
                           class="deblurring"
                           type="primary"
                           icon="el-icon-my-search"></el-button>
                <el-button @click="navigationShow" class="deblurring" icon="el-icon-my-path"></el-button>
                <el-button
                    @click="fuzzyQuery"
                    class="deblurring"
                    type="primary"
                    icon="el-icon-my-search"
                ></el-button>
            </el-button-group>
            <div v-show="searchValShow"
                 class="search-value-box">
            <div v-show="searchValShow" class="search-value-box">
                <ul>
                    <li v-for="(item, index) in searchValList"
                    <li
                        v-for="(item, index) in searchValList"
                        :key="index"
                        @click="loadPopup(item)">
                        {{item.mechanismname}}
                    </li>
                        @click="loadPopup(item)"
                    >{{item.mechanismname}}</li>
                </ul>
            </div>
            <div class="map-campus-shortcut"
                 v-show="shortcutFlag">
            <div class="map-campus-shortcut" v-show="shortcutFlag">
                <div class="shortcut-box">
                    <ul>
                        <li v-for="(item, index) in shortcutList"
                            :key="index">
                        <li v-for="(item, index) in shortcutList" :key="index">
                            <el-button @click="openModelPopup(item)">
                                <img :src="item.bgimg"
                                     alt="">
                                <img :src="item.bgimg" alt />
                                <span>{{item.title}}</span>
                            </el-button>
                        </li>
@@ -59,13 +55,13 @@
        return {
            DC: null,
            shortcutList: [
                // {
                //     bgimg: '/img/search/org.png',
                //     title: '党群机构',
                //     type: 'orgnav',
                //     path: '/pcLayout/default/orgnav/masses',
                //     code: 1
                // },
                {
                    bgimg: '/img/search/org.png',
                    title: '其他机构',
                    type: 'orgnav',
                    path: '/pcLayout/default/orgnav/rest',
                    code: 5
                },
                // {
                //     bgimg: '/img/search/ofc.png',
                //     title: '职能部处',
@@ -86,6 +82,13 @@
                    type: 'arc',
                    path: '/pcLayout/default/arc/venue',
                    code: 3
                },
                {
                    bgimg: '/img/search/floor.png',
                    title: '主要场馆',
                    type: 'arc',
                    path: '/pcLayout/default/arc/rest',
                    code: 7
                }
                // {
                //     bgimg: '/img/search/dorm.png',
@@ -163,30 +166,10 @@

        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) {
                    this.$store.dispatch('delVisitedViews', this.$route)
                    this.$router.push('/pcLayout/default')
                    this.$store.commit('SET_ARCNAVBARTITLE', '')
                    this.$store.commit('SET_ARCNAVBARCODE', '')
                    this.$store.commit('SET_ARCNAVBARFLAG', false)
                }

                if (this.arcNavBarFlag == true) {
                    this.$store.commit('SET_ARCNAVBARTITLE', '')
                    this.$store.commit('SET_ARCNAVBARCODE', '')
                    this.$store.commit('SET_ARCNAVBARFLAG', false)
                }

                this.$store.commit('SET_ORGNAVBARTITLE', param.title)
                this.$store.commit('SET_ORGNAVBARLIST', [])

                this.$store.commit('SET_ORGNAVBARFLAG', true)

                getList({ type: param.code }).then(res => {
@@ -212,24 +195,12 @@
                    this.$store.commit('SET_ORGNAVBARLIST', list)
                })
            } else if (param.type == 'arc') {
                if (this.$route.path.indexOf('/orgnav') != -1) {
                    this.$store.dispatch('delVisitedViews', this.$route)
                    this.$router.push('/pcLayout/default')
                    this.$store.commit('SET_ORGNAVBARTITLE', '')
                    this.$store.commit('SET_ORGNAVBARLIST', [])
                    this.$store.commit('SET_ORGNAVBARFLAG', false)
                }

                if (this.orgNavBarFlag == true) {
                    this.$store.commit('SET_ORGNAVBARTITLE', '')
                    this.$store.commit('SET_ORGNAVBARLIST', [])
                    this.$store.commit('SET_ORGNAVBARFLAG', false)
                }

                this.$store.commit('SET_ARCNAVBARTITLE', param.title)
                this.$store.commit('SET_ARCNAVBARCODE', param.code)
                this.$store.commit('SET_ARCNAVBARFLAG', true)
            }

            this.$router.push(param.path)
        },

        shortcutShow (event) {