Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/zhengzhou_university

# Conflicts:
#	web/public/static/js/main_2020_show.js

edit-backstage/edit.html

@@ -6,7 +6,7 @@
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>四维时代</title>
+    <title>信息工程大学</title>
     <meta name="description" content="3D camera">
     <meta property="og:title" content="3D camera">
     <meta property="og:description" content="3D Showcase">
@@ -1227,7 +1227,7 @@
                                 <a class="del hasHover"></a>
                             </div> -->
                         </li>
-                        <li data-name="hotStyle">
+                        <li data-name="hotStyle" style="display: none">
                             <div class="itemTitle">
                                 <span>选择热点样式</span>
                             </div>
@@ -1252,7 +1252,7 @@
                                 </li>  -->
                             </ul>
                         </li>
-                        <li data-name="floorMarkerColor">
+                        <li data-name="floorMarkerColor" style="display: none">
                             <div class="itemTitle">
                                 <span>当前位置/导览路线</span>
                             </div>
@@ -1273,13 +1273,13 @@
                                 <span>其他设置</span>
                             </div>
                             <ul class="other-item">
-                                <li>
+                                <li style="display: none">
                                     <input name="loadlogo" class="editCheckbox" type="checkbox" value="loadlogo"
                                         id="loadlogo">
                                     <label for="loadlogo"></label>
                                     <label for="loadlogo">隐藏公司logo </label>
                                 </li>
-                                <li>
+                                <li style="display: none">
                                     <input name="hotImgScale" class="editCheckbox" type="checkbox" value="hotImgScale"
                                         id="hotImgScale">
                                     <label for="hotImgScale"></label>
@@ -1297,7 +1297,7 @@
                                     <label for="hideMouseMarker"></label>
                                     <label for="hideMouseMarker">隐藏鼠标标记 </label>
                                 </li>
-                                <li>
+                                <li style="display: none">
 <!--                                     <input name="g_specialScene" class="editCheckbox" type="checkbox"
                                         value="g_specialScene" id="g_specialScene">
                                     <label for="g_specialScene"></label>
@@ -1310,13 +1310,6 @@
                                     <label for="twoData">启动二代数据 <i class="colorRed">-请慎重选择</i> </label>
                                 </li>
                             </ul>
-                            <ul>
-                                <li>
-                                    <label class="remark">注：
-                                        <br>特殊大场景：一般不勾选，是对某些需要特殊处理的场景设置的。如果勾选了还需要将处理的内容写进SpecialScene.js，否则没有作用。
-                                        <br><br>启动二代数据：和tile贴图有关。</label>
-                                </li>
-                            </ul>
                         </li>
                     </ul>
                 </div>

edit-backstage/js/edit.js

@@ -3415,7 +3415,7 @@ var EditOverlay = {
 }
 
 //----------------漫游可见性---------------------------------
-
+//如果加载了sweep_locations.csv，设置将无效
 var VisiSet = {
 
     setPanoVisible: false,

hotspot/.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not dead

hotspot/.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  'extends': [
+    'plugin:vue/essential',
+    'eslint:recommended'
+  ],
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+  }
+}

hotspot/.gitignore

@@ -0,0 +1,23 @@
+.DS_Store
+node_modules
+/dist
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

hotspot/README.md

@@ -0,0 +1,24 @@
+# hotspot
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Lints and fixes files
+```
+npm run lint
+```
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).

hotspot/babel.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}

hotspot/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "hotspot",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "lint": "vue-cli-service lint"
+  },
+  "dependencies": {
+    "axios": "^0.20.0",
+    "core-js": "^3.6.5",
+    "swiper": "^5.4.5",
+    "v-viewer": "^1.5.1",
+    "vue": "^2.6.11",
+    "vue-awesome-swiper": "^4.1.1",
+    "vue-router": "^3.2.0"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.5.0",
+    "@vue/cli-plugin-eslint": "~4.5.0",
+    "@vue/cli-plugin-router": "~4.5.0",
+    "@vue/cli-service": "~4.5.0",
+    "babel-eslint": "^10.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^6.2.2",
+    "less": "^3.0.4",
+    "less-loader": "^5.0.0",
+    "vue-template-compiler": "^2.6.11"
+  }
+}

hotspot/public/index.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title><%= htmlWebpackPlugin.options.title %></title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>

hotspot/src/App.vue

@@ -0,0 +1,25 @@
+<template>
+  <div id="app">
+    <router-view/>
+  </div>
+</template>
+
+<style lang="less">
+html,body{
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+body{
+  background: rgba(0, 0, 0, 0.4);
+}
+*{
+  margin: 0;
+  padding: 0;
+}
+#app {
+  width: 100%;
+  height: 100%;
+}
+
+</style>

hotspot/src/components/HelloWorld.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="hello">
+    <h1>{{ msg }}</h1>
+    <p>
+      For a guide and recipes on how to configure / customize this project,<br>
+      check out the
+      <a href="https://cli.vuejs.org" target="_blank" rel="noopener">vue-cli documentation</a>.
+    </p>
+    <h3>Installed CLI Plugins</h3>
+    <ul>
+      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel" target="_blank" rel="noopener">babel</a></li>
+      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-router" target="_blank" rel="noopener">router</a></li>
+      <li><a href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint" target="_blank" rel="noopener">eslint</a></li>
+    </ul>
+    <h3>Essential Links</h3>
+    <ul>
+      <li><a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a></li>
+      <li><a href="https://forum.vuejs.org" target="_blank" rel="noopener">Forum</a></li>
+      <li><a href="https://chat.vuejs.org" target="_blank" rel="noopener">Community Chat</a></li>
+      <li><a href="https://twitter.com/vuejs" target="_blank" rel="noopener">Twitter</a></li>
+      <li><a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a></li>
+    </ul>
+    <h3>Ecosystem</h3>
+    <ul>
+      <li><a href="https://router.vuejs.org" target="_blank" rel="noopener">vue-router</a></li>
+      <li><a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a></li>
+      <li><a href="https://github.com/vuejs/vue-devtools#vue-devtools" target="_blank" rel="noopener">vue-devtools</a></li>
+      <li><a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener">vue-loader</a></li>
+      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">awesome-vue</a></li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'HelloWorld',
+  props: {
+    msg: String
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped lang="less">
+h3 {
+  margin: 40px 0 0;
+}
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+a {
+  color: #42b983;
+}
+</style>

hotspot/src/main.js

@@ -0,0 +1,17 @@
+import Vue from 'vue'
+import App from './App.vue'
+import router from './router'
+import axios from 'axios'
+import 'viewerjs/dist/viewer.css'
+import Viewer from 'v-viewer'
+ 
+
+Vue.config.productionTip = false
+Vue.prototype.$http = axios
+
+Vue.use(Viewer)
+
+new Vue({
+  router,
+  render: h => h(App)
+}).$mount('#app')

hotspot/src/router/index.js

@@ -0,0 +1,27 @@
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+import Home from '../views/Home.vue'
+
+Vue.use(VueRouter)
+
+const routes = [
+  {
+    path: '/',
+    name: 'Home',
+    component: Home
+  },
+  {
+    path: '/about',
+    name: 'About',
+    // route level code-splitting
+    // this generates a separate chunk (about.[hash].js) for this route
+    // which is lazy-loaded when the route is visited.
+    component: () => import(/* webpackChunkName: "about" */ '../views/About.vue')
+  }
+]
+
+const router = new VueRouter({
+  routes
+})
+
+export default router

hotspot/src/utils/browser.js

@@ -0,0 +1,29 @@
+function versions () {
+    var u = window.navigator.userAgent
+    return {
+      // IE内核
+      trident: u.indexOf('Trident') > -1,
+      // opera内核
+      presto: u.indexOf('Presto') > -1,
+      // 苹果、谷歌内核
+      webKit: u.indexOf('AppleWebKit') > -1,
+      // 火狐内核
+      gecko: u.indexOf('Gecko') > -1 && u.indexOf('KHTML') === -1,
+      // 是否为移动终端 / Tablets use desktop version
+      mobile: (/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) && !(/Tablet|iPad/i.test(navigator.userAgent)),
+      // ios终端
+      ios: !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/),
+      // android终端或者uc浏览器
+      android: u.indexOf('Android') > -1 || u.indexOf('Linux') > -1,
+      // 是否为iPhone或者安卓QQ浏览器
+      iPhone: u.indexOf('iPhone') > -1 || u.indexOf('Mac') > -1,
+      // 是否为iPad
+      iPad: u.indexOf('iPad') > -1,
+      // 是否为web应用程序，没有头部与底部
+      webApp: u.indexOf('Safari') === -1,
+      // 是否为微信浏览器
+      weixin: ~u.indexOf('MicroMessenger')
+    }
+  }
+  
+  export default versions()

hotspot/src/views/About.vue

@@ -0,0 +1,5 @@
+<template>
+  <div class="about">
+    <h1>This is an about page</h1>
+  </div>
+</template>

hotspot/src/views/Home.vue

@@ -0,0 +1,551 @@
+<template>
+  <div class="home" @click="autoplay" @touchstart="autoplay">
+    <audio
+      v-if="audio"
+      class="audio"
+      id="audio1"
+      :src="audio"
+      preload
+      autoplay
+      ref="musicBg"
+    ></audio>
+    <div class="content" v-if="fixIcon.length > 0">
+      <img
+        class="close"
+        @click="colseParent"
+        :src="require('@/assets/images/close@2x.png')"
+        alt=""
+      />
+      <img class="bg" :src="require('@/assets/images/bg.png')" alt="" />
+      <ul class="iconarr" v-if="fixIcon.length > 1">
+        <li
+          :class="{ active: item.id === active }"
+          @click="active = item.id"
+          v-for="(item, i) in fixIcon"
+          :key="i"
+        >
+          <img
+            :src="
+              require(`@/assets/images/icon/${item.img}${
+                item.id === active ? '2' : '1'
+              }.png`)
+            "
+            alt=""
+          />
+          <span>{{ item.name }}</span>
+        </li>
+      </ul>
+      <div class="title" v-html="data.title"></div>
+      <div @click="slideto('slidePrev')" v-if="data[active].length>1" class="swiper-button-prev"></div>
+      <swiper class="warpper" ref="mySwiper" :options="swiperOptions">
+        <swiper-slide v-for="(item, i) in data[active]" :key="i">
+          <div class="slide">
+            <img
+              style="cursor: pointer"
+              v-viewer
+              v-if="active === 'images'"
+              :src="fixUrl(item)"
+              alt=""
+            />
+            <video
+              v-else-if="active === 'video'"
+              :src="fixUrl(item.url)"
+              controls
+              autoplay
+            ></video>
+            <iframe
+              v-else
+              :src="fixUrl(item)"
+              frameborder="0"
+            ></iframe>
+          </div>
+        </swiper-slide>
+        <div class="swiper-pagination"  v-if="data[active].length>1" slot="pagination"></div>
+      </swiper>
+      <div @click="slideto('slideNext')"  v-if="data[active].length>1" class="swiper-button-next"></div>
+      <p class="desc" ref="desc" :class="{'desc-duo':data.content&&data.content.length>60}" v-html="data.content"></p>
+    </div>
+
+    <div class="content" v-if="fixIcon.length <= 0 && hadLoad">
+      <img
+        class="close"
+        @click="colseParent"
+        :src="require('@/assets/images/close@2x.png')"
+        alt=""
+      />
+      <img class="bg" :src="require('@/assets/images/bg.png')" alt="" />
+      <div class="norecord">该热点无数据</div>
+    </div>
+
+    <div class="intro" :class="{ ismtop: fixIcon.length <= 0 }"></div>
+  </div>
+</template>
+
+<script>
+import { Swiper, SwiperSlide } from "vue-awesome-swiper";
+import "swiper/css/swiper.css";
+import browser from "@/utils/browser";
+
+let iconArr = [
+  { name: "图片", id: "images", img: "ICON_xiangpian", display: false },
+  { name: "视频", id: "video", img: "ICON_bofang", display: false },
+  { name: "网页", id: "iframe", img: "ICON_wangluo", display: false },
+  { name: "模型", id: "model", img: "ICON_moxing", display: false },
+];
+
+browser.mobile &&
+  iconArr.push({ name: "介绍", id: "title", img: "txt-icon", display: false });
+
+export default {
+  name: "Home",
+  data() {
+    return {
+      // http://8.135.106.227:8009
+      server:"",
+      loadAuto: false,
+      hadLoad:false,
+      audio: "",
+      m: this.$route.query.m,
+      id: this.$route.query.id,
+      isAndriod: browser.android,
+      swiperOptions: browser.mobile
+        ? {
+            pagination: {
+              el: ".swiper-pagination",
+              clickable: true,
+            },
+          }
+        : {
+            spaceBetween: 0,
+            centeredSlides: true,
+            pagination: {
+              el: ".swiper-pagination",
+              clickable: true,
+            },
+          },
+      data: {},
+      iconArr,
+      active: ""
+    };
+  },
+  watch: {
+    active(newVal) {
+      if (!newVal) {
+        return;
+      }
+      if (!this.$refs.musicBg) {
+        return;
+      }
+      setTimeout(() => {
+        if (newVal == "video") {
+          if (!this.$refs.musicBg.paused) {
+            this.$refs.musicBg.pause();
+          }
+        } else {
+          if (this.$refs.musicBg.paused) {
+            this.$refs.musicBg.play(); // 暂停
+          }
+        }
+      }, 500);
+    },
+  },
+  computed: {
+    swiper() {
+      return this.$refs.mySwiper.$swiper;
+    },
+    fixIcon() {
+      let arr = this.iconArr.filter((item) => !!item.display);
+      return arr;
+    }
+  },
+  components: {
+    Swiper,
+    SwiperSlide,
+  },
+  methods: {
+    autoplay() {
+      if (this.loadAuto) {
+        return;
+      }
+      try {
+        this.$refs.musicBg.play();
+        this.loadAuto = true;
+      } catch (error) {
+        error;
+      }
+    },
+    async getData() {
+      // http://super.4dage.com
+      let url = `${this.server}/data/${
+        this.id
+      }/hot/js/data.js?time=${Math.random()}`;
+      let result = (await this.$http.get(url)).data;
+      this.data = result[this.m];
+      if (!this.data) {
+        return alert("热点解析错误");
+      }
+
+      this.audio = this.data["backgroundMusic"];
+
+      if (!this.data.content && this.isMobile) {
+        this.iconArr.pop();
+      }
+      this.iconArr.forEach((item) => {
+        if (this.data[item.id]) {
+          this.active = !this.active ? item.id : this.active;
+          item.display = true;
+        }
+      });
+      this.hadLoad = true
+      
+    },
+
+    colseParent() {
+        window.parent.document.getElementById("closepop").click();
+    },
+    fixUrl(item) {
+      return this.server + item;
+    },
+    slideto(action) {
+      this.swiper[action]();
+    },
+  },
+  mounted() {
+    this.getData();
+    
+    document.addEventListener(
+      "WeixinJSBridgeReady",
+      () => {
+        this.autoplay();
+      },
+      false
+    );
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.audio {
+  position: fixed;
+  top: -100px;
+  left: -100px;
+  opacity: 0;
+}
+
+.swiper-button-prev, .swiper-button-next{
+  background: none!important;
+  padding: 10px 30px!important;
+}
+
+.mb-intro {
+  color: #fff;
+  padding: 10px;
+  > p {
+    line-height: 1.5;
+    letter-spacing: 1px;
+    &:first-of-type {
+      font-weight: bold;
+      font-size: 20px;
+    }
+  }
+}
+
+.home {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  .ismtop {
+    padding-top: 40px !important;
+  }
+  .content {
+    width: 1200px;
+    height: 86%;
+    margin: 2% auto;
+    position: relative;
+    .norecord{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+      color: #fff;
+    }
+    .warpper {
+      width: 100%;
+      height: calc(100% - 40px);
+      margin: 0 auto;
+      .slide {
+        font-size: 0;
+        width: 100%;
+        height: calc(100% - 180px);
+        position: relative;
+        img,
+        video,
+        iframe {
+          max-height: 100%;
+          max-width: calc(100% - 220px);
+          border-radius: 14px;
+          box-shadow: 0 0 16px rgba(0, 0, 0, 0.6);
+          transform: translate(-50%,-50%);
+          top: 50%;
+          left: 50%;
+          position: absolute;
+        }
+        iframe{
+          width: calc(100% - 220px);
+          height: 100%;
+        }
+        video {
+          width: 100%;
+        }
+      }
+    }
+    .desc{
+      color: #fff;
+      width: 76%;
+      margin: -40px auto 0;
+      max-height: 120px;
+      overflow-y: auto;
+      overflow-x: hidden;
+      text-align: center;
+      position: relative;
+      z-index: 999;
+    }
+    .desc-duo{
+      text-indent: 32px;
+      text-align: left;
+    }
+    .close {
+      position: absolute;
+      bottom: 50px;
+      right: 50px;
+      box-shadow: none;
+      width: 24px;
+      cursor: pointer;
+      z-index: 999;
+    }
+    .bg {
+      position: absolute;
+      box-shadow: none;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      max-height: unset;
+      z-index: -1;
+    }
+  }
+
+  .iconarr {
+    list-style: none;
+    display: flex;
+    justify-content: flex-end;
+    margin-right: 30px;
+    position: absolute;
+    left: 40px;
+    top: 20px;
+    z-index: 999;
+    li {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      color: #fff;
+      list-style: none;
+      font-size: 14px;
+      width: 90px;
+      height: 32px;
+      line-height: 32px;
+      cursor: pointer;
+      border-radius: 10px;
+      span {
+        margin-left: 10px;
+      }
+      > img {
+        width: 24px;
+      }
+    }
+    .active {
+      color: rgba(252, 214, 123, 1);
+      border: none;
+    }
+  }
+  .title{
+    color: rgba(252, 214, 123, 1);
+    width: 100%;
+    text-align: center;
+    transform: translateX(-50%);
+    top: 24px;
+    left: 50%;
+    font-size: 18px;
+    position: absolute;
+  }
+  .intro {
+    max-height: 20vh;
+    overflow: auto;
+    width: 70%;
+    color: #fff;
+    margin: 0 auto;
+    > h3 {
+      font-size: 20px;
+      font-weight: 600;
+    }
+    > p {
+      line-height: 1.5;
+      margin-top: 10px;
+      font-size: 16px;
+      text-indent: 32px;
+    }
+  }
+}
+
+@media screen and (max-width: 1400px) {
+  .home {
+    .content {
+      .warpper {
+        .slide {
+          img,
+          video,
+          iframe {
+          }
+          iframe {
+          }
+        }
+      }
+    }
+  }
+}
+
+@media screen and (max-width: 1000px) {
+  .home {
+    background: rgba(0, 0, 0, 0.8);
+    .content {
+      .warpper {
+        .slide {
+          width: 100%;
+          img,
+          video,
+          iframe {
+            max-height: none;
+            width: 100%;
+            border-radius: 0;
+          }
+          iframe {
+            width: 100%;
+            height: 100vh;
+          }
+        }
+      }
+    }
+    .iconarr {
+      list-style: none;
+      margin-right: 0px;
+      position: fixed;
+      bottom: 10px;
+      right: 0px;
+      z-index: 10000;
+      li {
+        width: 70px;
+      }
+    }
+  }
+}
+
+@media only screen and (max-width: 906px) and (orientation: landscape) {
+  .home {
+    .content {
+      .warpper {
+        .slide {
+          width: 100%;
+          img,
+          video,
+          iframe {
+            max-width: 70%;
+            max-height: 80vh;
+          }
+          iframe {
+            width: 100%;
+            max-width: unset;
+            height: 100vh;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+
+<style>
+*{
+  word-break: break-all;
+}
+.swiper-container {
+  width: 100%;
+  height: 100%;
+}
+
+.swiper-pagination-bullet {
+  background: #fff;
+}
+
+.swiper-pagination-bullets {
+  bottom: 40px!important;
+}
+
+.swiper-slide {
+  text-align: center;
+  font-size: 18px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  transition: 300ms;
+  transform: scale(0.8);
+  position: relative;
+  opacity: 0.5;
+}
+
+.swiper-slide-active,
+.swiper-slide-duplicate-active {
+  transform: scale(1);
+  opacity: 1;
+  z-index: 999;
+}
+
+.swiper-button-prev,
+.swiper-button-next {
+  background: rgba(0, 0, 0, 0.4);
+  padding: 10px 20px;
+  color: #fff !important;
+}
+.swiper-button-prev {
+  left: 0;
+}
+.swiper-button-next {
+  right: 0;
+}
+
+@media screen and (max-width: 500px) {
+  .swiper-slide {
+    width: 100%;
+  }
+}
+
+
+
+::-webkit-scrollbar-track-piece {  
+	background-color:#ffffff;  
+}  
+::-webkit-scrollbar {  
+	width:8px;  
+  overflow: hidden;
+	height:13px;  
+}  
+::-webkit-scrollbar-thumb {  
+	background-color:#ccc;  
+	background-clip:padding-box;  
+	min-height:10px;  
+	border-radius: 4px;
+}  
+::-webkit-scrollbar-thumb:hover {  
+	background-color:#929292;  
+}  
+
+</style>

hotspot/vue.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  publicPath: "./"
+};

web/package.json

@@ -13,7 +13,8 @@
     "swiper": "^5.3.8",
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^4.1.1",
-    "vue-router": "^3.2.0"
+    "vue-router": "^3.2.0",
+    "vue-worker": "^1.2.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

web/public/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport"
         content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title></title>
+    <title>信息工程大学</title>
     <meta name="description" content="四维时代">
     <meta property="og:title" content="四维时代">
     <meta property="og:description" content="四维时代">

web/public/static/js/main_2020_show.js

@@ -16,11 +16,11 @@ g_tourAudio.addEventListener("ended", function() {
 
 g_tourAudio.oncanplaythrough = function() {
     g_tourAudio.play();
-    if(g_bgAudio && !g_bgAudio.paused){
-        manage.switchBgmState(false); 
-        g_bgAudio.pauseByTour = true
-    }
-    g_playAudio = g_tourAudio;  
+    // if(g_bgAudio && !g_bgAudio.paused){
+    //     manage.switchBgmState(false); 
+    //     g_bgAudio.pauseByTour = true
+    // }
+    // g_playAudio = g_tourAudio;  
 }
 
 
@@ -57,12 +57,6 @@ var videoPosInfo = {
     "d37506a1ced0473e9d440bacc1e1adcd":[],
     "15ce1af19b254208b53b581f60448187":[],
     "caea23de90ac4e15b29a3bb3bd3e8adf":[],
-    
-    
-    
-    
-    
-    
 }
   
 var videoOffset  
@@ -4852,7 +4846,7 @@ window.Modernizr = function(n, e, t) {
                 return destination && destination.panoId == e
             }
             ,
-            n.prototype.redirectToItem = function(e, t) {
+            n.prototype.redirectToItem = function(e, t,noMusic) {
                 if (null === e || void 0 === e)
                     return void A.warn("Director.redirectToItem() -> Redirecting to null item.");
                 if (!this.wouldInterrupt())
@@ -4862,8 +4856,9 @@ window.Modernizr = function(n, e, t) {
                 A.debug("Director.redirectToItem() -> Redirecting to " + e + " via " + t);
                 var i = function() {
                     s.setTimeout(function() {
+                        let flag = noMusic?'noMusic':''
                         this.setDestinationItem(e),
-                        this.goToDestination(!0, g.BEGINNING, a.warp.warpInterruptionRedirectTime, !1)
+                        this.goToDestination(flag, g.BEGINNING, a.warp.warpInterruptionRedirectTime, !1)
                     }
                     .bind(this), 0)
                 }
@@ -4899,15 +4894,27 @@ window.Modernizr = function(n, e, t) {
             n.prototype.goToDestination = function(e, t, i, n) {
                         
                 //音频 
-                if(this.destinationItem[1] == 0 && e!='goToHighlight'){//如果是每个folder的起始
-                    var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
-                    if(musicInfo && musicInfo.music){
-                        var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music :  g_Prefix + musicInfo.music;
-                        g_tourAudio.src = manage.dealURL(o);
-                        g_tourAudio.load()  
+                if(!this.destinationItem){
+                    this.goNext()
+                }
+                else{
+                    if(this.destinationItem[1] == 0){//如果是每个folder的起始
+                        g_tourAudio.pause();
+                        g_tourAudio.src = ""
+                        var musicInfo = this.model.heroLocations[this.destinationItem[0]].musicInfo
+                        if(musicInfo && musicInfo.music){
+                            if(e!='noMusic'){
+                                var o = musicInfo.music.includes(g_Prefix.slice(-10)) ? musicInfo.music :  g_Prefix + musicInfo.music;
+                                g_tourAudio.src = manage.dealURL(o);
+                                g_tourAudio.load()  
+                            }
+                        }
+                        
                     }
                 }
                 
+
+                
                 if (this.onTheBus = !0,
                 this.emit("update.controls"),
                 this.player.updateLastView(),
@@ -4923,17 +4930,18 @@ window.Modernizr = function(n, e, t) {
                     
                         //var s = 0 === this.destinationItem || e ? u.BLACK : this.nextWarpStyle;
                         //var walk = window.MP_PREFETCHED_MODELDATA.black ? 'black' : 'walk';
-                     
                         var s = this.getMomentTour(this.destinationItem)   //window.MP_PREFETCHED_MODELDATA.momentTour || "walk";
-                        if(e == 'goToHighlight'){
+
+                     
+                        if(e == 'noMusic'){
                             var aim = new THREE.Vector3(0,0,-1).applyQuaternion(r.quaternion).add(r.position)   
                             a = this.player.flyToPano.bind(this.player, {pano: this.model.panos.index[r.panoId], lookAtPoint: aim }, this.actionComplete.bind(this))
                         }else{
-                            a = this.player.warpToPanoByHeroIndex.bind(this.player, this.destinationItem, v.Show, m.Slow,  s, true, i, this.actionComplete.bind(this)) 
+                            a = this.player.warpToPanoByHeroIndex.bind(this.player, this.destinationItem, v.Show, m.Slow,  s, true, i, this.actionComplete.bind(this))
                         }
                         
-                        
                         o = this.arrivedAtDestination.bind(this, !0)
+                        
                     } else{
                         a = this.player.warpToNonPanoByHeroIndex.bind(this.player, this.destinationItem, this.actionComplete.bind(this)),
                         o = this.arrivedAtDestination.bind(this, !1);
@@ -5009,6 +5017,7 @@ window.Modernizr = function(n, e, t) {
                     this.emit("update.controls"),
                     this.emit(p.TourStart),
                     this.player.enablePreRendering(),
+ 
                     /* this.walkingSectionPaused ? (this.clearWalkingSectionPaused(),
                     this.goToDestination()) : this.goNext())) */
                     
@@ -5017,16 +5026,17 @@ window.Modernizr = function(n, e, t) {
                     
                     
                 }
+ 
             } 
 			,
 			n.prototype.bgmReplay = function() {//xzw add  结束tour后可能要继续播放背景音乐
 				//if(g_tourAudio && g_tourAudio.paused && g_bgAudio && g_bgAudio.paused){
-                if(g_bgAudio && g_bgAudio.paused && g_bgAudio.pauseByTour){
-                    g_playAudio = g_bgAudio;
-                    g_tourAudio && g_tourAudio.pause();
-                    //window.tourAudio && window.tourAudio.pause(); 
-                    manage.switchBgmState(true); 
-				}
+                // if(g_bgAudio && g_bgAudio.paused && g_bgAudio.pauseByTour){
+                //     g_playAudio = g_bgAudio;
+                //     g_tourAudio && g_tourAudio.pause();
+                //     //window.tourAudio && window.tourAudio.pause(); 
+                //     manage.switchBgmState(true); 
+				// }
 			}
 			,
             n.prototype.stopTour = function(isAutoStop) {//停止导览        isAutoStop 希望仅在飞完结束自动停止时的stopTour不停止tourSound, 这样才能完整播放tourSound.  不过似乎会在倒数第二个片段点击按钮停止导览时也视作自动结束的（执行this.interrupt() ）。
@@ -5054,11 +5064,8 @@ window.Modernizr = function(n, e, t) {
             ,
             
             n.prototype.goToHighlight = function(e) {
-                
-                /* if (this.wouldInterrupt())
-                    this.itemCompare(this.destinationItem,e,'equal') ? this.interrupt() : this.redirectToItem(e, "goToHighlight");
-                 */
-                if (this.wouldInterrupt()){}
+                if (this.wouldInterrupt())
+                    this.itemCompare(this.destinationItem,e,'equal') ? this.interrupt() : this.redirectToItem(e, "goToHighlight",true);
                 else {
                     if (A.debug("<tour.goto " + e + ">"),
                     this.isInterrupted())
@@ -5066,7 +5073,7 @@ window.Modernizr = function(n, e, t) {
                     this.clearWalkingSectionPaused(),
                     this.setDestinationItem(e),
                     this.useSpecialTransition("Hilight"),
-                    this.goToDestination("goToHighlight"),//
+                    this.goToDestination('noMusic'),
                     h.trackAlways("reach_highlight", {
                         reach_source: "thumb"
                     })
@@ -6900,7 +6907,7 @@ window.Modernizr = function(n, e, t) {
                 var i = Q.pageTitle;
                 // 2 !== K.valueFromHash("mls", 0) && (i = e.name + " - " + i),
                 2 !== K.valueFromHash("mls", 0) && e.name && (i = e.name),
-                document.title = i ,
+                // document.title = i ,
                 K.isMobile() ? $("#gui-fullscreen").css("display", "none") : ($("[rel=tooltip]").tooltip({
                     delay: {
                         show: 50,
@@ -15797,7 +15804,7 @@ window.Modernizr = function(n, e, t) {
             }else{
                 u.texture1.value = defaultTex1;
                 u.texture2.value = defaultTex2;
-                console.log(this.sid)
+                // console.log(this.sid)
             }  
         }
         
@@ -15831,7 +15838,7 @@ window.Modernizr = function(n, e, t) {
                 transparent: !0
             })
             var sprite = new r.Mesh( geometry, shaderMaterial );
-            var hotIconScale = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale);
+            var hotIconScale = parseFloat(window.MP_PREFETCHED_MODELDATA.hotIconScale*0.7);
 			sprite.dynamic = true; 
 			sprite.position.copy(this.position);
             sprite.quaternion.copy(this.quaternion)
@@ -15961,9 +15968,9 @@ window.Modernizr = function(n, e, t) {
                     exit.style["z-index"] = "3"
                     exit.onclick = ()=>{
                         $(div).remove()
-                        if(g_bgAudio && g_bgAudio.pauseByHot){
-                            manage.switchBgmState(true)
-                        }
+                        // if(g_bgAudio && g_bgAudio.pauseByHot){
+                        //     manage.switchBgmState(true)
+                        // }
                     }  
                     
                     var myElement = document.createElement("iframe");
@@ -15982,11 +15989,11 @@ window.Modernizr = function(n, e, t) {
                     
                     //打开热点的时候把背景音乐关闭了，避免与热点里面的音乐冲突
                     //g_bgAudio && g_bgAudio.pause();
-                    if(g_bgAudio && !g_bgAudio.paused){
-                        // manage.switchBgmState(false); 
-                        // g_bgAudio.pauseByHot = true
-                    } 
-                    if(g_tourAudio)g_tourAudio.pause()
+                    // if(g_bgAudio && !g_bgAudio.paused){
+                    //     manage.switchBgmState(false); 
+                    //     g_bgAudio.pauseByHot = true
+                    // } 
+                    // if(g_tourAudio)g_tourAudio.pause()
                     
                     
                     
@@ -16009,13 +16016,13 @@ window.Modernizr = function(n, e, t) {
 				var myElement = document.createElement("iframe");
                 //打开热点的时候把背景音乐关闭了，避免与热点里面的音乐冲突
                 //g_bgAudio && g_bgAudio.pause();
-                if(g_bgAudio && !g_bgAudio.paused){
-                    manage.switchBgmState(false); 
-                    g_bgAudio.pauseByHot = true
-                } 
+                // if(g_bgAudio && !g_bgAudio.paused){
+                //     manage.switchBgmState(false); 
+                //     g_bgAudio.pauseByHot = true
+                // } 
                 if(g_tourAudio)g_tourAudio.pause()
                 
-                var src = getLink(this.link   )
+                var src = getLink(this.link)
                 myElement.src = src; 
                 myElement.id = "id1";
 				myElement.allowTransparency = "true";
@@ -19916,8 +19923,8 @@ window.Modernizr = function(n, e, t) {
                     }
                 }
             };
-            console.log("--------------------------"),
-            console.log(JSON.stringify(i));
+            // console.log("--------------------------"),
+            // console.log(JSON.stringify(i));
             var n = this.player.model.addtag(e, i).build();
             n && (n.disc && this.player.tagDiscs.push(n.disc),
             n.visible || n.show(o.tags.startup.fadeInDuration))
@@ -21831,9 +21838,9 @@ window.Modernizr = function(n, e, t) {
                     manage.switchBgmState(true)
                 }; */
                 
-                if(g_bgAudio && g_bgAudio.pauseByHot){
-                    manage.switchBgmState(true)
-                }
+                // if(g_bgAudio && g_bgAudio.pauseByHot){
+                //     manage.switchBgmState(true)
+                // }
                 
                 
 				//$('#player').off("click",this.closePopup);
@@ -21980,7 +21987,7 @@ window.Modernizr = function(n, e, t) {
                     manage.switchBgmState(true)
                 } */
                 
-                if(!this.director.tourIsPlaying) this.director.bgmReplay()
+                // if(!this.director.tourIsPlaying) this.director.bgmReplay()
 			}
 			,
             n.prototype.bindEvents = function(e) {
@@ -22272,10 +22279,13 @@ window.Modernizr = function(n, e, t) {
                 return this.tagManager.rankedtagInDirection(e, this.position, this.camera, t)
             }
             ,
+            // n.prototype.tloadOverlays= function(){
+            //     this.model.loadOverlays() 
+            // },
             n.prototype.start = function(e) {
                  //-------------------
-                window.initOverlay(r)
-                this.model.loadOverlays() 
+                 window.initOverlay(r)
+                 this.model.loadOverlays()
                 //loadVideo();//add   
                 //-------------------
                 

web/public/static/js/manage.js

@@ -110,6 +110,8 @@ Manage.prototype.loadAudio = function() { //相关：g_tourAudio \  g_playAudio
     g_bgAudio.loop = true;
     g_bgAudio.autoplay = false;
     g_bgAudio.id = "bgaudio";
+    g_bgAudio.volume = 0.4;
+
     
     //https://www.cnblogs.com/interdrp/p/4211883.html   部分资料
     g_bgAudio.load();	// iOS 9   还需要额外的 load 一下, 否则直接 play 无效

web/public/static/js/myShow.js

@@ -1,5 +1,5 @@
 var g_ProjectName=window.location.pathname.substring(window.location.pathname.indexOf("/")+1,window.location.pathname.lastIndexOf("/"));
-// var g_Prefix="http://8.135.106.227:8009/";
+// var g_Prefix="http://192.168.1.101:8080/";
 // https://super.4dage.com/
 var g_Prefix=window.location.origin+'/';
 

web/public/static/js/overlay.js

@@ -104,7 +104,7 @@ var initOverlay = function(THREE){
                 info.type = "video"
                 
                 video.addEventListener('loadeddata', ()=>{
-                    console.log(this.sid + " loaded!!!")
+                    // console.log(this.sid + " loaded!!!")
                 })
                 video.volume = 0
                 video.muted = true
@@ -279,7 +279,7 @@ var initOverlay = function(THREE){
     Overlay.prototype.requestDownload = function(){
         if(this.hasRequestLoad ||  this.overlayType != 'photo')return
         
-        console.log('overlay requestDownload : '+this.sid)
+        // console.log('overlay requestDownload : '+this.sid)
         var plane = this.plane; 
         
         plane.material.map = Texture.load(this.file,()=>{
@@ -290,7 +290,7 @@ var initOverlay = function(THREE){
             }
             setTimeout(Overlay.loadNext,50)
             plane.material.opacity = 1;
-            console.log('overlay loaded: '+this.sid)
+            // console.log('overlay loaded: '+this.sid)
         })
         plane.material.map.wrapS = plane.material.map.wrapT = THREE.ClampToEdgeWrapping;
         plane.material.map.minFilter = THREE.LinearFilter;
@@ -386,7 +386,7 @@ var initOverlay = function(THREE){
             setTimeout(Overlay.load, 200)
         }else{
             Overlay.allRequestLoad = true
-            console.log('allRequestLoad')
+            // console.log('allRequestLoad')
         }
     }
   

web/src/components/longvideo/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="longvideo">
+    <audio preload autoplay ref="changjuan" :src="require('@/assets/audio/redianchangjuan.mp3')"></audio>
     <img class="close" @click="$bus.$emit('toggleLongVideo',false)" :src="require('@/assets/images/icon/close.png')" alt="">
     <div class="longbody">
       <video @click="autoplay" :style="{left:translate.x + 'px'}" ref="layout" autoplay loop :src="require('@/assets/video/video.mp4')"></video>
@@ -133,6 +134,7 @@ export default {
     this.$refs.scro.addEventListener('touchstart', this.scrollreadyMove)
 
     this.autoplay()
+    this.$refs.changjuan.play();
     this.$refs.layout.addEventListener('loadedmetadata',()=>{
       this.loading = false
     })

web/src/components/svg.vue

@@ -180,6 +180,8 @@ export default {
                 this.modeActive = t
             })
 
+            this.$bus.$emit("onFinish",true)
+
             // 监听点位变化
             // window.player.on("flying.ended", (pano1, position, pano)=> {
             //   console.log(pano.id);

web/src/components/welcome/index.vue

@@ -2,11 +2,14 @@
   <div class="welcome">
     <template v-show="!isVideo">
       <img class="bg" :style="{'z-index': isVideo?-1:0,opacity:isVideo?0:1}" :src="require('@/assets/images/bg.jpg')" alt="">
-      <div  v-if="!isVideo" class="we_title">欢迎访问信息工程大学数字史馆</div>
+      <div  v-if="!isVideo" class="we_title">欢迎访问<br/>战略支援部队信息工程大学数字史馆</div>
       <span v-if="!isVideo" class="btn" @click="showVideo">开始预览</span>
     </template>
-    <video @click="autoplay" ref="welcome" :style="{opacity:isVideo?1:0}" preload="auto" :poster="require('@/assets/images/videopost.jpg')" :src="require('@/assets/video/welcome.mp4')"></video>
+    <video ref="welcome" :style="{opacity:isVideo?1:0}" preload :poster="require('@/assets/images/videopost.jpg')" :src="require('@/assets/video/welcome.mp4')"></video>
     <span v-if="isVideo" class="btn jump" @click="$bus.$emit('toggleWelcome', false)">跳过</span>
+     <div class="loading" v-if="loading">
+      <span>加载中...</span>
+    </div>
   </div>
 </template>
 
@@ -14,7 +17,8 @@
 export default {
   data(){
     return {
-      isVideo: false
+      isVideo: false,
+      loading:true
     }
   },
   methods:{
@@ -36,6 +40,13 @@ export default {
         this.$refs.welcome && this.$refs.welcome.addEventListener('ended',()=>{
           this.$bus.$emit('toggleWelcome', false)
         })
+
+        this.$refs.welcome.addEventListener('loadedmetadata',()=>{
+          setTimeout(() => {
+            this.loading = false
+          }, 3000);
+        })
+
       })
     
     // this.autoplay()
@@ -77,6 +88,8 @@ export default {
   }
   >video{
     width: 100%;
+    height: 100%;
+    object-fit: fill;
   }
   .btn{
     position: absolute;
@@ -101,4 +114,23 @@ export default {
     left: auto;
   }
 }
+
+.loading{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 10000;
+    background: #000;
+    >span{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translateX(-50%,-50%);
+      color: #fff;
+      font-size: 16px;
+      display: inline-block;
+    }
+  }
 </style>

web/src/pages/Home.vue

@@ -96,7 +96,13 @@
             <v-guide v-show="showPull"/>
         </transition>
     </div>
-    <welcome v-if="showWelcome"/>
+    <keep-alive>
+        <welcome v-if="showWelcome"/>
+    </keep-alive>
+
+    <div class="loading" v-if="loading">
+      <span>加载中...</span>
+    </div>
   </div>
 </template>
 
@@ -179,6 +185,7 @@ export default {
         }
         if (!data) {
             manage.switchBgmState(true); 
+            // window.player.tloadOverlays()
         }
     })
     
@@ -206,6 +213,7 @@ export default {
         window.player.on("loadLongVideo", ()=> {
             this.showLoingVideo = true
         })
+        this.loading = false
     })
 
     
@@ -236,9 +244,10 @@ export default {
         isShow:false,
         isShowFile:false,
         isFade:true,
-        showWelcome:true,
+        showWelcome:false,
         showLoingVideo: false,
-        fileCode:''
+        fileCode:'',
+        loading:false
       }
   }
 }
@@ -337,4 +346,23 @@ export default {
     height: 100%;
     background: rgba(0, 0, 0, 0.6);
 }
+
+.loading{
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 10000;
+    background: #000;
+    >span{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translateX(-50%,-50%);
+      color: #fff;
+      font-size: 16px;
+      display: inline-block;
+    }
+  }
 </style>

web/src/views/gui/newguide.vue

@@ -3,17 +3,19 @@
     <img class="bg" :src="require('@/assets/images/daolanBg.png')" alt="" />
     <div class="swcon">
       <swiper
-        v-if="guide.list.length > 0"
+        v-if="mapData.length > 0"
         ref="listSwiper"
         class="swiper-con"
         :options="swiperOptions"
       >
         <swiper-slide
           class="swiper-slide"
-          v-for="(item, i) in guide.list"
+          v-for="(item, i) in mapData"
           :key="i"
         >
-          <div :class="{'slActive':guideActive === i,hoverCls:hoverIdx===i}">
+          <div :class="{'slActive':guideActive==item.toIdx,hoverCls: item.toIdx===hoverIdx}">
+          <!-- <div :class="{'slActive':item.activemin<=guideActive&& item.activemax>=guideActive,hoverCls: item.toIdx===hoverIdx}"> -->
+
             <img @click="gotoLight(item)" @mouseleave="hoverOutHandle(item,i)" @mouseenter="hoverHandle(item,i)" :src="(item.locations?item.locations[0].thumbnail_signed_src : item.thumbnail_signed_src)" :alt="item.name" />
             <span :title="item.name">{{item.name}}</span>
           </div>
@@ -114,6 +116,7 @@ export default {
       inter:null,
       hoverIdx:'',
       guideActive:'',
+      mapData:[],
       swiperOptions: {
         slidesPerView: "auto",
         autoplay: false,
@@ -141,14 +144,14 @@ export default {
       this.swiper[type]()
     },
     gotoLight(item){
-      player.director.goToHighlight([this.hoverIdx,0])
+      player.director.goToHighlight([item.toIdx,0])
     },
     hoverHandle(item,i){
-      this.hoverIdx = i;
-      player.model.emit('tourThumbImgHover',i)
+      this.hoverIdx = item.toIdx;
+      player.model.emit('tourThumbImgHover',item.toIdx)
     },
     hoverOutHandle(item,i){ 
-        player.model.emit('tourThumbImgHoverLeave',i) 
+        player.model.emit('tourThumbImgHoverLeave',item.toIdx) 
        this.hoverIdx= '' 
     }
   },
@@ -161,10 +164,57 @@ export default {
       window.addEventListener("loadfinish", () => {
         this.guide = window.player.model.images;
         console.log(this.guide);
+        let fixArr = [{
+          idx:0,
+          activemin:0,
+          activemax:0,
+          name:'开篇'
+        },{
+          idx:1,
+          name:'序厅',
+          activemin:1,
+          activemax:4
+        },{
+          idx:5,
+          name:'万水千山 铁心向党',
+          activemin:5,
+          activemax:14
+        },{
+          idx:15,
+          name:'辗转办学 奠定优秀',
+          activemin:15,
+          activemax:20
+        },{
+          idx:21,
+          name:'汇聚中原 扬帆起航',
+          activemin:21,
+          activemax:26
+        },{
+          idx:27,
+          name:'综合办学 世纪跨越',
+          activemin:27,
+          activemax:32
+        },{
+          idx:33,
+          name:'不忘出心 时代重塑',
+          activemin:33,
+          activemax:41
+        }]
+        this.guide.list.forEach((item,i)=>{
+          let tmp = fixArr.find(sub=>sub.idx ==i)
+          if (true) {
+            this.mapData.push({
+              ...item,
+              ...tmp,
+              toIdx:i
+            })
+          }
+        })
          //监听导览状态
           window.player.on('onplayStatus', (data)=>{
             this.guideActive = data.destinationItem && data.destinationItem[0]
             this.swiper && this.swiper.slideTo(this.guideActive)
+
             //if (!data.tourIsPlaying) {
             //  this.guideActive=''
             //}