shuishen
2022-01-05 953ee74ba5de853d8f6d390c2a8919cbadff4d28
部分修改
38 files modified
134 ■■■■ changed files
public/index.html 2 ●●● patch | view | raw | blame | history
src/components/campusNav/index.vue 2 ●●● patch | view | raw | blame | history
src/components/map/components/campusBuildingSearch.vue 6 ●●●● patch | view | raw | blame | history
src/components/map/components/dimension copy.vue 2 ●●● patch | view | raw | blame | history
src/components/map/components/dimension.vue 2 ●●● patch | view | raw | blame | history
src/components/map/components/mapPopup.vue 2 ●●● patch | view | raw | blame | history
src/components/map/index.vue 4 ●●●● patch | view | raw | blame | history
src/components/mobilePopupOur/index.vue 12 ●●●● patch | view | raw | blame | history
src/components/mobilePopupOurAfter/index.vue 10 ●●●● patch | view | raw | blame | history
src/components/mobilePopupOurOnce/index.vue 6 ●●●● patch | view | raw | blame | history
src/components/mobilemap/index.vue 2 ●●● patch | view | raw | blame | history
src/pcLayout/index.vue 14 ●●●● patch | view | raw | blame | history
src/pcviews/arc/culture.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/arc/dorm.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/arc/edifact.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/arc/family.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/arc/rest.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/arc/teaching.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/arc/venue.vue 6 ●●●● patch | view | raw | blame | history
src/pcviews/campusnav/index.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/orgnav/directly.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/orgnav/masses.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/orgnav/ofc.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/orgnav/rest.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/orgnav/teaching.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/aed.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/alleyway.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/bank.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/canteen.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/copy.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/express.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/medical.vue 6 ●●●● patch | view | raw | blame | history
src/pcviews/service/park.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/service.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/showers.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/supermarket.vue 2 ●●● patch | view | raw | blame | history
src/pcviews/service/transfer.vue 2 ●●● patch | view | raw | blame | history
src/router/page/index.js 12 ●●●● patch | view | raw | blame | history
public/index.html
@@ -6,7 +6,7 @@
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width,initial-scale=1.0">
  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
  <title>智慧校园大数据三维可视化平台</title>
  <title>智慧社区大数据三维可视化平台</title>
  <script src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
  <!-- 高德定位 -->
  <script type="text/javascript"
src/components/campusNav/index.vue
@@ -9,7 +9,7 @@
                     src="/img/icon/xndh.png"
                     alt="">
                <span>
                    校内导航
                    社区内导航
                </span>
            </div>
            <img class="close"
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">
@@ -81,7 +81,7 @@
                },
                {
                    bgimg: '/img/search/venue.png',
                    title: '校内场馆',
                    title: '社区场馆',
                    type: 'arc',
                    path: '/pcLayout/default/arc/venue',
                    code: 3
@@ -110,7 +110,7 @@
    computed: {
        ...mapGetters([
            'viewer',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag',
            'orgNavBarFlag',
            'arcNavBarFlag'
src/components/map/components/dimension copy.vue
@@ -66,7 +66,7 @@
    computed: {
        ...mapGetters([
            'viewer',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag',
            'orgNavBarFlag',
            'arcNavBarFlag'
src/components/map/components/dimension.vue
@@ -66,7 +66,7 @@
    computed: {
        ...mapGetters([
            'viewer',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag',
            'orgNavBarFlag',
            'arcNavBarFlag'
src/components/map/components/mapPopup.vue
@@ -263,7 +263,7 @@
            'teachList',
            // 科研
            'liveList',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag'
        ])
    },
src/components/map/index.vue
@@ -17,7 +17,7 @@
            background: #2196f3ed;
            z-index: 11;
        ">
            智慧校园
            智慧社区
        </div>
        <dimension />
@@ -78,7 +78,7 @@
            'detailsPopup',
            // 全景弹框显示关闭
            'panoramaPopup',
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'campusNavFlag',
            'orgNavBarFlag',
            'arcNavBarFlag'
src/components/mobilePopupOur/index.vue
@@ -113,7 +113,7 @@
      this.getListSearchMethod(this.mBigPopup.value);
      return;
    }
    this.choiceMain = this.popupOurOpenData.qurey; // 进入的主题:列:机构单位,校园建筑
    this.choiceMain = this.popupOurOpenData.qurey; // 进入的主题:列:机构单位,社区建筑
    this.choiceData = this.popupOurOpenData.main; //带入数据  包括name、type、method
    this.choiceValue = this.popupOurOpenData.main[0].name;
@@ -192,10 +192,10 @@
        const data = res.data.data;
        let outList = [];
        if (
          this.mBigPopup.name == "校园建筑" ||
          this.mBigPopup.name == "社区建筑" ||
          this.mBigPopup.name == "文化风景"
        ) {
          // 校园建筑使用该id获取具体信息
          // 社区建筑使用该id获取具体信息
          data.forEach((item) => {
            let icon = item.tpurl.split(",");
            outList.push({
@@ -206,7 +206,7 @@
              from: this.choiceMain,
              video: item.videourl,
              buts:
                this.mBigPopup.name == "校园建筑" ||
                this.mBigPopup.name == "社区建筑" ||
                this.mBigPopup.name == "文化风景"
                  ? ["定位", "实景", "图集"]
                  : ["定位"],
@@ -234,7 +234,7 @@
              introduce: item.introduce,
              video: item.videourl,
              buts:
                that.mBigPopup.name == "校园建筑" ||
                that.mBigPopup.name == "社区建筑" ||
                that.mBigPopup.name == "文化风景"
                  ? ["定位", "实景", "图集"]
                  : ["定位"],
@@ -284,7 +284,7 @@
            introduce: item.list.introduce,
            video: item.list.videourl,
            buts:
              that.mBigPopup.name == "校园建筑" ||
              that.mBigPopup.name == "社区建筑" ||
              that.mBigPopup.name == "文化风景"
                ? ["定位", "实景", "图集"]
                : ["定位"],
src/components/mobilePopupOurAfter/index.vue
@@ -33,7 +33,7 @@
<script>
import { getList } from "@/api/mobile/orgnav/index"; //机构单位
import { getChildNavList } from "@/api/mobile/public/arc"; //校园建筑
import { getChildNavList } from "@/api/mobile/public/arc"; //社区建筑
import {
  // getListlivingFacilitiesr,
  // getListsupermarket,
@@ -61,7 +61,7 @@
          opendata: "openData1",
        },
        {
          name: "校园建筑",
          name: "社区建筑",
          opendata: "openData2",
          icon: "el-icon-s-management",
        },
@@ -98,7 +98,7 @@
      openData2: [
        { name: "行政办公", type: 1, method: getChildNavList },
        { name: "教学科研", type: 2, method: getChildNavList },
        { name: "校内场馆", type: 3, method: getChildNavList },
        { name: "社区场馆", type: 3, method: getChildNavList },
        { name: "宿舍公寓", type: 4, method: getChildNavList },
        { name: "文化风景", type: 5, method: getChildNavList },
        { name: "家属住宅", type: 6, method: getChildNavList },
@@ -107,7 +107,7 @@
      // openData3: [
      //   { name: "食堂餐厅", type: 1, method: getListlivingFacilitiesr },
      //   { name: "购物超市", type: 2, method: getListsupermarket },
      //   { name: "校内医疗", type: 3, method: getListmedical },
      //   { name: "社区内医疗", type: 3, method: getListmedical },
      //   { name: "邮寄快递", type: 4, method: getListmail },
      //   { name: "学生浴室", type: 5, method: getListbathroom },
      //   { name: "圈存机", type: 6, method: getListtransference },
@@ -121,7 +121,7 @@
      openData3: [
        { name: "食堂餐厅", type: 1, method: getListLifeOnce },
        { name: "购物超市", type: 2, method: getListLifeOnce },
        { name: "校内医疗", type: 3, method: getListLifeOnce },
        { name: "社区内医疗", type: 3, method: getListLifeOnce },
        { name: "邮寄快递", type: 4, method: getListLifeOnce },
        { name: "学生浴室", type: 5, method: getListLifeOnce },
        { name: "圈存机", type: 6, method: getListLifeOnce },
src/components/mobilePopupOurOnce/index.vue
@@ -60,7 +60,7 @@
      this.srcList = this.onceData.icon;
      this.icon = this.srcList[0];
    }
    if (this.onceData.from == "校园建筑" || this.onceData.from == "文化风景") {
    if (this.onceData.from == "社区建筑" || this.onceData.from == "文化风景") {
      this.getOnceCampus(this.onceData.id);
    } else {
      this.ourData = this.onceData;
@@ -121,7 +121,7 @@
        imgsDom.click();
      }
    },
    //"校园建筑"↓
    //"社区建筑"↓
    getOnceCampus(id) {
      getChildNavDetail({ id: id }).then((res) => {
        var result = res.data.data[0].list;
@@ -143,7 +143,7 @@
        this.ourData = d;
      });
    },
    //"校园建筑"↑
    //"社区建筑"↑
  },
};
</script>
src/components/mobilemap/index.vue
@@ -22,7 +22,7 @@
    <!-- 实景窗口 -->
    <mobilePanorama></mobilePanorama>
    <!-- 盖住左下角 -->
    <div class="cover_mobileMap">智慧校园</div>
    <div class="cover_mobileMap">智慧社区</div>
  </div>
</template>
<script>
src/pcLayout/index.vue
@@ -4,7 +4,7 @@
            <el-header>
                <img src="/img/logo.png"
                     alt="">
                <div class="header-title">智慧校园大数据三维可视化平台</div>
                <div class="header-title">智慧社区大数据三维可视化平台</div>
                <el-menu :default-active="$router.currentRoute.path"
                         class="el-menu-demo"
                         mode="horizontal"
@@ -17,7 +17,7 @@
                    <!-- <el-menu-item index="/pcLayout/default/mapnav"> <i class='custom-icon menu-dtdl'></i> 地图导览</el-menu-item> -->
                    <el-submenu index="orgnav">
                        <template slot="title"> <i class='custom-icon menu-jg'></i> 校内机构导览</template>
                        <template slot="title"> <i class='custom-icon menu-jg'></i> 社区内机构导览</template>
                        <el-menu-item index="/pcLayout/default/orgnav/masses">党群机构</el-menu-item>
                        <el-menu-item index="/pcLayout/default/orgnav/ofc">职能部处</el-menu-item>
                        <el-menu-item index="/pcLayout/default/orgnav/directly">直属及附属单位</el-menu-item>
@@ -26,10 +26,10 @@
                    </el-submenu>
                    <el-submenu index="arc">
                        <template slot="title"> <i class='custom-icon menu-xyjz'></i> 校内建筑</template>
                        <template slot="title"> <i class='custom-icon menu-xyjz'></i> 社区内建筑</template>
                        <el-menu-item index="/pcLayout/default/arc/edifact">行政办公</el-menu-item>
                        <el-menu-item index="/pcLayout/default/arc/teaching">教学科研</el-menu-item>
                        <el-menu-item index="/pcLayout/default/arc/venue">校内场馆</el-menu-item>
                        <el-menu-item index="/pcLayout/default/arc/venue">社区场馆</el-menu-item>
                        <el-menu-item index="/pcLayout/default/arc/dorm">学生宿舍</el-menu-item>
                        <el-menu-item index="/pcLayout/default/arc/culture">文化风景</el-menu-item>
                        <el-menu-item index="/pcLayout/default/arc/family">家属住宅</el-menu-item>
@@ -40,7 +40,7 @@
                        <template slot="title"> <i class='custom-icon menu-shfw'></i> 生活服务设施</template>
                        <el-menu-item index="/pcLayout/default/service/canteen">食堂餐厅</el-menu-item>
                        <el-menu-item index="/pcLayout/default/service/supermarket">购物超市</el-menu-item>
                        <el-menu-item index="/pcLayout/default/service/medical">校内医疗</el-menu-item>
                        <el-menu-item index="/pcLayout/default/service/medical">社区内医疗</el-menu-item>
                        <el-menu-item index="/pcLayout/default/service/express">邮寄快递</el-menu-item>
                        <el-menu-item index="/pcLayout/default/service/showers">学生浴室</el-menu-item>
                        <el-menu-item index="/pcLayout/default/service/transfer">圈存机</el-menu-item>
@@ -52,9 +52,9 @@
                        <el-menu-item index="/pcLayout/default/service/alleyway">出入口</el-menu-item>
                    </el-submenu>
                    <!-- <el-menu-item index="/pcLayout/default/campusnav"> <i class='custom-icon menu-xydl'></i> 校园导览</el-menu-item> -->
                    <!-- <el-menu-item index="/pcLayout/default/campusnav"> <i class='custom-icon menu-xydl'></i> 社区导览</el-menu-item> -->
                    <el-menu-item index="/pcLayout/default/campusnavi"> <i class='custom-icon menu-xydh'></i> 校园导航</el-menu-item>
                    <el-menu-item index="/pcLayout/default/campusnavi"> <i class='custom-icon menu-xydh'></i> 社区导航</el-menu-item>
                    <el-menu-item index="/pcLayout/default/specialmap"> <i class='custom-icon menu-ztdt'></i> 专题地图</el-menu-item>
src/pcviews/arc/culture.vue
@@ -23,7 +23,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/arc/dorm.vue
@@ -23,7 +23,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/arc/edifact.vue
@@ -23,7 +23,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/arc/family.vue
@@ -23,7 +23,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/arc/rest.vue
@@ -23,7 +23,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/arc/teaching.vue
@@ -23,7 +23,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/arc/venue.vue
@@ -1,6 +1,6 @@
/*
 * @Author: Morpheus
 * @Name: 校内场馆
 * @Name: 社区场馆
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:25:37
@@ -23,7 +23,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
@@ -34,7 +34,7 @@
            this.$store.commit('SET_ORGNAVBARLIST', [])
            this.$store.commit('SET_ORGNAVBARFLAG', false)
        }
        this.$store.commit('SET_ARCNAVBARTITLE', '校内场馆')
        this.$store.commit('SET_ARCNAVBARTITLE', '社区场馆')
        this.$store.commit('SET_ARCNAVBARCODE', 3)
        this.$store.commit('SET_ARCNAVBARFLAG', true)
    },
src/pcviews/campusnav/index.vue
@@ -1,6 +1,6 @@
<template>
  <div>
      校园导览
      社区导览
  </div>
</template>
src/pcviews/orgnav/directly.vue
@@ -24,7 +24,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/orgnav/masses.vue
@@ -24,7 +24,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/orgnav/ofc.vue
@@ -24,7 +24,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/orgnav/rest.vue
@@ -24,7 +24,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/orgnav/teaching.vue
@@ -24,7 +24,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/aed.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/alleyway.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/bank.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/canteen.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/copy.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/express.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/medical.vue
@@ -1,6 +1,6 @@
/*
 * @Author: Morpheus
 * @Name: 校内医疗
 * @Name: 社区内医疗
 * @Date: 2021-11-15 17:14:47
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-30 14:31:10
@@ -20,7 +20,7 @@
export default {
    data () {
        return {
            title: '校内医疗',
            title: '社区内医疗',
            code: 3,
            headerLog: '/img/icon/service-yl.png'
        }
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/park.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/service.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/showers.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/supermarket.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/pcviews/service/transfer.vue
@@ -39,7 +39,7 @@
    },
    computed: {
        ...mapGetters([
            // 校内导航的显示关闭
            // 社区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
src/router/page/index.js
@@ -36,7 +36,7 @@
                    path: 'orgnav',
                    component: resolve => require(['../../pcviews/orgnav/index.vue'], resolve),
                    meta: {
                        title: '校内机构导览'
                        title: '社区内机构导览'
                    },
                    children: [{
                            path: 'masses',
@@ -77,7 +77,7 @@
                    path: 'arc',
                    component: resolve => require(['../../pcviews/arc/index.vue'], resolve),
                    meta: {
                        title: '校内建筑'
                        title: '社区内建筑'
                    },
                    children: [{
                            path: 'edifact',
@@ -96,7 +96,7 @@
                            path: 'venue',
                            component: resolve => require(['../../pcviews/arc/venue.vue'], resolve),
                            meta: {
                                title: '校内场馆'
                                title: '社区场馆'
                            }
                        },
                        {
@@ -150,7 +150,7 @@
                            path: 'medical',
                            component: resolve => require(['../../pcviews/service/medical.vue'], resolve),
                            meta: {
                                title: '校内医疗'
                                title: '社区内医疗'
                            }
                        },
                        {
@@ -226,14 +226,14 @@
                    path: 'campusnav',
                    component: resolve => require(['../../pcviews/campusnav/index.vue'], resolve),
                    meta: {
                        title: '校园导览'
                        title: '社区导览'
                    }
                },
                {
                    path: 'campusnavi',
                    component: resolve => require(['../../pcviews/campusnavi/index.vue'], resolve),
                    meta: {
                        title: '校园导航'
                        title: '社区导航'
                    }
                },
                {