tremble 3 éve
szülő
commit
63e59a0763

+ 0 - 2
package.json

@@ -13,10 +13,8 @@
     "core-js": "^3.6.5",
     "dom-to-image": "^2.6.0",
     "qs": "^6.10.1",
-    "swiper": "^5.3.8",
     "v-viewer": "^1.6.4",
     "vue": "^2.6.11",
-    "vue-awesome-swiper": "^4.1.1",
     "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^3.2.0",
     "weixin-js-sdk": "^1.6.0"

+ 2 - 1
public/static/js/manage.js

@@ -1,6 +1,7 @@
 var g_ProjectName = window.location.pathname.substring(window.location.pathname.indexOf("/") + 1, window.location.pathname.lastIndexOf("/"));
 var g_Prefix = "https://super.4dage.com/";
-// var g_Prefix = "https://culture.4dage.com/";
+// http://wangzhan.cctv.com/wlwm2022/test/data/1248
+// var g_Prefix = "https://wangzhan.cctv.com/wlwm2022/test/";
 
 // var g_Prefix=window.location.href.substring(0,window.location.href.indexOf("/index.html")+1);
 var s = window.location.href.split("/");

+ 0 - 1
src/clients/mobile.vue

@@ -71,7 +71,6 @@ export default {
   },
   watch: {
     "$route.name": function(newVal) {
-      console.log(newVal, "newValnewValnewValnewVal");
       this.$bus.$emit("toggleBGM", newVal == "scene");
       // newVal !='scene' ? this.$refs.vgbgm.pause() : this.$refs.vgbgm.play();
     },

+ 4 - 2
src/components/bird_view/index.vue

@@ -20,7 +20,7 @@
 import Vue from "vue";
 import { region } from "@/data/raw.js";
 import { Booth } from "@/data/booth.js";
-import router from "@/router";
+
 // import roundMenu from "../menu/index.vue";
 
 let bb = [];
@@ -57,7 +57,9 @@ export default {
       this.currentId = data.id;
       let player = window.player;
       if (!player) {
-        new Vue().$bus.$emit("ifrMessage", {
+        this.$bus.$emit("resetCurrentTheme");
+
+        this.$bus.$emit("ifrMessage", {
           events: "flyToPano",
           data: data,
         });

+ 2 - 18
src/components/hotspot/iframe.vue

@@ -40,14 +40,10 @@
 </template>
 
 <script>
-import { directive } from "vue-awesome-swiper";
-// import style (<= Swiper 5.x)
-import "swiper/css/swiper.css";
+
 
 export default {
-  directives: {
-    swiper: directive,
-  },
+  
   props: ["hotspot", "type"],
   data() {
     return {
@@ -73,18 +69,6 @@ export default {
     },
   },
   computed: {
-    swiperOption() {
-      return {
-        slidesPerView: "auto",
-        autoplay: false,
-        centeredSlides: true,
-        watchSlidesProgress: true,
-        loop: this.hotspot.iframe.length > 1,
-        pagination: {
-          el: ".swiper-pagination",
-        },
-      };
-    },
   },
 };
 </script>

+ 1 - 6
src/components/hotspot/video.vue

@@ -43,14 +43,9 @@
 </template>
 
 <script>
-import { directive } from "vue-awesome-swiper";
-// import style (<= Swiper 5.x)
-import "swiper/css/swiper.css";
 
 export default {
-  directives: {
-    swiper: directive,
-  },
+
   props: ["hotspot", "type"],
   data() {
     return {

+ 13 - 13
src/data/booth.js

@@ -37,8 +37,8 @@ let Booth = [
         left: "49%",
         width: "9%",
         height: "14%",
-        firstView: "&firstView=pano:67,qua:0.02488033207072034,-0.709971776271537,0.02511484844897637,0.7033422415958007", //初始視角
-        panoId: "67", //对应点位id
+        firstView: "&firstView=pano:66,qua:0.0017518034285941132,-0.6940206521715635,0.0016887091883557755,0.7199509812968947", //初始視角
+        panoId: "66", //对应点位id
         containPanos: ["65","66","77","78","79","80","81","82","83","84","85","86","87","88","89","90","91","92","93","94","95","96","97","98","99","100","58","255","256","180"]
       },
       {
@@ -123,7 +123,7 @@ let Booth = [
         height: "3%",
         firstView: "&firstView=pano:136,qua:0.0005441737929696521,-0.4030780506128982,0.00023967744959056323,0.9151654069731247", //初始視角
         panoId: "136", //对应点位id
-        containPanos: ["136","137","140","141","142","143"]
+        containPanos: ["136","137","140","142","143"]
       },
       {
         name: "福建省",
@@ -147,7 +147,7 @@ let Booth = [
         height: "7%",
         firstView: "&firstView=pano:141,qua:-0.012069343265410443,0.9232530961623906,-0.029101874252052108,-0.38289832451349354", //初始視角
         panoId: "141", //对应点位id
-        containPanos: ["150","160","161","162","163","164","165","178"]
+        containPanos: ["141","150","160","161","162","163","164","165","178"]
       },
       {
         name: "河南省",
@@ -169,9 +169,9 @@ let Booth = [
         left: "71%",
         width: "6%",
         height: "7%",
-        firstView: "&firstView=pano:171,qua:-0.009090857070234295,0.9788297807519784,-0.04459178966508828,-0.19955246988913097", //初始視角
-        panoId: "171", //对应点位id
-        containPanos: ["200","193","194","195","196","197","198","199","202","203","204"]
+        firstView: "&firstView=pano:170,qua:-0.0003362832582110284,0.9725023247438509,-0.001404259904263288,-0.2328886956178834", //初始視角
+        panoId: "170", //对应点位id
+        containPanos: ["170","200","193","194","195","196","197","198","199","202","203","204"]
       },
       {
         name: "湖南省",
@@ -219,7 +219,7 @@ let Booth = [
         height: "6%",
         firstView: "&firstView=pano:168,qua:-0.006825949091149443,-0.2944266006273781,-0.002103015210066327,0.9556474061688144", //初始視角
         panoId: "168", //对应点位id
-        containPanos: ["167","168","169","171","172","173","174","175","176"]
+        containPanos: ["167","168","169","172","173","174","175","176"]
       },
       {
         name: "重庆市",
@@ -229,8 +229,8 @@ let Booth = [
         left: "48.5%",
         width: "6%",
         height: "7%",
-        firstView: "&firstView=pano:66,qua:0.012280775032718636,0.4013827735688466,-0.005382425860901377,0.9158122522182879", //初始視角
-        panoId: "66", //对应点位id
+        firstView: "&firstView=pano:75,qua:0.0036390761677028245,0.5747701651204852,-0.0025560617170463885,0.8183027989899166", //初始視角
+        panoId: "75", //对应点位id
         containPanos: ["67","68","69","70","71","72","73","74","75","76"]
       },
       {
@@ -253,9 +253,9 @@ let Booth = [
         left: "78%",
         width: "4%",
         height: "5%",
-        firstView: "&firstView=pano:170,qua:0.04549458468625412,-0.3269181693672745,0.01575821653585893,0.9438254269401182", //初始視角
-        panoId: "170", //对应点位id
-        containPanos: ["170","188","189","190","191","192","187"]
+        firstView: "&firstView=pano:171,qua:0.0017824102765913096,-0.5428442474929757,0.0011521026168594861,0.8398307133926982", //初始視角
+        panoId: "171", //对应点位id
+        containPanos: ["171","188","189","190","191","192","187"]
       },
       {
         name: "西藏自治区",

+ 2 - 0
src/pages/mobilescene/birdview/index.vue

@@ -43,6 +43,8 @@ export default {
       this.currentId = data.id;
       let player = window.player;
       if (!player) {
+        this.$bus.$emit("resetCurrentTheme");
+
         this.$bus.$emit("ifrMessage", {
           events: "flyToPano",
           data: data,

+ 12 - 5
src/pages/mobilescene/index.vue

@@ -64,7 +64,6 @@ import birdview from "./birdview/index.vue";
 
 import vsearch from "./search";
 
-
 import scene from "./scene.vue";
 import vhotspot from "@/components/hotspot/index.vue";
 import roundMenu from "@/components/menu/index.vue";
@@ -158,6 +157,9 @@ export default {
   mounted() {
     this.$showLoading();
     this.$nextTick(() => {
+      this.$bus.$on("resetCurrentTheme", () => {
+        this.currentTheme = "";
+      });
       $("#scenebody")
         .off("touchstart")
         .on("touchstart", () => {
@@ -194,7 +196,7 @@ export default {
           if (res.data.source === "showAll") {
             setTimeout(() => {
               this.$hideLoading();
-              this.showBirdview = true
+              this.showBirdview = true;
             });
           }
 
@@ -253,15 +255,20 @@ export default {
                 return item;
               }
             });
-            this.currentZhanqu = ''
+            this.currentZhanqu = "";
             this.currentZhanqu = all_booth.find((item) => {
               if (item.containPanos.indexOf(this.currentPanoid) > -1) {
                 return item;
               }
             });
 
-            this.currentZhanqu && window.goldlog.record(`/m_area${this.currentZhanqu.id}`, "", `snsScene=m_area${this.currentZhanqu.id}&product=mobh5&pagename=中国网络文明建设成果展云展示`, "");
-            
+            this.currentZhanqu &&
+              window.goldlog.record(
+                `/m_area${this.currentZhanqu.id}`,
+                "",
+                `snsScene=m_area${this.currentZhanqu.id}&product=mobh5&pagename=中国网络文明建设成果展云展示`,
+                ""
+              );
           }
 
           if (res.data.source === "openHotspot") {

+ 12 - 3
src/pages/scene/index.vue

@@ -165,6 +165,10 @@ export default {
 
       this.$showBirdView();
 
+      this.$bus.$on("resetCurrentTheme", () => {
+        this.currentTheme = "";
+      });
+
       window.addEventListener("message", (res) => {
         if (Object.prototype.toString.call(res.data) == "[object Object]") {
           let data = res.data.data;
@@ -227,14 +231,19 @@ export default {
             });
 
             console.log(this.currentPano);
-            this.currentZhanqu = ''
+            this.currentZhanqu = "";
             this.currentZhanqu = all_booth.find((item) => {
               if (item.containPanos.indexOf(this.currentPanoid) > -1) {
                 return item;
               }
             });
-            this.currentZhanqu && window.goldlog.record(`/p_area${this.currentZhanqu.id}`, "", `snsScene=p_area${this.currentZhanqu.id}&product=pcweb&pagename=中国网络文明建设成果展云展示`, "");
-
+            this.currentZhanqu &&
+              window.goldlog.record(
+                `/p_area${this.currentZhanqu.id}`,
+                "",
+                `snsScene=p_area${this.currentZhanqu.id}&product=pcweb&pagename=中国网络文明建设成果展云展示`,
+                ""
+              );
           }
 
           if (res.data.source === "openHotspot") {