首頁 探索 說明
註冊 登入
chenzhiguang
/
liangqichao_new
1
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

1603

tremble 3 年之前
父節點
cc15f92ea6
當前提交
e59fbdd437
共有 19 個文件被更改，包括 27612 次插入 和 13 次删除
分割檢視 顯示文件統計
  1. 3 0
      bigscene_new/.browserslistrc
  2. 17 0
      bigscene_new/.eslintrc.js
  3. 23 0
      bigscene_new/.gitignore
  4. 24 0
      bigscene_new/README.md
  5. 5 0
      bigscene_new/babel.config.js
  6. 27307 0
      bigscene_new/package-lock.json
  7. 27 0
      bigscene_new/package.json
  8. 二進制
      bigscene_new/public/favicon.ico
  9. 17 0
      bigscene_new/public/index.html
  10. 32 0
      bigscene_new/src/App.vue
  11. 二進制
      bigscene_new/src/assets/logo.png
  12. 59 0
      bigscene_new/src/components/HelloWorld.vue
  13. 10 0
      bigscene_new/src/main.js
  14. 27 0
      bigscene_new/src/router/index.js
  15. 5 0
      bigscene_new/src/views/About.vue
  16. 18 0
      bigscene_new/src/views/Home.vue
  17. 5 5
      web/public/panorama/tour.xml
  18. 5 2
      web/src/views/map/index.vue
  19. 28 6
      web/src/views/panorama/pano.vue

+ 3 - 0
bigscene_new/.browserslistrc
查看文件 

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

+ 17 - 0
bigscene_new/.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'
 
+  }
 
+}

+ 23 - 0
bigscene_new/.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?

+ 24 - 0
bigscene_new/README.md
查看文件 

@@ -0,0 +1,24 @@
 
+# bigscene_new
 
+
 
+## 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/).

+ 5 - 0
bigscene_new/babel.config.js
查看文件 

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

File diff suppressed because it is too large
+ 27307 - 0
bigscene_new/package-lock.json


+ 27 - 0
bigscene_new/package.json
查看文件 

@@ -0,0 +1,27 @@
 
+{
 
+  "name": "bigscene_new",
 
+  "version": "0.1.0",
 
+  "private": true,
 
+  "scripts": {
 
+    "serve": "vue-cli-service serve",
 
+    "build": "vue-cli-service build",
 
+    "lint": "vue-cli-service lint"
 
+  },
 
+  "dependencies": {
 
+    "core-js": "^3.6.5",
 
+    "vue": "^2.6.11",
 
+    "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"
 
+  }
 
+}

二進制
bigscene_new/public/favicon.ico
查看文件


+ 17 - 0
bigscene_new/public/index.html
查看文件 

@@ -0,0 +1,17 @@
 
+<!DOCTYPE html>
 
+<html lang="">
 
+  <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">
 
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
+    <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>

+ 32 - 0
bigscene_new/src/App.vue
查看文件 

@@ -0,0 +1,32 @@
 
+<template>
 
+  <div id="app">
 
+    <div id="nav">
 
+      <router-link to="/">Home</router-link> |
 
+      <router-link to="/about">About</router-link>
 
+    </div>
 
+    <router-view/>
 
+  </div>
 
+</template>
 
+
 
+<style lang="less">
 
+#app {
 
+  font-family: Avenir, Helvetica, Arial, sans-serif;
 
+  -webkit-font-smoothing: antialiased;
 
+  -moz-osx-font-smoothing: grayscale;
 
+  text-align: center;
 
+  color: #2c3e50;
 
+}
 
+
 
+#nav {
 
+  padding: 30px;
 
+
 
+  a {
 
+    font-weight: bold;
 
+    color: #2c3e50;
 
+
 
+    &.router-link-exact-active {
 
+      color: #42b983;
 
+    }
 
+  }
 
+}
 
+</style>

二進制
bigscene_new/src/assets/logo.png
查看文件


+ 59 - 0
bigscene_new/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>

+ 10 - 0
bigscene_new/src/main.js
查看文件 

@@ -0,0 +1,10 @@
 
+import Vue from 'vue'
 
+import App from './App.vue'
 
+import router from './router'
 
+
 
+Vue.config.productionTip = false
 
+
 
+new Vue({
 
+  router,
 
+  render: h => h(App)
 
+}).$mount('#app')

+ 27 - 0
bigscene_new/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

+ 5 - 0
bigscene_new/src/views/About.vue
查看文件 

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

+ 18 - 0
bigscene_new/src/views/Home.vue
查看文件 

@@ -0,0 +1,18 @@
 
+<template>
 
+  <div class="home">
 
+    <img alt="Vue logo" src="../assets/logo.png">
 
+    <HelloWorld msg="Welcome to Your Vue.js App"/>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+// @ is an alias to /src
 
+import HelloWorld from '@/components/HelloWorld.vue'
 
+
 
+export default {
 
+  name: 'Home',
 
+  components: {
 
+    HelloWorld
 
+  }
 
+}
 
+</script>

+ 5 - 5
web/public/panorama/tour.xml
查看文件 

@@ -2,8 +2,8 @@
 
 
 	<include url="skin/vtourskin.xml" />
 
 	<include url="code/tools.xml" />
 
-
 
-	<!-- <include url="./pano_pos.xml" />
 
+<!-- 
+	<include url="./pano_pos.xml" />
 
 	
 	<events keep="true" name="showpos"
 
 		onviewchange="show_pos()" 
@@ -197,7 +197,7 @@
 
 
 	<scene name="scene_lqcjng" title="lqcjng" onstart="" thumburl="panos/lqcjng.tiles/thumb.jpg" lat="" lng="" heading="">
 
 
-		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
 
+		<view hlookat="-173.99" vlookat="0.99" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
 
 
 		<preview url="panos/lqcjng.tiles/preview.jpg" />
 
 
@@ -217,7 +217,7 @@
 
 
 	<scene name="scene_lqctx" title="lqctx" onstart="" thumburl="panos/lqctx.tiles/thumb.jpg" lat="" lng="" heading="">
 
 
-		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
 
+		<view hlookat="-178.73" vlookat="-7.88" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
 
 
 		<preview url="panos/lqctx.tiles/preview.jpg" />
 
 
@@ -237,7 +237,7 @@
 
 
 	<scene name="scene_rt" title="rt" onstart="" thumburl="panos/rt.tiles/thumb.jpg" lat="" lng="" heading="">
 
 
-		<view hlookat="0.0" vlookat="0.0" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
 
+		<view hlookat="-91.76" vlookat="1.63" fovtype="MFOV" fov="120" maxpixelzoom="2.0" fovmin="70" fovmax="140" limitview="auto" />
 
 
 		<preview url="panos/rt.tiles/preview.jpg" />

+ 5 - 2
web/src/views/map/index.vue
查看文件 

@@ -1,6 +1,6 @@
 
 <template>
 
   <div class="bigscene">
 
-    <iframe ref='ifr' allowfullscreen :src="`https://culture.4dage.com/LiangQiChao/web/Map/index.html`" frameborder="0"></iframe>
 
+    <iframe ref='ifr' v-if="pl" allowfullscreen :src="`${pl}//culture.4dage.com/LiangQiChao/web/Map/index.html`" frameborder="0"></iframe>
 
     <ul class="aside">
 
       <li @click="$router.push({path:'/'})">
 
         <img :src="require(`@/assets/images/aside/home.png`)" alt />
 
@@ -15,10 +15,13 @@
 
 </template>
 
 
 <script>
 
+
 
 export default {
 
   data(){
 
+    let pl = location.protocol;
 
     return {
 
-      isFly: false
 
+      isFly: false,
 
+      pl:pl
 
     }
 
   },
 
   watch:{

+ 28 - 6
web/src/views/panorama/pano.vue
查看文件 

@@ -24,8 +24,15 @@ export default {
 
   },
 
     watch:{
 
       panoid:{
 
+        immediate:true,
 
         handler:function (newVal) {
 
+          if (!newVal) {
 
+            return
 
+          }
 
           let tmp = raw.find((item) => item.id == newVal);
 
+          if (!tmp) {
 
+            return
 
+          }
 
           var krpano = document.getElementById("krpanoSWFObject");
 
           this.hotspots = tmp.linkPano || [];
 
           krpano.call(`loadscene(scene_${tmp.link});`);
 
@@ -47,7 +54,7 @@ export default {
 
           if (tmp.type == "pano") {
 
             var krpano = document.getElementById("krpanoSWFObject");
 
             this.hotspots = tmp.linkPano || [];
 
-            this.from = 'hotspot'
 
+            this.from = tmp.belong ? 'belong' :''
 
             krpano.call(`loadscene(scene_${tmp.link});`);
 
           } else {
 
             this.$router.push({
 
@@ -62,22 +69,37 @@ export default {
 
     });
 
 
 
-    let tmp = raw.find((item) => item.id == this.panoid);
 
+
 
 
     window.__krfn = __krfn;
 
     window.vrInitFn = () => {
 
       var krpano = document.getElementById("krpanoSWFObject");
 
-      if(!this.position&&this.from!='hotspot'){
 
-         this.hotspots = tmp.linkPano || [];
 
-      }
 
+      
+      console.log(this.hotspots);
 
       __krfn.utils.initHotspot(krpano, this.hotspots, false);
 
+
 
+      // this.form
 
+
 
+      // if (this.form) {
 
+      //   __krfn.utils.initHotspot(krpano, this.hotspots, false);
 
+      // }
 
+      // else{
 
+      //   let tt = raw.find((item) => item.id == this.panoid);
 
+
 
+      //   if(!this.position){
 
+      //     this.hotspots = tt.linkPano || [];
 
+      //   }
 
+      // }
 
+      
     };
 
 
+      let ttt = raw.find((item) => item.id == this.panoid);
 
+
 
 
     var settings = {
 
       "events[skin_events].onxmlcomplete": "js(window.vrViewFn());",
 
       "events[skin_events].onloadcomplete": "js(window.vrInitFn());",
 
-      "startscene": this.position? "" : `scene_${tmp.link}`
 
+      "startscene": this.position || this.form? "" : `scene_${ttt.link}`
 
     };
 
     $('#pano')&&window.removepano('#pano')
 
     this.$nextTick(() => {