部分更改

shuishen

2022-03-10 f46387f451470c868e393a0a1ac6a9f3d60f4d59

部分更改

 package-lock.json

@@ -7764,12 +7764,6 @@
      "integrity": "sha1-J8dlOb4U2L0Sghmi1zGwkzeQTnk=",
      "dev": true
    },
    "js-base64": {
      "version": "2.6.4",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
      "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
      "dev": true
    },
    "js-message": {
      "version": "1.0.7",
      "resolved": "https://registry.npm.taobao.org/js-message/download/js-message-1.0.7.tgz?cache=0&sync_timestamp=1605128905632&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-message%2Fdownload%2Fjs-message-1.0.7.tgz",
@@ -11031,6 +11025,12 @@
        "source-map": "^0.4.2"
      },
      "dependencies": {
        "js-base64": {
          "version": "2.6.4",
          "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
          "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
          "dev": true
        },
        "source-map": {
          "version": "0.4.4",
          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",

 public/img/icon/return.png

 src/components/map/components/mapPopup.vue

@@ -66,7 +66,7 @@
                                                    <i class="popup-icon start-nav deblurring"></i>
                                                    出发
                                                </li>
                                                <li v-show="false" @click="qrCodeClick">
                                                <li v-show="pupupQRUrl != ''" @click="qrCodeClick">
                                                    <i class="popup-icon qr-code-nav deblurring"></i>
                                                    二维码
                                                </li>

 src/components/orgNavBar/index.vue

@@ -53,9 +53,9 @@
            this.$store.commit('CLEAR_ALL', null)

            var imgArr = item.bgImg.split(',')

            this.$store.commit('SET_POPUPBGURL', imgArr[0])
            this.$store.commit('SET_POPUPQRURL', item.QRImg)

            this.$store.commit('SET_POINTPOSITION', [
                Number(item.longitude),
                Number(item.latitude),

 src/pcviews/orgnav/directly.vue

@@ -1,70 +1,70 @@
/* * @Author: Morpheus * @Name: 直属及附属单位 * @Date: 2021-11-15 10:02:12 *
@Last Modified by: Morpheus * @Last Modified time: 2021-12-30 14:25:45 */
<template>
  <div></div>
    <div></div>
</template>

<script>
import { getList } from "@/api/pc/orgnav/index";
import { getList } from '@/api/pc/orgnav/index'

import { mapGetters } from "vuex";
import { mapGetters } from 'vuex'

export default {
  data() {
    return {
      list: [],
    };
  },
  computed: {
    ...mapGetters([
      // 校区内导航的显示关闭
      "orgNavBarFlag",
      "arcNavBarFlag",
    ]),
  },
  mounted() {
    if (this.arcNavBarFlag == true) {
      this.$store.commit("SET_ARCNAVBARTITLE", "");
      this.$store.commit("SET_ARCNAVBARCODE", "");
      this.$store.commit("SET_ARCNAVBARFLAG", false);
    data () {
        return {
            list: []
        }
    },
    computed: {
        ...mapGetters([
            // 校区内导航的显示关闭
            'orgNavBarFlag',
            'arcNavBarFlag'
        ])
    },
    mounted () {
        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', '直属及附属单位')
        this.$store.commit('SET_ORGNAVBARLIST', [])

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

        getList({ type: 3 }).then((res) => {
            res.data.data.records.forEach((item) => {
                this.list.push({
                    navTitle: item.mechanismname,
                    icon: '/img/navicon/tag.png',
                    longitude: item.jd,
                    latitude: item.wd,
                    alt: item.gd,
                    heading: item.heading,
                    pitch: item.pitch,
                    roll: item.roll,
                    bgImg: item.tpurl,
                    QRImg: item.codeurl,
                    address: item.address,
                    telephone: item.telephone,
                    introduce: item.introduce,
                    videourl: item.videourl
                })
            })

            this.$store.commit('SET_ORGNAVBARLIST', this.list)
        })
    },
    methods: {},
    beforeDestroy () {
        if (this.orgNavBarFlag == true) {
            this.$store.commit('SET_ORGNAVBARTITLE', '')
            this.$store.commit('SET_ORGNAVBARLIST', [])
            this.$store.commit('SET_ORGNAVBARFLAG', false)
        }
    }
    this.$store.commit("SET_ORGNAVBARTITLE", "直属及附属单位");
    this.$store.commit("SET_ORGNAVBARLIST", []);

    this.$store.commit("SET_ORGNAVBARFLAG", true);

    getList({ type: 3 }).then((res) => {
      res.data.data.records.forEach((item) => {
        this.list.push({
          navTitle: item.mechanismname,
          icon: "/img/navicon/tag.png",
          longitude: item.jd,
          latitude: item.wd,
          alt: item.gd,
          heading: item.heading,
          pitch: item.pitch,
          roll: item.roll,
          bgImg: item.tpurl,
          QRImg: item.codeurl,
          address: item.address,
          telephone: item.telephone,
          introduce: item.introduce,
          videourl: item.videourl,
        });
      });

      this.$store.commit("SET_ORGNAVBARLIST", this.list);
    });
  },
  methods: {},
  beforeDestroy() {
    if (this.orgNavBarFlag == true) {
      this.$store.commit("SET_ORGNAVBARTITLE", "");
      this.$store.commit("SET_ORGNAVBARLIST", []);
      this.$store.commit("SET_ORGNAVBARFLAG", false);
    }
  },
};
}
</script>

<style></style>

 src/router/axios.js

@@ -12,8 +12,8 @@
//   console.log(window.location);
//   console.log(url);
// }, 3000);
window.$apiUrls = 'http://171.34.197.243:782'
// window.$apiUrls = 'http://192.168.0.110:82'
// window.$apiUrls = 'http://171.34.197.243:782'
window.$apiUrls = 'http://192.168.0.110:82'
const service = axios.create({
    //   baseURL: 'http://192.168.0.107:83',


 src/styles/pcpage/campus-nav.scss

@@ -171,7 +171,7 @@

        .path-box {
            margin: 2.5px 10px 9px 10px;
            height: auto;
            max-height: 348px;
            box-sizing: border-box;
            overflow-y: auto;
            color: #000;
@@ -180,9 +180,7 @@

            li {
                padding: 0 10px;
                height: 36px;
                line-height: 36px;

            }

        }