update0419

new_backstage/src/pages/login/index.vue

@@ -10,7 +10,7 @@
     <div class="mask"></div>
     <div class="middle">
       <div class="middle-left">
-        <div>中国人民武装警察部队新疆生产建设兵团总队<br/>管理后台</div>
+        <div>中国人民武装警察部队<br/>新疆生产建设兵团总队<br/>管理后台</div>
       </div>
       <div class="middle-right">
         <el-form class="middle-form" :rules="ruleLogin" status-icon :model="formLogin" ref="formLogin">

web/public/static/css/main.css

@@ -4116,14 +4116,15 @@ a.hasHover:hover, a:active {
 #playHead {
     display: table;
     height: 20px;
-    width: 100%;
+    width: calc(100% - 400px);
     position: absolute;
     bottom: -24px;
     left: 0;
     transition-property: bottom;
     transition-duration: .5s;
     background-color: #000;
-    z-index: 50
+    z-index: 50;
+    
 }
 
 #playHead.playing {
@@ -4141,7 +4142,8 @@ a.hasHover:hover, a:active {
 
 #progressBar {
     padding: 0 10px;
-    pointer-events: all
+    pointer-events: all;
+
 }
 
 #progressBar .step {

web/public/static/js/Hot.js

@@ -415,7 +415,6 @@ window.initHot = function(model){
             var tex1, tex2
             
             if(styleImg.length){
-                console.log(styleImg,'styleImg');
                 tex1 = Texture.load(styleImg[0].src);
                 tex2 = Texture.load(styleImg[1]&&styleImg[1].src || styleImg[0].src); 
                 

web/public/static/js/main_2020_show.js

@@ -5140,15 +5140,14 @@ window.Modernizr = function(n, e, t) {
                     this.setDestinationItem([this.currentItem[0]||0, 0])
                 }
                 else{ 
-                    
-                        var item    
-                        if(e == 1){
-                            item = this.nextItem(this.currentItem)
-                        }else if(e == -1){
-                            item = this.prevItem(this.currentItem)    
-                            
-                        }
-                        this.setDestinationItem(item) 
+                    var item    
+                    if(e == 1){
+                        item = this.nextItem(this.currentItem)
+                    }else if(e == -1){
+                        item = this.prevItem(this.currentItem)    
+                        
+                    }
+                    this.setDestinationItem(item) 
                 }
                 
                 if(this.itemCompare(this.destinationItem, this.finalDestination(), 'equal')[0] < 0 ){ 
@@ -6996,7 +6995,7 @@ window.Modernizr = function(n, e, t) {
                     var r, a, s;
                     if (null !== n.currentItem) {
                         var p, f;
-                        $("#status").find(".curIdx").text(n.currentItem[0] || 0  + 1),
+                        $("#status").find(".curIdx").text((n.currentItem[0] || 0) + 1),
                         n.onTheBus ? (p = "active",
                         f = "recent") : (f = "active",
                         p = "recent");

web/src/components/exhibition/index.vue

@@ -113,6 +113,7 @@ export default {
   },
   methods: {
     handleItem(item) {
+      console.log(item,this.current);
       if (item.id == "jishechengjiu") {
         this.shensuo = !this.shensuo;
         return;
@@ -136,12 +137,12 @@ export default {
         list = this.list;
       }
       this.current = list.find((item) => {
-        if (window.firstViewPosi) {
+        if (window.firstViewPosi&&window.number != "xinjiang01"&&window.number != "xinjiangout") {
           return player.currentPano.id == item.pano;
         } else {
           return item.id == window.number;
         }
-      });
+      }) || {};
     });
   },
   watch: {

web/src/views/sacrifice/index.vue

@@ -7,7 +7,7 @@
       />
       <div class="info">
         <img :src="data.thumb" alt="" />
-        <p>{{ data.realName }}之墓</p>
+        <p>{{ data.realName }}</p>
         <div>
           <span>生于{{ data.birthday }}年</span>
           <span>卒于{{ data.dieDay }}年</span>

web/src/views/scene/gui/menu.vue

@@ -256,6 +256,10 @@
         <div class="ui-icon wide jieshuo111">
           <img @click="isJieShuo=!isJieShuo" :src="require(`@/assets/images/icon/jieshuo_${!isJieShuo?'open':'close'}.png`)" alt="">
         </div>
+
+        <div class="ui-icon wide jieshuo111">
+          <img @click="clickFullscreen" :src="require(`@/assets/images/icon/quanping${isFullscreen?'_active':''}.png`)" alt="">
+        </div>
         <div
           id="gui-fullscreen"
           class="ui-icon wide hidden"
@@ -391,6 +395,7 @@ export default {
       isShow: true,
       isGuide: true,
       isJieShuo:true,
+      isFullscreen:false,
       conLi,
       showAutoList: false,
       btnlistActive:this.itemctive,
@@ -410,10 +415,12 @@ export default {
     },
     isJieShuo(newVal){
       this.$emit('isJieShou',newVal)
-    }
-    
+    },
   },
   methods: {
+    clickFullscreen(){
+      this.$emit('isFullscreen')
+    },
     toggleBGM(){
       this.isBgm = !this.isBgm
       window.player.director.stopTour()
@@ -442,6 +449,14 @@ export default {
     }
   },
   mounted(){
+    window.addEventListener("message", (res) => {
+      if (Object.prototype.toString.call(res.data) == "[object Object]") {
+        if (res.data.source === "changeFullScreenIcon") {
+          this.isFullscreen = !this.isFullscreen
+        }
+      }
+    });
+
     this.$bus.$on('resetbtnactive',()=>{
       this.btnlistActive = ''
     })

web/src/views/scene/index.vue

@@ -39,17 +39,51 @@ export default {
       scene:'xinjiangout',
       canjump:false,
       view:"",
+      isFullscreen: false,
       rnd:Math.random()
     }
   },
 
   methods: {
+    onFullScreen() {
+      let element = document.documentElement;
+      if (this.isFullscreen) {
+        if (document.exitFullscreen) {
+          document.exitFullscreen();
+        } else if (document.webkitCancelFullScreen) {
+          document.webkitCancelFullScreen();
+        } else if (document.mozCancelFullScreen) {
+          document.mozCancelFullScreen();
+        } else if (document.msExitFullscreen) {
+          document.msExitFullscreen();
+        }
+      } else {
+        if (element.requestFullscreen) {
+          element.requestFullscreen();
+        } else if (element.webkitRequestFullScreen) {
+          element.webkitRequestFullScreen();
+        } else if (element.mozRequestFullScreen) {
+          element.mozRequestFullScreen();
+        } else if (element.msRequestFullscreen) {
+          element.msRequestFullscreen();
+        }
+      }
+      // 改变当前全屏状态
+    },
     jump(){
       this.showWelcome = false
     }
   },
   mounted() {
     this.$nextTick(()=>{
+      document.addEventListener("fullscreenchange", () => {
+        this.isFullscreen = !this.isFullscreen;
+        this.$refs.ifr.contentWindow.postMessage({
+            source: "changeFullScreenIcon",
+            data:this.isFullscreen,
+        },'*');
+      });
+      
       this.$refs.wevideo.addEventListener
        this.$refs.wevideo.addEventListener("ended", () => {
           this.showWelcome = false
@@ -68,11 +102,17 @@ export default {
         if (Object.prototype.toString.call(res.data) == "[object Object]") {
           let data = res.data.data;
           if (res.data.source === "currentScene") {
-            this.view = ''
+            this.view = data.firstView
+              console.log(data.pano);
+
             if (data.pano) {
               let {x,y,z,w} = data.quat
               this.view = `&firstView=pano:${data.pano},qua:${x+', '+y+', '+z+', '+w}`
             }
+
+            if (data.firstView) {
+              this.view = `&firstView=${data.firstView}`
+            }
            this.scene = data.id
            this.$bus.$emit('activeScene',data.id)
            this.$showLoading()
@@ -86,6 +126,10 @@ export default {
           if (res.data.source === "reLoadPage") {
              this.$refs.ifr.contentWindow.location.reload()
           }
+
+          if (res.data.source === "fullscreen") {
+            this.onFullScreen();
+          }
         }
       });
   },

web/src/views/scene/scene.vue

@@ -28,7 +28,7 @@
         <v-title />
 
         <!-- 底部菜单 -->
-        <v-menu :BgmUrl="BgmUrl" @isJieShou="data=>{isjieshuo = data}" @btnactive="handleActive"/>
+        <v-menu :BgmUrl="BgmUrl" @isFullscreen="clickFullscreen" @isJieShou="data=>{isjieshuo = data}" @btnactive="handleActive"/>
 
         <!-- 导览 -->
         <v-guide />
@@ -190,11 +190,15 @@ export default {
 
         
         window.player.director.on("linkother", data => {
+          console.log(data,'linkother');
+          let content = data.content.split('(4dage)')
+          console.log(content);
           window.parent.postMessage(
             {
               source: "currentScene",
               data: {
-                id:data.content
+                id: content[0],
+                firstView:content[1],
               },
             },
             "*"
@@ -242,6 +246,15 @@ export default {
     this.getData();
   },
   methods: {
+    clickFullscreen(){
+      window.parent.postMessage(
+          {
+          source: "fullscreen",
+          data: true,
+        },
+        "*"
+      );
+    },
     getUserInfo() {
       let userId = window.localStorage.getItem("webuserId");
       let token = window.localStorage.getItem("webtoken");
@@ -288,7 +301,8 @@ export default {
   watch:{
     isjieshuo(newVal){
       window.ISMUTED = !newVal
-    }
+    },
+    
   },
   beforeDestroy() {
     this.destroy();
@@ -402,7 +416,7 @@ export default {
 
 .jieshuospk{
   >img{
-    animation: jieshuo 3.4s steps(53) infinite;
+    animation: jieshuo 4.4s steps(53) infinite;
   }
 }
 .middlepos{